Changeset 6321

Timestamp:

2003-12-19T14:49:04+13:00 (20 years ago)

Author:

jmt12

Message:

Changed JComboBoxes for GComboBoxes to avoid Mac graphical glitch - however now I can't seem to make them the right colour

Location:

trunk/gli/src/org/greenstone/gatherer/gui

Files:

• GComboBox.java (modified) (9 diffs)
• OptionsPane.java (modified) (10 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;
+    private Color editable_background = null;
+    private Color editable_foreground = null;
     private Color selection_background = null;
     private Color selection_foreground = null;
@@ -60 +64 @@
     }
 
+    public GComboBox(boolean editable) {
+    super();
+    this.editable = editable;
+    super.setEditable(editable);
+    init();
+    }
+
     public GComboBox(ArrayList data) {
     super(data.toArray());
@@ -65 +76 @@
     }
 
+    public GComboBox(ArrayList data, boolean editable) {
+    super(data.toArray());
+    this.editable = editable;
+    super.setEditable(editable);
+    init();
+    }
+
     public GComboBox(ComboBoxModel model) {
     super(model);
+    init();
+    }
+
+    public GComboBox(ComboBoxModel model, boolean editable) {
+    super(model);
+    this.editable = editable;
+    super.setEditable(editable);
     init();
     }
@@ -81 +106 @@
     }
 
+    public GComboBox(Object data[], boolean editable) {
+    super(data);
+    this.editable = editable;
+    super.setEditable(editable);
+    init();
+    }
+
     public GComboBox(Vector data) {
     super(data);
+    init();
+    }
+
+    public GComboBox(Vector data, boolean editable) {
+    super(data);
+    this.editable = editable;
+    super.setEditable(editable);
     init();
     }
@@ -109 +148 @@
     }
 
+    /** 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;
@@ -115 +166 @@
     }
 
+    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;
+    setEditor(new Editor());
+    setRenderer(new Renderer());
+    }
+
+    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 setBackgroundSelectionColor(Color selection_background) {
-    this.selection_background = selection_background;
     setEditor(new Editor());
     setRenderer(new Renderer());
@@ -148 +212 @@
     this.background = Gatherer.config.getColor("coloring.collection_tree_background", false);
     this.foreground = Gatherer.config.getColor("coloring.collection_tree_foreground", false);
+    this.editable_background = Gatherer.config.getColor("coloring.editable_background", false);
+    this.editable_foreground = Gatherer.config.getColor("coloring.editable_foreground", false);
     this.selection_background = Gatherer.config.getColor("coloring.collection_selection_background", false);
     this.selection_foreground = Gatherer.config.getColor("coloring.collection_selection_foreground", false);
-    setEditor(new Editor());
+    if(editable) {
+        this.setBackground(editable_background);
+        this.setForeground(editable_foreground);
+    }
+    else {
+        this.setBackground(background);
+        this.setForeground(foreground);
+    }
+    setBorder(BorderFactory.createLoweredBevelBorder());
+    setEditor(new Editor());
+    setOpaque(true);
     setRenderer(new Renderer());
     }
@@ -158 +234 @@
     implements ComboBoxEditor {
     public Editor() {
-        setBackground(background);
-        setForeground(foreground);
-        setSelectionColor(selection_background);
-        setSelectedTextColor(selection_foreground);
+        setBackground(editable_background);
+        setForeground(editable_foreground);
+        setOpaque(true);
+        if(editable) {
+        setSelectionColor(selection_background);
+        setSelectedTextColor(selection_foreground);
+        }
     }
 
@@ -221 +300 @@
     implements ListCellRenderer {
     public Renderer() {
+        super("");
+        this.setBackground(background);
+        this.setForeground(foreground);
+        this.setOpaque(true);
     }
     public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
         if(value != null) {
-        setText(value.toString());
+        this.setText(value.toString());
         }
         else {
-        setText("");
-        }
-        setBackground(isSelected ? selection_background : background);
-        setForeground(isSelected ? selection_foreground : foreground);
-        setOpaque(true);
+        this.setText("");
+        }
+        if(editable) {
+        this.setBackground(editable_background);
+        this.setForeground(editable_foreground);
+        }
+        else {
+        this.setBackground(background);
+        this.setForeground(foreground);
+        }
         return this;
     }

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

@@ -62 +62 @@
 public class OptionsPane
     extends JPanel 
-    implements AppendLineOnlyFileDocumentOwner {
+    implements AppendLineOnlyFileDocumentOwner, MouseListener {
 
     static final public char SUCCESSFUL = 's';
@@ -72 +72 @@
     public JTextArea log_textarea = null;
 
+    private ArrayList current_controls;
+
     /** The <strong>BuildOptions</strong> data object contains all the option settings we wish to persist between Gatherer sessions (and thus is stored in <strong>Collection</strong>). */
     private BuildOptions build_options = null;
 
     private FileEntry file_entry = null;
+
     /** the log pane - we only create it once now, not each time */
     private JPanel log_pane = null;
@@ -93 +96 @@
     public OptionsPane(BuildOptions build_options) {
     this.build_options = build_options;
+    this.current_controls = new ArrayList();
     this.writing_documents = new Vector();
 
@@ -104 +108 @@
      */
     public JPanel buildBuild() {
+    current_controls.clear();
     JPanel pane = new JPanel();
     pane.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
@@ -117 +122 @@
         ArgumentControl argument_control = new ArgumentControl(BUILD, argument, enabled, value);
         pane.add(argument_control);
-    }
+        current_controls.add(argument_control);
+    }
+    pane.addMouseListener(this);
     return pane;
     }
@@ -124 +131 @@
      */
     public JPanel buildImport() {
+    current_controls.clear();
     JPanel pane = new JPanel();
     pane.setBackground(Gatherer.config.getColor("coloring.collection_tree_background", false));
@@ -137 +145 @@
         ArgumentControl argument_control = new ArgumentControl(IMPORT, argument, enabled, value);
         pane.add(argument_control);
-    }
+        current_controls.add(argument_control);
+    }
+    pane.addMouseListener(this);
     return pane;
     }
@@ -153 +163 @@
         File children[] = log_directory.listFiles();
         for(int i = 0; children != null && i < children.length; i++) {
-        if(children[i].getName().startsWith("build_log") && children[i].getName().endsWith(".txt") ) {
-            FileEntry entry = new FileEntry(children[i].getName(), children[i].getAbsolutePath());
-            // We are about to insert it. But where.
-            boolean found = false;
-            for(int j = 0; !found && j < contents.size(); j++) {
-            FileEntry sibling = (FileEntry) contents.getElementAt(j);
-            int order = entry.compareTo(sibling);
-            if(order > 0) {
-                contents.insertElementAt(entry, j);
-                found = true;
+        String filename = children[i].getName();
+        if(filename.startsWith("build_log.") && filename.endsWith(".txt") ) {
+            String datestamp = filename.substring(filename.indexOf(".") + 1, filename.lastIndexOf(".")).toLowerCase();
+            if(datestamp.indexOf("s") == -1 && datestamp.indexOf("u") == -1 && datestamp.indexOf("c") == -1 && datestamp.indexOf("x") == -1) {
+            FileEntry entry = new FileEntry(children[i].getName(), children[i].getAbsolutePath());
+            // We are about to insert it. But where.
+            boolean found = false;
+            for(int j = 0; !found && j < contents.size(); j++) {
+                FileEntry sibling = (FileEntry) contents.getElementAt(j);
+                int order = entry.compareTo(sibling);
+                if(order > 0) {
+                contents.insertElementAt(entry, j);
+                found = true;
+                }
             }
-            }
-            if(!found) {
-            contents.addElement(entry);
+            if(!found) {
+                contents.addElement(entry);
+            }
             }
         }
@@ -250 +264 @@
     }
 
+    /** Implementation side-effect
+     * @param e a MouseEvent
+     */
+    public void mouseClicked(MouseEvent e) {}
+
+    /** Implementation side-effect
+     * @param e a MouseEvent
+     */
+    public void mouseEntered(MouseEvent e) {}
+
+    /** Implemented to ensure that, by the time the mouse pointer leaves the current build options screen, ang changes to the value the JSpinners have been commited
+     * @param e a MouseEvent
+     */
+    public void mouseExited(MouseEvent e) {
+    // Loop through the controls, and if the current control is a JSpinner, commit its current editing
+    for(int i = 0; i < current_controls.size(); i++) {
+        ArgumentControl control = (ArgumentControl) current_controls.get(i);
+        JComponent value_control = control.getValueControl();
+        if(value_control instanceof JSpinner) {
+        try {
+            ((JSpinner)value_control).commitEdit();
+        }
+        catch(Exception exception) {
+            Gatherer.println("Exception in OptionsPane.mouseExited() - unexpected");
+            Gatherer.printStackTrace(exception);
+        }
+        }
+        value_control = null;
+        control = null;
+    }
+    }
+
+    /** Implementation side-effect
+     * @param e a MouseEvent
+     */
+    public void mousePressed(MouseEvent e) {}
+
+    /** Implementation side-effect
+     * @param e a MouseEvent
+     */
+    public void mouseReleased(MouseEvent e) {}
+
     private class ArgumentControl
     extends JPanel {
@@ -389 +445 @@
         add(enabled, BorderLayout.WEST);
         }
+    }
+
+    /** Retrieve the control used for storing values.
+     * @return JComponent
+     */
+    public JComponent getValueControl() {
+        return value_control;
     }