Changeset 6254

Timestamp:

2003-12-12T17:55:02+13:00 (20 years ago)

Author:

jmt12

Message:

Provided a custom basic JSeparator for plugin list

File:

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

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

@@ -33 +33 @@
 import javax.swing.*;
 import javax.swing.event.*;
+import javax.swing.plaf.*;
 import javax.swing.plaf.basic.*;
 import org.apache.xerces.parsers.*;
@@ -870 +871 @@
             }
             else {
-               configure.setEnabled(true);
-               // Some buttons are only available for plugins other than ArcPlug and RecPlug
-               PlugIn selected_plugin = (PlugIn) plugin_list.getSelectedValue();
-               String plugin_name = selected_plugin.getName();
-               if(plugin_name.equals(StaticStrings.ARCPLUG_STR) || plugin_name.equals(StaticStrings.RECPLUG_STR)) {
-               move_top_button.setEnabled(false);
-               move_up_button.setEnabled(false);
-               move_down_button.setEnabled(false);
-               move_bottom_button.setEnabled(false);
-               remove.setEnabled(false);
-               }
-               else {
-              // 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);
-                 move_up_button.setEnabled(true);
-              }
-              else {
-                 move_top_button.setEnabled(false);
-                 move_up_button.setEnabled(false);
-              }
-              // And move downs are only allowed when the selected plugin isn't at an index one less than the separator line.
-              int separator_index = findSeparatorIndex();
-              int selected_index = plugin_list.getSelectedIndex();
-              if(selected_index != separator_index - 1) {
-                 move_down_button.setEnabled(true);
-                 move_bottom_button.setEnabled(true);
-              }
-              else {
-                 move_down_button.setEnabled(false);
-                 move_bottom_button.setEnabled(false);
-              }
-              remove.setEnabled(true);
-               }
-               selected_plugin = null;
-               plugin_name = null;
+            PlugIn selected_plugin = (PlugIn) plugin_list.getSelectedValue();
+            if(selected_plugin.isSeparator()) {
+                move_top_button.setEnabled(false);
+                move_up_button.setEnabled(false);
+                move_down_button.setEnabled(false);
+                move_bottom_button.setEnabled(false);
+                configure.setEnabled(false);
+                remove.setEnabled(false);
+            }
+            else {
+                configure.setEnabled(true);
+                String plugin_name = selected_plugin.getName();
+                // 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);
+                move_down_button.setEnabled(false);
+                move_bottom_button.setEnabled(false);
+                remove.setEnabled(false);
+                }
+                else {
+                // 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);
+                    move_up_button.setEnabled(true);
+                }
+                else {
+                    move_top_button.setEnabled(false);
+                    move_up_button.setEnabled(false);
+                }
+                // And move downs are only allowed when the selected plugin isn't at an index one less than the separator line.
+                int separator_index = findSeparatorIndex();
+                int selected_index = plugin_list.getSelectedIndex();
+                if(selected_index != separator_index - 1) {
+                    move_down_button.setEnabled(true);
+                    move_bottom_button.setEnabled(true);
+                }
+                else {
+                    move_down_button.setEnabled(false);
+                    move_bottom_button.setEnabled(false);
+                }
+                remove.setEnabled(true);
+                }
+                selected_plugin = null;
+                plugin_name = null;
+            }
             }
         }
@@ -968 +979 @@
     }
 
-    /** This listener reacts to changes in the current selection of the plugin combobox. */
-    private class PlugInComboboxListener
+    /** This listener reacts to changes in the current selection of the plugin combobox. */
+    private class PlugInComboboxListener
         implements ItemListener {
         /** When a user selects a certain plugin, update the tooltip to show the plugin description. */
@@ -989 +1000 @@
         }
     }
-
+    
     /** This class listens for actions upon the remove button in the controls, and if detected calls the <i>removePlugIn()</i> method.
      */
     private class RemoveListener
-        implements ActionListener {
-        /** Any implementation of <i>ActionListener</i> must include this method so that we can be informed when an action has occured on one of our target controls.
+        implements ActionListener {
+        /** Any implementation of <i>ActionListener</i> must include this method so that we can be informed when an action has occured on one of our target controls.
          * @param event An <strong>ActionEvent</strong> containing information garnered from the control action.
          */
@@ -1025 +1036 @@
                 remove.setEnabled(false);
             }
-            /*
-            if(!plugin_list.isSelectionEmpty()) {
-                Object [] objects = plugin_list.getSelectedValues();
-                for(int i = 0; i < objects.length; i++) {
-                    if(objects[i] instanceof PlugIn) {
-                        removePlugIn((PlugIn)objects[i]);
-                    }
-                }
-                // Refresh the available plugins
-                plugin.setModel(new DefaultComboBoxModel(getAvailable()));
-            }
-            */
         }
     }
     }
     /** Creates a list separator.
-     * Code courtesy of Farwell, Paul. Contact <a href="mailto:[email protected]">[email protected]</a>
-     */
-    static private JPanel getSeparator() {
+     * Found on Google Groups. Code courtesy of Paul Farwell.
+     */
+    private JPanel getSeparator() {
     // We put the separator inside a panel to control its appearance
     JPanel _sepPanel = new JPanel();
@@ -1050 +1049 @@
     _sepPanel.setLayout(new BoxLayout(_sepPanel, BoxLayout.Y_AXIS));
     _sepPanel.add(Box.createRigidArea(new Dimension(0, 4)));
-    _sepPanel.add(new JPopupMenu.Separator());
+    // We have to be a little careful here, as the default UI for separators under MacOS is a blank box. Instead we force a BasicUI look
+    _sepPanel.add(new BasicSeparator());
     _sepPanel.add(Box.createRigidArea(new Dimension(0, 4)));
     return _sepPanel;
     }
+
+    /** 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
+    extends JSeparator {
+
+    private ComponentUI basic_ui;
+
+    public BasicSeparator() {
+        super();
+        basic_ui = new BasicSeparatorUI();
+    }
+
+    public void paintComponent(Graphics g) {
+        if (basic_ui != null) {
+        basic_ui.update(g, this);
+        }   
+    }
+    }
 }
+