Changeset 21990 for main

Timestamp:

2010-04-29T14:18:48+12:00 (14 years ago)

Author:

sjm84

Message:

Updated extension_project_list.xml file format so that tags like file_stem are now fileStem. Also when an option label is not defined then the id will be used instead. Finally, base_ext has been removed.

Location:

main/trunk/greenstone3/src/java/org/greenstone/admin/guiext

Files:

• Callback.java (modified) (4 diffs)
• ExtXMLHelper.java (modified) (2 diffs)
• ExtensionInformation.java (modified) (3 diffs)
• Option.java (modified) (1 diff)

main/trunk/greenstone3/src/java/org/greenstone/admin/guiext/Callback.java

@@ -1 +1 @@
 package org.greenstone.admin.guiext;
 
+import java.lang.reflect.Constructor;
 import java.lang.reflect.Method;
+
 import javax.swing.JTextArea;
 
@@ -8 +10 @@
 public class Callback implements Runnable
 {
+    String _class = null;
     String _param = null;
     CommandStep _parent = null;
@@ -16 +19 @@
 
     if(callbackElement != null){
-        _param = ExtXMLHelper.getValueFromSingleElement(callbackElement, true);
+        _class = ExtXMLHelper.getValueFromSingleElement(callbackElement, true);
+        _param = callbackElement.getAttribute("type");
     }
     else{
@@ -25 +29 @@
     public void run()
     {
+    _parent.getParent().getParent().loadGuiExtFile();
     JTextArea messageArea = _parent.getMessageArea();
 
-    Object extObj = _parent.getParent().getParent().getExtObject();
+    Class extClass = null;
+    try{
+        extClass = Class.forName(_class);
+    }
+    catch(Exception ex){
+        System.err.println("Could not create the extension class used for callback methods, either the class name is incorrect or the class does not exist inside the guiext.jar file");
+    }
+    Constructor classConstructor = null;
+    Object extObj = null;
+    
+    try{
+        classConstructor = extClass.getConstructor(new Class[0]);
+        extObj = classConstructor.newInstance(new Object[0]);
+    }
+    catch(Exception ex){
+        ex.printStackTrace();
+        System.err.println("Could not create the extension class used for callback methods, either the class name is incorrect or the class does not exist inside the guiext.jar file");
+        return;
+    }
+
     Class[] params = new Class[]{String.class};
     

main/trunk/greenstone3/src/java/org/greenstone/admin/guiext/ExtXMLHelper.java

@@ -9 +9 @@
     static public final String EXTENSION = "extension";
     static public final String GROUP = "group";
-    static public final String BASE_EXT = "base_ext";
-    static public final String FILE_STEM = "file_stem";
+    static public final String FILE_STEM = "fileStem";
     static public final String NAME = "name";
     static public final String DOWNLOAD = "download";
@@ -23 +22 @@
     static public final String DESCRIPTION = "description";
     static public final String PROPERTY = "property";
-    static public final String SEQUENCE_LIST = "sequence_list";
+    static public final String SEQUENCE_LIST = "sequenceList";
     static public final String STEP ="step";
     static public final String COMMAND ="command";

main/trunk/greenstone3/src/java/org/greenstone/admin/guiext/ExtensionInformation.java

@@ -25 +25 @@
     protected String _fileStem = null;
     protected String _description = null;
-    protected String _baseExt = null;
     protected String _baseURL = null;
     protected SequenceList _sequenceList= null;
@@ -38 +37 @@
         _fileStem = ExtXMLHelper.getValueFromSingleElement(extensionElement, ExtXMLHelper.FILE_STEM, true);
         _description = ExtXMLHelper.getValueFromSingleElement(extensionElement, ExtXMLHelper.DESCRIPTION, true);
-        _baseExt = ExtXMLHelper.getValueFromSingleElement(extensionElement, ExtXMLHelper.BASE_EXT, true);
         _baseURL = baseURL;
         _sequenceList = new SequenceList(ExtXMLHelper.getSingleChildElement(extensionElement, ExtXMLHelper.SEQUENCE_LIST, true), this);
@@ -71 +69 @@
     return _description;
     }
- 
-    public String getBaseClassName()
-    {
-    return _baseExt;
-    }
 
     public SequenceList getSequenceList()
     {
     return _sequenceList;
-    }
-
-    public Object getExtObject()
-    {
-    loadGuiExtFile();
-    Class extClass = null;
-    try{
-        extClass = Class.forName(_baseExt);
-    }
-    catch(Exception ex){
-        System.err.println("Could not create the extension class used for callback methods, either the class name is incorrect or the class does not exist inside the guiext.jar file");
-    }
-    Constructor classConstructor = null;
-    Object classObj = null;
-    
-    try{
-        classConstructor = extClass.getConstructor(new Class[0]);
-        classObj = classConstructor.newInstance(new Object[0]);
-    }
-    catch(Exception ex){
-        ex.printStackTrace();
-        System.err.println("Could not create the extension class used for callback methods, either the class name is incorrect or the class does not exist inside the guiext.jar file");
-        return null;
-    }
-    
-    return classObj;
     }
 

main/trunk/greenstone3/src/java/org/greenstone/admin/guiext/Option.java

@@ -15 +15 @@
 
     if(optionElement != null){
-        _name = optionElement.getAttribute("label");
-        if(_name == null || _name.equals("")){
-        System.err.println("This option element does not have a label");
-        }
-
         _id = optionElement.getAttribute("id");
         if(_id == null || _id.equals("")){
         System.err.println("This option element does not have an id");
+        }
+
+        _name = optionElement.getAttribute("label");
+        if(_name == null || _name.equals("")){
+        _name = id;
         }