Changeset 12636

Timestamp:

2006-08-31T17:21:24+12:00 (18 years ago)

Author:

mdewsnip

Message:

More static changes, this time to prevent the list of plugins and classifiers from being dropped each time a new collection is opened.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• Gatherer.java (modified) (1 diff)
• cdm/ClassifierManager.java (modified) (5 diffs)
• cdm/PluginManager.java (modified) (5 diffs)

trunk/gli/src/org/greenstone/gatherer/Gatherer.java

@@ -434 +434 @@
     // Create GUI Manager (last) or else suffer the death of a thousand NPE's
     g_man = new GUIManager(size);
+
+    // Get a list of the core Greenstone classifiers and plugins
+    ClassifierManager.loadClassifiersList();
+    PluginManager.loadPluginsList();
     }
 

trunk/gli/src/org/greenstone/gatherer/cdm/ClassifierManager.java

@@ -76 +76 @@
     DebugStream.println("ClassifierManager: " + getSize() + " classifiers parsed.");
 
-    core_greenstone_classifiers_list = loadClassifiersList();
+    // core_greenstone_classifiers_list = loadClassifiersList();
 
     // Force the assigned classifiers to be loaded and cached now
@@ -171 +171 @@
 
 
-    private ArrayList loadClassifiersList()
+    static public void loadClassifiersList()
     {
     System.err.println("In loadClassifiersList()...");
@@ -200 +200 @@
 
         if (xml.length() > 0) {
-        return parseClassifiersListXML(xml.toString());
+        core_greenstone_classifiers_list = parseClassifiersListXML(xml.toString());
         }
         else {
@@ -209 +209 @@
         DebugStream.printStackTrace(exception);
     }
-
-    return null;
     }
 
@@ -256 +254 @@
 
 
-    private ArrayList parseClassifiersListXML(String xml)
+    static private ArrayList parseClassifiersListXML(String xml)
     {
     ArrayList classifiers_list = new ArrayList();

trunk/gli/src/org/greenstone/gatherer/cdm/PluginManager.java

@@ -79 +79 @@
     model = this;
 
-    core_greenstone_plugins_list = loadPluginsList();
-
     // Force the assigned plugins to be loaded and cached now
     for (int i = 0; i < getSize(); i++) {
@@ -215 +213 @@
 
 
-    private ArrayList loadPluginsList()
+    static public void loadPluginsList()
     {
     System.err.println("In loadPluginsList()...");
@@ -244 +242 @@
 
         if (xml.length() > 0) {
-        return parsePluginsListXML(xml.toString());
+        core_greenstone_plugins_list = parsePluginsListXML(xml.toString());
         }
         else {
@@ -254 +252 @@
         DebugStream.printStackTrace(exception);
     }
-
-    return null;
     }
 
@@ -310 +306 @@
 
 
-    private ArrayList parsePluginsListXML(String xml)
+    static private ArrayList parsePluginsListXML(String xml)
     {
     ArrayList plugins_list = new ArrayList();