Changeset 8169

Timestamp:

2004-09-28T16:04:55+12:00 (20 years ago)

Author:

mdewsnip

Message:

Removed a ton of crap (hopefully this doesn't break anything). Also fixed a couple of bugs, including (I hope) the nasty NPE in BasicComboBoxUI.getDisplaySize (1291) caused irregularly by the call to updateUI().

File:

• trunk/gli/src/org/greenstone/gatherer/gui/GComboBox.java (modified) (13 diffs)

trunk/gli/src/org/greenstone/gatherer/gui/GComboBox.java

@@ -50 +50 @@
     extends JComboBox {
 
-    private boolean editable = true;
-
     private Color background = null;
     private Color foreground = null;
@@ -66 +64 @@
     public GComboBox(boolean editable) {
     super();
-    this.editable = editable;
-    super.setEditable(editable);
+    setEditable(editable);
     init();
     }
@@ -78 +75 @@
     public GComboBox(ArrayList data, boolean editable) {
     super(data.toArray());
-    this.editable = editable;
-    super.setEditable(editable);
+    setEditable(editable);
     init();
     }
@@ -90 +86 @@
     public GComboBox(ComboBoxModel model, boolean editable) {
     super(model);
-    this.editable = editable;
-    super.setEditable(editable);
+    setEditable(editable);
     init();
     }
@@ -99 +94 @@
     super();
     init();
-    }
+   }
 
     public GComboBox(Object data[]) {
@@ -108 +103 @@
     public GComboBox(Object data[], boolean editable) {
     super(data);
-    this.editable = editable;
-    super.setEditable(editable);
+    setEditable(editable);
     init();
     }
@@ -120 +114 @@
     public GComboBox(Vector data, boolean editable) {
     super(data);
-    this.editable = editable;
-    super.setEditable(editable);
+    setEditable(editable);
     init();
     }
 
     public int add(Object object) {
-    if(dataModel instanceof Model) {
-        return ((Model)dataModel).add(object);
+    if (dataModel instanceof Model) {
+        return ((Model) dataModel).add(object);
     }
     else {
@@ -139 +132 @@
 
     public void clear() {
-    if(dataModel instanceof Model) {
-        ((Model)dataModel).clear();
-    }
-    }
-
-    /** Overridden to do nothing. 
-     * @param background
-     */
-    public void setBackground(Color background) {
-    }
-
-//      public void setBackgroundEditableColor(Color editable_background) {
-//      this.editable_background = editable_background;
-//      setEditor(new Editor());
-//      setRenderer(new Renderer());
-//      }
-
-    public void setBackgroundNonSelectionColor(Color background) {
-    this.background = background;
-    setEditor(new Editor());
-    setRenderer(new Renderer());
-    }
-
-    public void setBackgroundSelectionColor(Color selection_background) {
-    this.selection_background = selection_background;
-    setEditor(new Editor());
-    setRenderer(new Renderer());
-    }
-
-    public void setEditable(boolean editable) {
-    super.setEditable(editable);
-    this.editable = editable;
-    if(editable) {
-        this.setBackground(editable_background);
-        this.setForeground(editable_foreground);
-    }
-    else {
-        this.setBackground(background);
-        this.setForeground(foreground);
-    }
-    setEditor(new Editor());
-    setRenderer(new Renderer());
-    updateUI();
-    }
-
-//      public void setTextEditableColor(Color editable_foreground) {
-//      this.editable_foreground = editable_foreground;
-//      setEditor(new Editor());
-//      setRenderer(new Renderer());
-//      }
-
-    public void setTextNonSelectionColor(Color foreground) {
-    this.foreground = foreground;
-    setEditor(new Editor());
-    setRenderer(new Renderer());
-    }
-
-    public void setTextSelectionColor(Color selection_foreground) {
-    this.selection_foreground = selection_foreground;
-    setEditor(new Editor());
-    setRenderer(new Renderer());
+    if (dataModel instanceof Model) {
+        ((Model) dataModel).clear();
+    }
     }
 
@@ -207 +142 @@
     setModel(model);
     setOpaque(true);
+
     // Restore any data given into our model
     for(int i = 0; i < old_model.getSize(); i++) {
         model.add(old_model.getElementAt(i));
     }
+
     // Change component
     UI ui = new UI();
     setUI(ui);
     ui.setButtonBackground();
+
     // Initialization
     this.background = Gatherer.config.getColor("coloring.collection_tree_background", false);
@@ -222 +160 @@
     this.selection_background = Gatherer.config.getColor("coloring.collection_selection_background", false);
     this.selection_foreground = Gatherer.config.getColor("coloring.collection_selection_foreground", false);
-    if(editable) {
+    if (isEditable()) {
         this.setBackground(editable_background);
         this.setForeground(editable_foreground);
@@ -231 +169 @@
     }
     setBorder(BorderFactory.createLoweredBevelBorder());
+    setRenderer(new Renderer());
+    }
+
+    /** Overridden to do nothing. 
+     * @param background
+     */
+    public void setBackground(Color background) {
+    }
+
+    public void setBackgroundEditableColor(Color editable_background) {
+    this.editable_background = editable_background;
+    }
+
+    public void setBackgroundNonSelectionColor(Color background) {
+    this.background = background;
+    }
+
+    public void setBackgroundSelectionColor(Color selection_background) {
+    this.selection_background = selection_background;
+    }
+
+    public void setEditable(boolean editable) {
     setEditor(new Editor());
-    setRenderer(new Renderer());
-    }
+    super.setEditable(editable);
+    if (isEditable()) {
+        this.setBackground(editable_background);
+        this.setForeground(editable_foreground);
+    }
+    else {
+        this.setBackground(background);
+        this.setForeground(foreground);
+    }
+    }
+
+    public void setTextEditableColor(Color editable_foreground) {
+    this.editable_foreground = editable_foreground;
+    }
+
+    public void setTextNonSelectionColor(Color foreground) {
+    this.foreground = foreground;
+    }
+
+    public void setTextSelectionColor(Color selection_foreground) {
+    this.selection_foreground = selection_foreground;
+    }
+
 
     private class Editor
@@ -240 +221 @@
     public Editor() {
         setOpaque(true);
-        if(editable) {
+        if (isEditable()) {
         setBackground(editable_background);
         setForeground(editable_foreground);
@@ -323 +304 @@
         this.setForeground(selection_foreground);
         }
-        else if(editable) {
+        else if (isEditable()) {
         this.setBackground(editable_background);
         this.setForeground(editable_foreground);