Changeset 5864

Timestamp:

2003-11-18T08:37:33+13:00 (20 years ago)

Author:

jmt12

Message:

I believe I have now finished adding tests for missing arguments when configuring a plugin or classifier. I cleared up that weird issue where it would complain about missing an argument, but if you then hit cancel you'd end up with an empty argument anyway.

File:

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

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

@@ -91 +91 @@
     setModal(true);
     setSize(SIZE);
-    setJMenuBar(new SimpleMenuBar("designingacollection")); // can we tell whether we are doing a classifier or plugin, to make the help more specific??    
+    setJMenuBar(new SimpleMenuBar("designingacollection")); // can we tell whether we are doing a classifier or plugin, to make the help more specific??
     Dictionary.setText(this, "CDM.ArgumentConfiguration.Title");
 
@@ -323 +323 @@
         Collections.sort(options_model);
         value = new JComboBox(options_model.toArray());
+        ((JComboBox)value).setEditable(true);
         ((JComboBox)value).addActionListener(new ToolTipUpdater());
         if(existing_value != null) {
@@ -506 +507 @@
       return argument;
        }
-       
+
     public Object getValue() {
         if(value instanceof JComboBox) {
@@ -536 +537 @@
          case Argument.ENUM:
             ListOption option = (ListOption)((JComboBox)value).getSelectedItem();
-            if(option == null || option.getValue().length() == 0) {
-               String args[] = new String[1];
-               args[0] = argument.getName();
-               JOptionPane.showMessageDialog(self, Dictionary.get("CDM.ArgumentConfiguration.No_Value", args), Dictionary.get("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE);
-               return false;
-            }
-            result = option.getValue();
-            if(result.length() > 0) {
-               argument.setValue(result);
+            if(option != null && option.getValue().length() > 0) {
+               argument.setValue(option.getValue());
             }
             else {
-               if(argument.isRequired()) {
-              String args[] = new String[1];
-              args[0] = argument.getName();
-              JOptionPane.showMessageDialog(self, Dictionary.get("CDM.ArgumentConfiguration.Required_Argument", args), Dictionary.get("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE);
-              args = null;
-              return false;
-               }
-               else {
-              argument.setValue(null);
-               }
+            String args[] = new String[1];
+            args[0] = argument.getName();
+            if(argument.isRequired()) {
+                JOptionPane.showMessageDialog(self, Dictionary.get("CDM.ArgumentConfiguration.Required_Argument", args), Dictionary.get("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE);
+            }
+            // They've left the field blank
+            else {
+                JOptionPane.showMessageDialog(self, Dictionary.get("CDM.ArgumentConfiguration.No_Value", args), Dictionary.get("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE);
+                argument.setValue(null);
+            }
+            args = null;
+            return false;
             }
             argument.setAssigned(true);
@@ -582 +578 @@
             }
             else {
+            String args[] = new String[1];
+            args[0] = argument.getName();
             if(argument.isRequired()) {
-                String args[] = new String[1];
-                args[0] = argument.getName();
                 JOptionPane.showMessageDialog(self, Dictionary.get("CDM.ArgumentConfiguration.Required_Argument", args), Dictionary.get("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE);
-                args = null;
-                return false;
             }
+            // They've left the field blank
             else {
-                argument.setValue(null);
-            }
+                JOptionPane.showMessageDialog(self, Dictionary.get("CDM.ArgumentConfiguration.No_Value", args), Dictionary.get("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE);
+                argument.setValue(null);
+            }
+            args = null;
+            return false;
             }
             argument.setAssigned(true);
@@ -626 +624 @@
             }
             else {
-            if(argument.isRequired()) {
-                String args[] = new String[1];
-                args[0] = argument.getName();
-                JOptionPane.showMessageDialog(self, Dictionary.get("CDM.ArgumentConfiguration.Required_Argument", args), Dictionary.get("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE);
-                return false;
-            }
-            else {
-                argument.setValue(null);
-            }
-            }
-            argument.setAssigned(true);
+            String args[] = new String[1];
+            args[0] = argument.getName();
+            if(argument.isRequired()) {
+                JOptionPane.showMessageDialog(self, Dictionary.get("CDM.ArgumentConfiguration.Required_Argument", args), Dictionary.get("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE);
+            }
+            // They've left the field blank
+            else {
+                JOptionPane.showMessageDialog(self, Dictionary.get("CDM.ArgumentConfiguration.No_Value", args), Dictionary.get("CDM.ArgumentConfiguration.Error_Title"), JOptionPane.ERROR_MESSAGE);
+                argument.setValue(null);
+            }
+            args = null;
+            return false;
+            }
+            argument.setAssigned(true);
             return true;
         }