Changeset 12303 for trunk/gli/src/org

Timestamp:

2006-07-25T13:48:53+12:00 (18 years ago)

Author:

kjdon

Message:

made BasicSeparator a static class, removed some custom plugin code

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/PluginManager.java (modified) (4 diffs)

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

@@ -848 +848 @@
         Object selected_object = plugin_combobox.getSelectedItem();
         if(selected_object != null) {
-            // Retrieve the base plugin if any
+            // Retrieve the base plugin 
             Plugin base_plugin = getBasePlugin(selected_object.toString());
-
+            if (base_plugin == null) {
+            // shouldn't happen
+            return;
+            }
+            
             // Create a new element in the DOM
             Element element = CollectionDesignManager.collect_config.document.createElement(CollectionConfiguration.PLUGIN_ELEMENT);
@@ -863 +867 @@
             plugin_list.setSelectedValue(new_plugin, true);
             // Since we weren't cancelled, if we are in a low mode, remove the plugin from the available list (except for UnknownPlug
-            if(base_plugin != null && Configuration.getMode() <= Configuration.SYSTEMS_MODE && !base_plugin.getName().equals(StaticStrings.UNKNOWNPLUG_STR)) {
+            if(Configuration.getMode() <= Configuration.SYSTEMS_MODE && !base_plugin.getName().equals(StaticStrings.UNKNOWNPLUG_STR)) {
                 plugin_combobox.removeItem(base_plugin);
                 plugin_combobox.setSelectedIndex(0);
@@ -1196 +1200 @@
         Object selected_object = suitable_plugins_combobox.getSelectedItem();
         Plugin base_plugin = getBasePlugin(selected_object.toString());
-
+        if (base_plugin == null) {
+            // shouldn't happen - we are not allowed custom plugins anymore
+            setVisible(false);
+            return;
+        }
         // Create a new element in the DOM
         Element element = CollectionDesignManager.collect_config.document.createElement(CollectionConfiguration.PLUGIN_ELEMENT);
-        // Remember that the plugin supplied might be a custom string rather than a base plugin
-        Plugin new_plugin = null;
-        if(base_plugin != null) {
-            //DebugStream.println("New Plugin based on existing Plugin");
-            element.setAttribute(CollectionConfiguration.TYPE_ATTRIBUTE, base_plugin.getName());
-            new_plugin = new Plugin(element, base_plugin);
-        }
-        else {
-            //DebugStream.println("New Custom Plugin");
-            element.setAttribute(CollectionConfiguration.TYPE_ATTRIBUTE, selected_object.toString());
-            new_plugin = new Plugin(element, null);
-        }
+        element.setAttribute(CollectionConfiguration.TYPE_ATTRIBUTE, base_plugin.getName());
+        Plugin new_plugin = new Plugin(element, base_plugin);
         assignPlugin(new_plugin);
         } // else do nothing
@@ -1238 +1236 @@
 
     /** This class behaves just like a normal JSeparator except that, no matter what the current settings in the UIManager are, it always paints itself with BasicSeparatorUI. */
-    private class BasicSeparator
+    private static class BasicSeparator
     extends JSeparator {