Changeset 6999 for trunk/gli

Timestamp:

2004-03-10T10:36:33+13:00 (20 years ago)

Author:

kjdon

Message:

made the clearCache methods static so they can be called when there is no collection loaded

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/ClassifierManager.java (modified) (1 diff)
• cdm/PlugInManager.java (modified) (2 diffs)
• gui/Preferences.java (modified) (2 diffs)

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

@@ -116 +116 @@
     }
 
-    public boolean clearClassifierCache() {
+    public static boolean clearClassifierCache() {
 
     Gatherer.println("deleting classifiers.dat");

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

@@ -101 +101 @@
     }
 
-    public boolean clearPlugInCache() {
+    public static boolean clearPlugInCache() {
 
     Gatherer.println("deleting plugins.dat");
@@ -483 +483 @@
         }
         progress.dispose();
+        progress.destroy();
+        progress = null;
     }
     }

trunk/gli/src/org/greenstone/gatherer/gui/Preferences.java

@@ -37 +37 @@
 import org.greenstone.gatherer.Dictionary;
 import org.greenstone.gatherer.Gatherer;
+import org.greenstone.gatherer.cdm.ClassifierManager;
 import org.greenstone.gatherer.cdm.LanguageManager;
+import org.greenstone.gatherer.cdm.PlugInManager;
 import org.greenstone.gatherer.checklist.CheckList;
 import org.greenstone.gatherer.checklist.Entry;
@@ -655 +657 @@
         Gatherer.config.setLocale("general.locale", Configuration.GENERAL_SETTING, ((DictionaryEntry)language_combobox.getSelectedItem()).getLocale());
         // delete the plugins and classifiers.dat files
-        Gatherer.c_man.getCollection().cdm.plugin_manager.clearPlugInCache();
-        Gatherer.c_man.getCollection().cdm.classifier_manager.clearClassifierCache();
+        PlugInManager.clearPlugInCache();
+        ClassifierManager.clearClassifierCache();
         }
         //Gatherer.config.setInt("general.max_folder_depth", Configuration.COLLECTION_SPECIFIC, ((Integer)recursion_depth_spinner.getValue()).intValue());