Changeset 5758

Timestamp:

2003-10-29T12:22:18+13:00 (21 years ago)

Author:

jmt12

Message:

Started to fix the various ways to enter a null value for a plugin argument, including if you choose a language whereapon you'd throw an NPE an chaos would ensue. I'm sure there are still several ways to break it left

File:

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

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

@@ -38 +38 @@
 import org.greenstone.gatherer.cdm.CollectionDesignManager;
 import org.greenstone.gatherer.cdm.PlugIn;
+import org.greenstone.gatherer.gui.ModalDialog;
+import org.greenstone.gatherer.gui.SimpleMenuBar;
 import org.greenstone.gatherer.msm.ElementWrapper;
+import org.greenstone.gatherer.util.StaticStrings;
 import org.greenstone.gatherer.util.Utility;
 import org.greenstone.gatherer.valuetree.GValueModel;
-import org.greenstone.gatherer.gui.SimpleMenuBar;
-import org.greenstone.gatherer.gui.ModalDialog;
 
 /** This class provides us with a dialog box which allows us to edit the arguments of either a PlugIn or a Classifier.
@@ -175 +176 @@
         Component component = central_pane.getComponent(i);
         if(component instanceof ArgumentControl) {
-            // Once cont goes false it stays false
-            cont = cont && ((ArgumentControl)component).updateArgument();
+           cont = cont && ((ArgumentControl)component).updateArgument();
         }
         }
@@ -503 +503 @@
     }
 
+       public Argument getArgument() {
+      return argument;
+       }
+       
     public Object getValue() {
         if(value instanceof JComboBox) {
@@ -526 +530 @@
      */
     public boolean updateArgument() {
-        if(enabled.isSelected() || argument.isRequired()) {
-        argument.setAssigned(true);
-        String result = null;
-        switch(argument.getType()) {
-        case Argument.ENUM:
+       if(enabled.isSelected() || argument.isRequired()) {
+          argument.setAssigned(false);
+          String result = null;
+          switch(argument.getType()) {
+         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);
+               argument.setValue(result);
             }
             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);
-            }
-            }
+               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);
+               }
+            }
+            argument.setAssigned(true);
             return true;
         case Argument.FLAG:
-            // Should have already been handled above.
+           // Should have already been handled above.
+           argument.setAssigned(true);
             return true;
         case Argument.INTEGER:
@@ -581 +593 @@
             }
             }
+            argument.setAssigned(true);
             return true;
-        case Argument.LANGUAGE:
-            Language language = (Language) ((JComboBox)value).getSelectedItem();
-            argument.setValue(language.getCode());
-            // Kinda lucked out here. Its impossible not to choose an entry from these comboboxes as they are restricted.
-            return true;
+           case Argument.LANGUAGE:
+              String language = (((JComboBox)value).getSelectedItem()).toString();
+              argument.setValue(language);
+              // Kinda lucked out here. Its impossible not to choose an entry from these comboboxes as they are restricted.
+              argument.setAssigned(true);
+              return true;
         case Argument.METADATUM:
             argument.setValue(((ElementWrapper)((JComboBox)value).getSelectedItem()).getName());
             // Kinda lucked out here. Its impossible not to choose an entry from these comboboxes as they are restricted.
+            argument.setAssigned(true);
             return true;
         case Argument.HIERARCHY:
             argument.setValue(((JComboBox)value).getSelectedItem().toString());
             // Kinda lucked out here. Its impossible not to choose an entry from these comboboxes as they are restricted.
+            argument.setAssigned(true);
             return true;
         case Argument.METADATA:
@@ -602 +618 @@
             }
             argument.setValues(values);
+            argument.setAssigned(true);
             return true;
         case Argument.STRING:
@@ -619 +636 @@
             }
             }
+            argument.setAssigned(true);
             return true;
         }
@@ -785 +803 @@
         implements Comparable {
         /** The maximum length of this String version of this item. */
-        //private int MAX_DESC = 35;
+        private int MAX_DESC = 65;
         /** The description of the value for this item. */
         private String description = null;
@@ -832 +850 @@
         public String toString() {
         if(text == null) {
-            //if(description.length() >= MAX_DESC) {
-            //  text = value + " - " + description.substring(0, MAX_DESC);
-            //}
-            //else {
-            text = value + " - " + description;
-            //}
+            if(description.length() >= MAX_DESC) {
+                text = value + StaticStrings.MINUS_CHARACTER + description.substring(0, MAX_DESC) + StaticStrings.TRUNCATED_STRING;
+            }
+            else {
+               text = value + StaticStrings.MINUS_CHARACTER + description;
+            }
         }
         return text;
@@ -875 +893 @@
         JComboBox source = (JComboBox)event.getSource();
         ListOption lo = (ListOption)source.getSelectedItem();
-        String description = Utility.formatHTMLWidth(lo.getDesc(), 60);
-        source.setToolTipText(description);
+        if(lo != null) {
+           String description = Utility.formatHTMLWidth(lo.getDesc(), 60);
+           source.setToolTipText(description);
+        }
+        else {
+           source.setToolTipText(StaticStrings.EMPTY_STR);
+        }
         }
     }