Changeset 7059

Timestamp:

2004-03-16T15:48:37+13:00 (20 years ago)

Author:

kjdon

Message:

made the range bit work for integer args

File:

• trunk/gli/src/org/greenstone/gatherer/gui/OptionsPane.java (modified) (2 diffs)

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

@@ -444 +444 @@
         case Argument.INTEGER:
         // Build a spinner
-        JSpinner spinner = new JSpinner(new SpinnerNumberModel(0, argument.getMinimum(), argument.getMaximum(), 1));
-        try {
-            int default_value = Integer.parseInt(argument.getDefaultValue());
-            spinner.setValue(new Integer(default_value));
-        }
-        catch (Exception exception) {
-        }
+        int initial_value=0;
+        if (value != null) {
+            try {
+            initial_value = Integer.parseInt(value);
+            } catch (Exception exception) {
+            }
+        }
+        if (initial_value < argument.getMinimum()) {
+            initial_value = argument.getMinimum();
+        } else if (initial_value > argument.getMaximum()) {
+            initial_value = argument.getMaximum();
+        }
+        JSpinner spinner = new JSpinner(new SpinnerNumberModel(initial_value, argument.getMinimum(), argument.getMaximum(), 1));        
         spinner.setEnabled(enable);
         spinner.setPreferredSize(SPINNER_SIZE);
@@ -465 +471 @@
             else {
             field.setBackground(Color.lightGray);
-            }
-        }
-        // If there was an original value, set it.
-        if(value != null) {
-            try {
-            spinner.setValue(new Integer(value));
-            }
-            catch (Exception error) {
             }
         }