Changeset 20441 for gli

Timestamp:

2009-08-30T18:43:26+12:00 (15 years ago)

Author:

kjdon

Message:

metadata arguments use an editable combobox, which seems to mean that getting the selected value always returns a string, not a metadata element.

File:

• gli/trunk/src/org/greenstone/gatherer/cdm/ArgumentControl.java (modified) (2 diffs)

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

@@ -412 +412 @@
       case Argument.METADATUM:
       case Argument.METADATA:
-    new_value_raw = ((JComboBox) value_control).getSelectedItem();
-    if (new_value_raw instanceof MetadataElement) {
-      argument.setValue(((MetadataElement) new_value_raw).getFullName());
-    }
-    else {
-      // But we have to be careful as an arbitary string object could be zero length
-      String new_value = new_value_raw.toString();
-      ///ystem.err.println("The current value is: " + new_value);
-      if(new_value.length() > 0) {
-        argument.setValue(new_value);
+      String meta_value = (((JComboBox)value_control).getSelectedItem()).toString();
+      if(meta_value.length() > 0) {
+          
+          argument.setValue(meta_value);
       }
       else {
@@ -437 +431 @@
         return false;
       }
-    }
+      
     argument.setAssigned(true);
     return true;