Changeset 13158

Timestamp:

2006-10-20T16:25:44+13:00 (18 years ago)

Author:

mdewsnip

Message:

Made the explode metadata prompt have the exploded metadata set selected by default.

Location:

trunk/gli/src/org/greenstone/gatherer

Files:

• cdm/ArgumentControl.java (modified) (3 diffs)
• gui/ExplodeMetadataPrompt.java (modified) (1 diff)

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

@@ -178 +178 @@
         }
         }
+
+        selectValue((JComboBox) value_control, initial_value);
+
     } // end of switch
 
@@ -458 +461 @@
      * @see org.greenstone.gatherer.cdm.ArgumentConfiguration.Argument.ArgumentOption
      */
-    public static boolean selectValue(JComboBox combobox, String target) {
-    ///ystem.err.println("Searching for the target string: " + target);
-    for(int i = 0; i < combobox.getItemCount(); i++) {
+    public static boolean selectValue(JComboBox combobox, String target)
+    {
+    for (int i = 0; i < combobox.getItemCount(); i++) {
         Object object = combobox.getItemAt(i);
-        if(object instanceof Argument.ArgumentOption) {
+
+        if (object instanceof Argument.ArgumentOption) {
         Argument.ArgumentOption opt = (Argument.ArgumentOption) object;
-        ///ystem.err.print("/tChecking: " + lo.getValue() + "... ");
-        if(opt.name.startsWith(target)) {
-            ///ystem.err.println("Match!");
+        if (opt.name.startsWith(target)) {
             combobox.setSelectedIndex(i);
             combobox.setToolTipText(opt.getToolTip());
             return true;
         }
-        /*
-          else {
-          System.err.println("No Match.");
-          }
-        */
         }
         else if (object instanceof MetadataElement) {
@@ -483 +480 @@
         }
         }
-    }
+        else if (object.toString().equals(target)) {
+        combobox.setSelectedIndex(i);
+        return true;
+        }
+    }
+
     return false;
     }
+
+
     /** Forces the control into an 'enabled' mode. */
     public void setEnabled() {

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

@@ -208 +208 @@
         if (argument.getName().equals("metadata_set")) {
             argument.setType(Argument.METADATA_SET_NAMESPACE);
+            argument_control = new ArgumentControl(argument, true, "Exploded Metadata Set (exp)");
         }
-        // by default, all args are disabled, and no value
-        argument_control = new ArgumentControl(argument, false, null);
+        else {
+            // by default, all args are disabled, and no value
+            argument_control = new ArgumentControl(argument, false, null);
+        }
         // make sure they are coloured the way we want - this is not the standard arg control coloring
         argument_control.setBackground(Configuration.getColor("coloring.collection_heading_background", false));