Changeset 18588 for gli/trunk

Timestamp:

2009-02-23T15:33:19+13:00 (15 years ago)

Author:

kjdon

Message:

GLI three modes change: duplicate plugins can be added now in librarian mode. plugin movement can also occur in all modes. The only mode dependent thing left is that special plugs are hidden/non-removable in lower modes, visible in expert mode.

File:

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

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

@@ -124 +124 @@
         }
         }
-    }
-
-    // Now remove any assigned plugins
-    if (Configuration.getMode() < Configuration.SYSTEMS_MODE) {
-        available.removeAll(children());
     }
         
@@ -549 +544 @@
         plugin_list_pane.add(plugin_list_label, BorderLayout.NORTH);
         plugin_list_pane.add(new JScrollPane(plugin_list), BorderLayout.CENTER);
-        modeChanged(Configuration.getMode()); // Whether the movement buttons are visible is mode dependant
+        plugin_list_pane.add(movement_pane, BorderLayout.LINE_END);
+        modeChanged(Configuration.getMode()); // Whether the special plugins are hidden or not is mode dependant
 
         plugin_label.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
@@ -600 +596 @@
     public void modeChanged(int mode) {
         // First of all we clear the current selection, as there can be some serious problems if the user selects the plugins we're hiding, or had the last plugin selected before we unhid the last three
-        plugin_list.clearSelection();
-        // The first change is dependant on whether the user is systems mode or higher
-     
+        plugin_list.clearSelection();    
         plugin_combobox.setModel(new DefaultComboBoxModel(getAvailablePlugins()));
-     
-        if(mode >= Configuration.SYSTEMS_MODE) {
-        // Show movement buttons
-             
-        plugin_list_pane.add(movement_pane, BorderLayout.EAST);
-        // Do we show Arc and RecPlugs or hide them and the separator line
-        setHideLines(!(mode >= Configuration.EXPERT_MODE));
-        }
-        // Otherwise hide the movement buttons and fixed plugins
-        else {
-        plugin_list_pane.remove(movement_pane);
-        setHideLines(true);
-        }
+        setHideLines(!(mode >= Configuration.EXPERT_MODE));
+
         plugin_list_pane.updateUI();
     }
@@ -663 +646 @@
             assignPlugin(new_plugin);
             plugin_list.setSelectedValue(new_plugin, true);
-
-            // Remove the plugin from the available list (unless we're in a high mode, or it's UnknownPlug)
-            if (Configuration.getMode() < Configuration.SYSTEMS_MODE && !plugin_name.equals(StaticStrings.UNKNOWNPLUG_STR)) {
-            plugin_combobox.removeItem(plugin);
-            plugin_combobox.setSelectedIndex(0);
-            }
         }
         }
@@ -752 +729 @@
             else {
               // don't let people remove special plugins such GreenstoneXMLPlug and GreenstoneMETSPlug,
-              // unless they are in systems mode or above
+              // unless they are in expert mode or above
               int mode = Configuration.getMode();
               for (int i=0; i<StaticStrings.KEEP_PLUG.length; i++) {
                 if ((plugin_name.equals(StaticStrings.KEEP_PLUG[i])) &&
-                  (mode < Configuration.SYSTEMS_MODE)) {
+                  (mode < Configuration.EXPERT_MODE)) {
                   remove.setEnabled(false);
                   break;
@@ -883 +860 @@
             
             // don't let people remove special plugins such GAPlug an METSPlug,
-            // unless they are in systems mode or above
+            // unless they are in expert mode or above
             int mode = Configuration.getMode();
             for (int i=0; i<StaticStrings.KEEP_PLUG.length; i++) {
@@ -893 +870 @@
                 remove.setEnabled(false);
               }else if ((selected_plugin_name.equals(StaticStrings.KEEP_PLUG[i])) &&
-                (mode < Configuration.SYSTEMS_MODE)) {
+                (mode < Configuration.EXPERT_MODE)) {
                 remove.setEnabled(false);
                 break;