Changeset 20608

Timestamp:

2009-09-16T13:30:51+12:00 (15 years ago)

Author:

kjdon

Message:

modified setting intial value for metadata type arg. If using the default value, need to check if its in the list already, and if not, add it. the default may be somehting not in hte list of metadata elements, eg gi.Sourcedoc for oaiPlugin document_field

File:

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

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

@@ -164 +164 @@
       // Now ensure we have the existing value or default value selected if either exist.
       String existing_value = preset_value;
-      if (existing_value == null || existing_value.length() == 0) {
+      if (existing_value == null || existing_value.equals("")) {
     existing_value = argument.getValue();
       }
-      if (existing_value != null && existing_value.length() > 0) {
+      if (existing_value == null || existing_value.equals("")) {
+    // try default value
+    String default_value = argument.getDefaultValue();
+    if (default_value != null) {
+      // if no namespace for default value, add ex.
+      // won't work if we want to set a non-metadata value
+      if (MetadataTools.getMetadataSetNamespace(default_value).equals("")) {
+        default_value = StaticStrings.EXTRACTED_NAMESPACE+default_value;
+      }
+      existing_value = default_value;
+    }
+      }
+    
+      if (existing_value != null && !existing_value.equals("")) {
+    
     found = selectValue((JComboBox) value_control, existing_value);
     // It's possible that this is a custom value and so doesn't exist in the combobox
@@ -174 +188 @@
       ((JComboBox) value_control).addItem(existing_value);
       ((JComboBox) value_control).setSelectedItem(existing_value);
-    }
-      }
-      else {
-    String default_value = argument.getDefaultValue();
-    if (default_value != null) {
-      // if no namespace for default value, add ex.
-      // won't work if we want to set a non-metadata value
-      if (MetadataTools.getMetadataSetNamespace(default_value).equals("")) {
-        default_value = StaticStrings.EXTRACTED_NAMESPACE+default_value;
-      }
-      selectValue((JComboBox) value_control, default_value);
     }
       }