Changeset 8018

Timestamp:

2004-08-20T15:36:06+12:00 (20 years ago)

Author:

mdewsnip

Message:

Fixed the METADATUM argument case so the import.pl "sortmeta" option gets a metadata list correctly (it doesn't have all the metadata elements it should, but that is a bug in the metadata code which will soon be gone).

File:

• trunk/gli/src/org/greenstone/gatherer/gui/OptionsPane.java (modified) (2 diffs)

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

@@ -405 +405 @@
         switch(argument.getType()) {
         case Argument.ENUM:
+        case Argument.METADATUM:
         JComboBox combobox = new JComboBox();
         combobox.setEnabled(enable);
         combobox.setToolTipText(tooltip);
-        // Set enabled
-        if(enable) {
-            combobox.setBackground(Color.white);
-        }
-        else {
-            combobox.setBackground(Color.lightGray);
-        }
-        // Build an option model, wrapping each entry of the list table.
-        HashMap arg_list = argument.getOptions();
-        Iterator it = arg_list.keySet().iterator();
-        while(it.hasNext()) {
-            combobox.addItem((String) it.next());
-        }
-        // Connect this up first, so that if a value is selected the tooltip updates accordingly.
-        combobox.addActionListener(new ToolTipUpdater(arg_list));
-        if(value != null) {
-            // Set the selected string. However since they are all strings we had best iterate ourselves.
-            for(int i = 0; i < combobox.getItemCount(); i++) {
-            if(combobox.getItemAt(i).toString().equals(value)) {
+        combobox.setBackground(enable ? Color.white : Color.lightGray);
+
+        // Build an option model, wrapping each entry of the list table
+        if (argument.getType() == Argument.ENUM) {
+            HashMap arg_list = argument.getOptions();
+            Iterator it = arg_list.keySet().iterator();
+            while (it.hasNext()) {
+            combobox.addItem((String) it.next());
+            }
+
+            // Connect this so if a value is selected the tooltip updates accordingly
+            combobox.addActionListener(new ToolTipUpdater(arg_list));
+        }
+        if (argument.getType() == Argument.METADATUM) {
+            Vector meta_list = Gatherer.c_man.getCollection().msm.getAssignedElements();
+            for (int i = 0; i < meta_list.size(); i++) {
+            combobox.addItem(meta_list.get(i));
+            }
+        }
+
+        if (value != null) {
+            // Set the selected string
+            for (int i = 0; i < combobox.getItemCount(); i++) {
+            if (combobox.getItemAt(i).toString().equals(value)) {
                 combobox.setSelectedIndex(i);
             }
@@ -497 +503 @@
         // And remember it
         value_control = textfield;
-        break;
-        case Argument.METADATUM:
-        GComboBox gcombobox = new GComboBox(Gatherer.c_man.getCollection().msm.getAssignedElements(), false);
-        gcombobox.setEnabled(enable);
-        // Now ensure we have the existing value or default value selected if either exist.
-        if(value != null) {
-            boolean found = selectValue(gcombobox, value);
-            // Its possible that this is a custom value and so doesn't exist in the combobox. If so add it and then select it
-            if(!found) {
-            gcombobox.addItem(value);
-            gcombobox.setSelectedItem(value);
-            }
-        }
-        add(gcombobox, BorderLayout.CENTER);
-        value_control = gcombobox;
         break;
         }