Changeset 13177
- Timestamp:
- 2006-10-27T15:36:27+13:00 (18 years ago)
- Location:
- trunk/gli/src/org/greenstone/gatherer
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gli/src/org/greenstone/gatherer/cdm/Classifier.java
r12644 r13177 44 44 static final public String CLASSIFIER_PREFIX = "CL"; 45 45 46 private boolean loading_options_failed = false; 47 46 48 47 49 /** Constructor used only in DOMProxyListModel initializations. … … 74 76 75 77 78 public boolean didLoadingOptionsFail() 79 { 80 return loading_options_failed; 81 } 82 83 76 84 /** Generate the string showing this classifiers position. */ 77 85 public String getPositionString() { … … 86 94 return position_string; 87 95 } 96 97 98 public void setLoadingOptionsFailed() 99 { 100 this.loading_options_failed = true; 101 } 88 102 } -
trunk/gli/src/org/greenstone/gatherer/cdm/Plugin.java
r12642 r13177 42 42 private String default_process_expression = ""; 43 43 private boolean does_explode_metadata_databases = false; 44 private boolean loading_options_failed = false; 44 45 45 46 … … 80 81 plugin_name = null; 81 82 return plugin; 83 } 84 85 86 public boolean didLoadingOptionsFail() 87 { 88 return loading_options_failed; 82 89 } 83 90 … … 203 210 this.does_explode_metadata_databases = does_explode_metadata_databases; 204 211 } 212 213 214 public void setLoadingOptionsFailed() 215 { 216 this.loading_options_failed = true; 217 } 205 218 } -
trunk/gli/src/org/greenstone/gatherer/greenstone/Classifiers.java
r13176 r13177 83 83 // If we've found the classifier, load its arguments now, if required 84 84 if (classifier != null && arguments_required) { 85 if (classifier.getArguments().size() == 0 ) {85 if (classifier.getArguments().size() == 0 && classifier.didLoadingOptionsFail() == false) { 86 86 loadClassifierInfo(classifier, collection_specific); 87 87 } … … 165 165 // Check the XML output was obtained successfully 166 166 if (classinfo_xml == null || classinfo_xml.length() == 0) { 167 classifier.setLoadingOptionsFailed(); 167 168 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.ClassifierManager.Classifier_XML_Parse_Failed", classifier.getName()), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE); 168 169 return; … … 242 243 Document document = XMLTools.parseXML(new StringReader(xml)); 243 244 if (document == null) { 245 classifier.setLoadingOptionsFailed(); 244 246 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.ClassifierManager.Classifier_XML_Parse_Failed", classifier.getName()), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE); 245 247 return; -
trunk/gli/src/org/greenstone/gatherer/greenstone/Plugins.java
r13176 r13177 84 84 // If we've found the plugin, load its arguments now, if required 85 85 if (plugin != null && arguments_required) { 86 if (plugin.getArguments().size() == 0 ) {86 if (plugin.getArguments().size() == 0 && plugin.didLoadingOptionsFail() == false) { 87 87 loadPluginInfo(plugin, collection_specific); 88 88 } … … 166 166 // Check the XML output was obtained successfully 167 167 if (pluginfo_xml == null || pluginfo_xml.length() == 0) { 168 plugin.setLoadingOptionsFailed(); 168 169 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.PlugInManager.PlugIn_XML_Parse_Failed", plugin.getName()), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE); 169 170 return; … … 243 244 Document document = XMLTools.parseXML(new StringReader(xml)); 244 245 if (document == null) { 246 plugin.setLoadingOptionsFailed(); 245 247 JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.PlugInManager.PlugIn_XML_Parse_Failed", plugin.getName()), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE); 246 248 return;
Note:
See TracChangeset
for help on using the changeset viewer.