Changeset 6087 for trunk/gli/src/org/greenstone/gatherer/cdm

Timestamp:

2003-12-02T17:18:37+13:00 (21 years ago)

Author:

jmt12

Message:

Extended arguments so they could be given a minimum and maximum range. Then if they are INTEGER type controls, the spinner control generated will honour any range information. Range information is supplied via the perl -xml type mechanism, using the tag form <Range>0,3</Range>

Location:

trunk/gli/src/org/greenstone/gatherer/cdm

Files:

• Argument.java (modified) (3 diffs)
• ArgumentConfiguration.java (modified) (8 diffs)
• ClassifierManager.java (modified) (1 diff)
• PlugInManager.java (modified) (1 diff)

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

@@ -66 +66 @@
     /** The type of this argument. Initially an int, but bytes are cheaper. */
     private byte type = STRING;
+    
+    /** The maximum value an integer based control can have. */
+    private int maximum = Integer.MAX_VALUE;
+    /** The minimum value an integer based control can have. */
+    private int minimum = Integer.MIN_VALUE;
+
     private Element element;
     /** If the argument is of type ENUM then this map holds all the various options. Each entry is an <option value> -> <description> mapping. */
@@ -162 +168 @@
     }
 
+    public int getMaximum() {
+    return maximum;
+    }
+
+    public int getMinimum() {
+    return minimum;
+    }
+
     /** Method to retrieve the option list for this argument.
      * @return A <strong>HashMap</strong> containing &lt;option value&gt; -&gt; &lt;description&gt; entries.
@@ -284 +298 @@
     public void setElement(Element element) {
     this.element = element;
+    }
+
+    public void setMaximum(int maximum) {
+    this.maximum = maximum;
+    }
+
+    public void setMinimum(int minimum) {
+    this.minimum = minimum;
     }
 

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

@@ -325 +325 @@
         Collections.sort(options_model);
         value = new JComboBox(options_model.toArray());
-        ((JComboBox)value).setEditable(true);
+        ((JComboBox)value).setEditable(true);
         ((JComboBox)value).addActionListener(new ToolTipUpdater());
         if(existing_value != null) {
@@ -353 +353 @@
         break;
         case Argument.INTEGER:
+        // Build a spinner
+        JSpinner spinner = new JSpinner(new SpinnerNumberModel(0, argument.getMinimum(), argument.getMaximum(), 1));
+        // If there was an original value, set it.
+        if(existing_value != null) {
+            try {
+            spinner.setValue(new Integer(existing_value));
+            }
+            catch (Exception error) {
+            }
+        }
+        else if(default_value != null) {
+            try {
+            spinner.setValue(new Integer(default_value));
+            }
+            catch (Exception error) {
+            }
+        }
+        // And remember it
+        value = spinner;
+        break;
         case Argument.STRING:
         // Use a standard text field
@@ -450 +470 @@
         break;
         } // end of switch
+
         // Enable or disable as necessary.
         if(argument.isRequired() || argument.isAssigned()) {
@@ -457 +478 @@
             value.setBackground(Color.white);
             value.setEnabled(true);
+            if(value instanceof JSpinner) {
+            // Set enabled
+            JComponent c = ((JSpinner)value).getEditor();
+            if ( c instanceof JSpinner.DefaultEditor ) {
+                JSpinner.DefaultEditor editor = (JSpinner.DefaultEditor) c;
+                JFormattedTextField field = editor.getTextField();
+                field.setEditable(true);
+                field.setBackground(Color.white);
+            }
+            }
         }
         }
@@ -465 +496 @@
             value.setBackground(Color.lightGray);
             value.setEnabled(false);
+            if(value instanceof JSpinner) {
+            // Set enabled
+            JComponent c = ((JSpinner)value).getEditor();
+            if ( c instanceof JSpinner.DefaultEditor ) {
+                JSpinner.DefaultEditor editor = (JSpinner.DefaultEditor) c;
+                JFormattedTextField field = editor.getTextField();
+                field.setEditable(false);
+                field.setBackground(Color.lightGray);
+            }
+            }
         }
         }
@@ -567 +608 @@
             return true;
         case Argument.INTEGER:
-            result = ((JTextField)value).getText();
+            result = ((JSpinner)value).getValue().toString();
             if(result.length() > 0) {
             // Test if the value entered is a valid int.
@@ -789 +830 @@
             target.setBackground(Color.white);
             target.setEnabled(true);
+            if(target instanceof JSpinner) {
+            // Set enabled
+            JComponent c = ((JSpinner)target).getEditor();
+            if ( c instanceof JSpinner.DefaultEditor ) {
+                JSpinner.DefaultEditor editor = (JSpinner.DefaultEditor) c;
+                JFormattedTextField field = editor.getTextField();
+                field.setEditable(true);
+                field.setBackground(Color.white);
+            }
+            }
             if(one != null && two != null && list != null) {
             one.setEnabled(true);
@@ -799 +850 @@
             target.setBackground(Color.lightGray);
             target.setEnabled(false);
+if(target instanceof JSpinner) {
+            // Set enabled
+            JComponent c = ((JSpinner)target).getEditor();
+            if ( c instanceof JSpinner.DefaultEditor ) {
+                JSpinner.DefaultEditor editor = (JSpinner.DefaultEditor) c;
+                JFormattedTextField field = editor.getTextField();
+                field.setEditable(false);
+                field.setBackground(Color.lightGray);
+            }
+            }
             if(one != null && two != null && list != null) {
             one.setEnabled(false);

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

@@ -490 +490 @@
                 }
                 }
+                else if(node_name.equals(StaticStrings.RANGE_ELEMENT)) {
+                String range_raw = MSMUtils.getValue(det);
+                int index = -1;
+                if((index = range_raw.indexOf(StaticStrings.COMMA_CHARACTER)) != -1) {
+                    if(index > 0) {
+                    try {
+                        String first_number = range_raw.substring(0, index);
+                        argument.setMinimum(Integer.parseInt(first_number));
+                        first_number = null;
+                    }
+                    catch(Exception exception) {
+                    }
+                    }
+                    
+                    if(index + 1 < range_raw.length()) {
+                    try {
+                        String second_number = range_raw.substring(index + 1);
+                        argument.setMaximum(Integer.parseInt(second_number));
+                        second_number = null;
+                        
+                    }
+                    catch(Exception exception) {
+                    }
+                    }
+                    
+                }
+                // Else it wasn't a valid range anyway, so ignore it
+                }
             }
             classifier.addArgument(argument);

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

@@ -498 +498 @@
                 }
                 }
+                else if(node_name.equals(StaticStrings.RANGE_ELEMENT)) {
+                String range_raw = MSMUtils.getValue(det);
+                int index = -1;
+                if((index = range_raw.indexOf(StaticStrings.COMMA_CHARACTER)) != -1) {
+if(index > 0) {
+                    try {
+                        String first_number = range_raw.substring(0, index);
+                        argument.setMinimum(Integer.parseInt(first_number));
+                        first_number = null;
+                    }
+                    catch(Exception exception) {
+                    }
+                    }
+                    
+                    if(index + 1 < range_raw.length()) {
+                    try {
+                        String second_number = range_raw.substring(index + 1);
+                        argument.setMaximum(Integer.parseInt(second_number));
+                        second_number = null;    
+                    }
+                    catch(Exception exception) {
+                    }
+                    }
+                }
+                // Else it wasn't a valid range anyway, so ignore it
+                }
             }
             plugin.addArgument(argument);