Changeset 7270 for trunk

Timestamp:

2004-05-05T10:50:29+12:00 (20 years ago)

Author:

kjdon

Message:

undid most of what I previously commited. GAPlug is now treated like other plugins except that you can't delete it. there is no top separator.

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/PlugInManager.java (modified) (18 diffs)

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

@@ -57 +57 @@
     /** The library 'reserve' of base plugins. */
     private ArrayList library = null;
-    /** When asking how many rows are in the model, and if this variables value is true, then this modifier alters the number returned. This funtionality is used to hide the first two and last three rows of the list in low detail modes. */
+    /** When asking how many rows are in the model, and if this variables value is true, then this modifier alters the number returned. This funtionality is used to hide the last three rows of the list in low detail modes. */
     private boolean modify_row_count = false;
     /** The controls for editing the contents of this manager. */
@@ -63 +63 @@
     private DOMProxyListModel model;
     private JPanel separator;
-    private PlugIn top_separator_plugin;
-    private PlugIn bottom_separator_plugin;
+    private PlugIn separator_plugin;
     /** Constructor.
      */
@@ -92 +91 @@
     public void assignPlugIn(PlugIn plugin) {
     if(plugin.getName().equals(StaticStrings.RECPLUG_STR) || plugin.getName().equals(StaticStrings.ARCPLUG_STR)) {
-        addAfter(plugin, bottom_separator_plugin); // Adds after separator
-    } else if (plugin.getName().equals(StaticStrings.GAPLUG_STR)) {
-        addBefore(plugin, top_separator_plugin);
+        addAfter(plugin, separator_plugin); // Adds after separator
     } else {
-        addBefore(plugin, bottom_separator_plugin);
+        addBefore(plugin, separator_plugin);
     }
     Gatherer.c_man.configurationChanged();
-    }
-
-    /** override this because we want to use the real getElementAt */
-    public synchronized ArrayList children() {
-    ArrayList child_list = new ArrayList();
-    int child_count = super.getSize();
-    for(int i = 0; i < child_count; i++) {
-        child_list.add(super.getElementAt(i));
-    }
-    return child_list;
     }
 
@@ -156 +143 @@
     return null;
     }
-    /** override this to hide the first two entries in some cases */
-    public synchronized Object getElementAt(int index) {
-    if (modify_row_count) {
-        index = index+2;
-    }
-    return super.getElementAt(index);
-    }
+
     /** Overrides getSize in DOMProxyListModel to take into account the row count modifier used to hide the last three rows in lower detail modes
      * @return an int indicating the number of rows in the model, or more correctly the desired number of rows to display
@@ -169 +150 @@
     int result = super.getSize();
     if(modify_row_count) {
-        result = result - 5;
+        result = result-3;
     }
     return result;
@@ -190 +171 @@
     // why are all the error notices there when the buttons are disabled is you cant move???
     public void movePlugIn(PlugIn plugin, boolean direction, boolean all) {
-    // Can't ever move RecPlug or ArcPlug or GAPlug
-    if(super.getSize() < 7) {
+    // Can't ever move RecPlug or ArcPlug
+    if(super.getSize() < 4) {
         //Gatherer.println("Not enough plugins to allow moving.");
         return;
     }
-    if(plugin.getName().equals(StaticStrings.ARCPLUG_STR) || plugin.getName().equals(StaticStrings.RECPLUG_STR) || plugin.getName().equals(StaticStrings.GAPLUG_STR)) {
+    if(plugin.getName().equals(StaticStrings.ARCPLUG_STR) || plugin.getName().equals(StaticStrings.RECPLUG_STR)) {
         JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.Move.Fixed"), Dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
         return;
@@ -204 +185 @@
         // Remove the moving plugin
         remove(plugin);
-        addAfter(plugin, top_separator_plugin); //************
+        // Retrieve the first plugin
+        PlugIn first_plugin = (PlugIn) getElementAt(0);
+        // Add the moving plugin before the first plugin
+        addBefore(plugin, first_plugin);
+        first_plugin = null;
         Gatherer.c_man.configurationChanged();
         }
@@ -211 +196 @@
         remove(plugin);
         // Add the moving plugin before the separator
-        addBefore(plugin, bottom_separator_plugin);
+        addBefore(plugin, separator_plugin);
         Gatherer.c_man.configurationChanged();
         }
@@ -228 +213 @@
             return;
         }
-        PlugIn next_plugin = (PlugIn) super.getElementAt(index);
+        remove(plugin);
+        add(index, plugin);
+        Gatherer.c_man.configurationChanged();
+        }
+        else {
+        index++;
+        PlugIn next_plugin = (PlugIn) getElementAt(index);
         if(next_plugin.isSeparator()) {
             String args[] = new String[1];
@@ -240 +231 @@
         Gatherer.c_man.configurationChanged();
         }
-        else {
-        index++;
-        PlugIn next_plugin = (PlugIn) super.getElementAt(index);
-        if(next_plugin.isSeparator()) {
-            String args[] = new String[1];
-            args[0] = plugin.getName();
-            JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.Move.Cannot", args), Dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
-            // Still not going to move RecPlug or ArcPlug.
-            return;
-        }
-        remove(plugin);
-        add(index, plugin);
-        Gatherer.c_man.configurationChanged();
-        }
     }
     }
@@ -259 +236 @@
     /** We attempt to place the separator between the unfixed and the fixed plugins. Since we only know of two fixed plugins, we search for either of them, and place the separator before them.
      */
-    public void placeSeparators() {
+    public void placeSeparator() {
     ///ystem.err.println("Placing separator.");
     int separator_index = super.getSize();
-    int top_separator_index = 0;
     if(separator_index > 0) { 
-        // see if GAPlug is there
-        PlugIn plugin = (PlugIn) super.getElementAt(0);
-        if (plugin.getName().equals(StaticStrings.GAPLUG_STR)) {
-        top_separator_index = 1;
-        }
         boolean found_fixed = false;
         int index = separator_index - 1;
         while(index > 0) {
-        plugin = (PlugIn) super.getElementAt(index);
+        PlugIn plugin = (PlugIn) getElementAt(index);
         String name = plugin.getName();
         if(name.equals(StaticStrings.RECPLUG_STR) || name.equals(StaticStrings.ARCPLUG_STR)) {
@@ -294 +265 @@
     element.setAttribute(CollectionConfiguration.TYPE_ATTRIBUTE, CollectionConfiguration.SEPARATOR_ATTRIBUTE);
     element.setAttribute(CollectionConfiguration.SEPARATOR_ATTRIBUTE, CollectionConfiguration.TRUE_STR);
-    bottom_separator_plugin = new PlugIn(element, null);
-    top_separator_plugin = new PlugIn((Element)element.cloneNode(true), null);
+    separator_plugin = new PlugIn(element, null);
     ///atherer.println("Adding plugin separator at: " + separator_index);
-    add(separator_index, bottom_separator_plugin);
-    add(top_separator_index, top_separator_plugin);
+    add(separator_index, separator_plugin);
     }
 
@@ -331 +300 @@
     if(modify_row_count) {
         fireIntervalRemoved(this, original_size - 4, original_size - 1);
-        fireIntervalRemoved(this, 0,1);
     }
     else {
-        fireIntervalAdded(this, 0, 1);
         fireIntervalAdded(this, original_size - 4, original_size - 1);
     }
     }
 
-    /** Determine the first separat */
     /** Determine the current separator index. */
     private int findSeparatorIndex() {
     int separator_index = super.getSize() - 1;
     while(separator_index >= 0) {
-        PlugIn search = (PlugIn) super.getElementAt(separator_index);
+        PlugIn search = (PlugIn) getElementAt(separator_index);
         if(search.isSeparator()) {
         return separator_index;
@@ -350 +316 @@
         separator_index--;
     }
-    System.err.println("separator index is "+separator_index);
     return separator_index;
     }
@@ -977 +942 @@
                 configure.setEnabled(true);
                 String plugin_name = selected_plugin.getName();
-                // Some buttons are only available for plugins other than ArcPlug and RecPlug and GAPlug
-                if(plugin_name.equals(StaticStrings.ARCPLUG_STR) || plugin_name.equals(StaticStrings.RECPLUG_STR) || plugin_name.equals(StaticStrings.GAPLUG_STR)) {
+                // Some buttons are only available for plugins other than ArcPlug and RecPlug 
+                if(plugin_name.equals(StaticStrings.ARCPLUG_STR) || plugin_name.equals(StaticStrings.RECPLUG_STR) ) {
                 //move_top_button.setEnabled(false);
                 move_up_button.setEnabled(false);
@@ -986 +951 @@
                 }
                 else {
-                // Move ups are only enabled if the selected plugin isn't already at the top (allowing for GAPlug)
-                int top_index = (modify_row_count ? 0: 2);
-                PlugIn first_plugin = (PlugIn) getElementAt(top_index);
+                // don't let people remove GAPlug
+                if (plugin_name.equals(StaticStrings.GAPLUG_STR)) {
+                    remove.setEnabled(false); 
+                } else {
+                    remove.setEnabled(true);
+                }
+                    
+                // Move ups are only enabled if the selected plugin isn't already at the top 
+                PlugIn first_plugin = (PlugIn) getElementAt(0);
                 if(!first_plugin.equals(selected_plugin)) {
                     //move_top_button.setEnabled(true);
@@ -998 +969 @@
                 }
                 // And move downs are only allowed when the selected plugin isn't at an index one less than the separator line.
-                int bottom_index = (modify_row_count ? model.getSize(): findSeparatorIndex());
+                int separator_index = findSeparatorIndex();
                 int selected_index = plugin_list.getSelectedIndex();
-                if(selected_index < bottom_index - 1) {
+                if(selected_index < separator_index - 1) {
                     move_down_button.setEnabled(true);
                     //move_bottom_button.setEnabled(true);
@@ -1008 +979 @@
                     //move_bottom_button.setEnabled(false);
                 }
-                remove.setEnabled(true);
                 }
                 selected_plugin = null;