Changeset 13177

Timestamp:

2006-10-27T15:36:27+13:00 (17 years ago)

Author:

mdewsnip

Message:

No longer tries to load the options for a plugin/classifier if it has already failed.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/Classifier.java (modified) (3 diffs)
• cdm/Plugin.java (modified) (3 diffs)
• greenstone/Classifiers.java (modified) (3 diffs)
• greenstone/Plugins.java (modified) (3 diffs)

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

@@ -44 +44 @@
     static final public String CLASSIFIER_PREFIX = "CL";
 
+    private boolean loading_options_failed = false;
+
 
     /** Constructor used only in DOMProxyListModel initializations.
@@ -74 +76 @@
 
 
+    public boolean didLoadingOptionsFail()
+    {
+    return loading_options_failed;
+    }
+
+
     /** Generate the string showing this classifiers position. */
     public String getPositionString() {
@@ -86 +94 @@
     return position_string;
     }
+
+
+    public void setLoadingOptionsFailed()
+    {
+    this.loading_options_failed = true;
+    }
 }

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

@@ -42 +42 @@
     private String default_process_expression = "";
     private boolean does_explode_metadata_databases = false; 
+    private boolean loading_options_failed = false;
 
     
@@ -80 +81 @@
     plugin_name = null;
     return plugin;
+    }
+
+
+    public boolean didLoadingOptionsFail()
+    {
+    return loading_options_failed;
     }
 
@@ -203 +210 @@
     this.does_explode_metadata_databases = does_explode_metadata_databases;
     }
+
+
+    public void setLoadingOptionsFailed()
+    {
+    this.loading_options_failed = true;
+    }
 }

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

@@ -83 +83 @@
     // If we've found the classifier, load its arguments now, if required
     if (classifier != null && arguments_required) {
-        if (classifier.getArguments().size() == 0) {
+        if (classifier.getArguments().size() == 0 && classifier.didLoadingOptionsFail() == false) {
         loadClassifierInfo(classifier, collection_specific);
         }
@@ -165 +165 @@
         // Check the XML output was obtained successfully
         if (classinfo_xml == null || classinfo_xml.length() == 0) {
+        classifier.setLoadingOptionsFailed();
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.ClassifierManager.Classifier_XML_Parse_Failed", classifier.getName()), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         return;
@@ -242 +243 @@
     Document document = XMLTools.parseXML(new StringReader(xml));
     if (document == null) {
+        classifier.setLoadingOptionsFailed();
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.ClassifierManager.Classifier_XML_Parse_Failed", classifier.getName()), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         return;

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

@@ -84 +84 @@
     // If we've found the plugin, load its arguments now, if required
     if (plugin != null && arguments_required) {
-        if (plugin.getArguments().size() == 0) {
+        if (plugin.getArguments().size() == 0 && plugin.didLoadingOptionsFail() == false) {
         loadPluginInfo(plugin, collection_specific);
         }
@@ -166 +166 @@
         // Check the XML output was obtained successfully
         if (pluginfo_xml == null || pluginfo_xml.length() == 0) {
+        plugin.setLoadingOptionsFailed();
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.PlugInManager.PlugIn_XML_Parse_Failed", plugin.getName()), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         return;
@@ -243 +244 @@
     Document document = XMLTools.parseXML(new StringReader(xml));
     if (document == null) {
+        plugin.setLoadingOptionsFailed();
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.PlugInManager.PlugIn_XML_Parse_Failed", plugin.getName()), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
         return;