Changeset 7550

Timestamp:

2004-06-03T14:11:01+12:00 (20 years ago)

Author:

mdewsnip

Message:

Tidied up the little interface for specifying multiple metadata elements, then turned it off at Ian's request.

File:

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

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

@@ -446 +446 @@
         break;
         case Argument.METADATUM:
+        case Argument.METADATA:
         value = new GComboBox(Gatherer.c_man.getCollection().msm.getAssignedElements(), false);
 
@@ -466 +467 @@
         }
         break;
-        case Argument.METADATA:
-        // Comma separated metadata values.
-        ArrayList values = argument.getValues();
-        value = new GComboBox(Gatherer.c_man.getCollection().msm.getAssignedElements(), false);
-        //((JComboBox)value).setEditable(false);
-        DefaultListModel model = new DefaultListModel();
-        list = new JList(model);
-        list.setVisibleRowCount(3);
-        for(int i = 0; i < values.size(); i++) {
-            model.addElement(values.get(i));
-        }
-
-        one = new GLIButton();
-        one.addActionListener(new AddListener((JComboBox)value, list));
-        one.setMnemonic(KeyEvent.VK_A);
-        Dictionary.setBoth(one, "CDM.ArgumentConfiguration.Add", "CDM.ArgumentConfiguration.Add_Tooltip");
-        two = new GLIButton();
-        two.addActionListener(new RemoveListener(list));
-        two.setMnemonic(KeyEvent.VK_R);
-        Dictionary.setBoth(two, "CDM.ArgumentConfiguration.Remove", "CDM.ArgumentConfiguration.Remove_Tooltip");
-
-        if(argument.getValues().size() > 0 || argument.isRequired()) {
-            enabled.setSelected(true);
-            list.setBackground(Color.white);
-            list.setEnabled(true);
-            one.setEnabled(true);
-            two.setEnabled(true);
-            value.setEnabled(true);
-        }
-        else {
-            enabled.setSelected(false);
-            list.setBackground(Color.lightGray);
-            list.setEnabled(false);
-            one.setEnabled(false);
-            two.setEnabled(false);
-            value.setEnabled(false);
-        }
-        break;
+// ---- Special interface for adding and ordering multiple metadata items ----
+// Turned off at Ian's request!
+//          case Argument.METADATA:
+//          // Comma separated metadata values.
+//          ArrayList values = argument.getValues();
+//          value = new GComboBox(Gatherer.c_man.getCollection().msm.getAssignedElements(), false);
+//          //((JComboBox)value).setEditable(false);
+//          DefaultListModel model = new DefaultListModel();
+//          list = new JList(model);
+//          list.setVisibleRowCount(3);
+//          for(int i = 0; i < values.size(); i++) {
+//              model.addElement(values.get(i));
+//          }
+
+//          one = new GLIButton();
+//          one.addActionListener(new AddListener((JComboBox)value, list));
+//          one.setMnemonic(KeyEvent.VK_A);
+//          Dictionary.setBoth(one, "CDM.ArgumentConfiguration.Add", "CDM.ArgumentConfiguration.Add_Tooltip");
+//          two = new GLIButton();
+//          two.addActionListener(new RemoveListener(list));
+//          two.setMnemonic(KeyEvent.VK_R);
+//          Dictionary.setBoth(two, "CDM.ArgumentConfiguration.Remove", "CDM.ArgumentConfiguration.Remove_Tooltip");
+
+//          if(argument.getValues().size() > 0 || argument.isRequired()) {
+//              enabled.setSelected(true);
+//              list.setBackground(Color.white);
+//              list.setEnabled(true);
+//              one.setEnabled(true);
+//              two.setEnabled(true);
+//              value.setEnabled(true);
+//          }
+//          else {
+//              enabled.setSelected(false);
+//              list.setBackground(Color.lightGray);
+//              list.setEnabled(false);
+//              one.setEnabled(false);
+//              two.setEnabled(false);
+//              value.setEnabled(false);
+//          }
+//          break;
         } // end of switch
 
@@ -547 +550 @@
         enabled.addActionListener(new EnabledListener(one, two, list, value));
         }
+
         // Layout
-        if(list == null) {
+        inner_pane.setLayout(new BorderLayout());
+        if (argument.isRequired()) {
+        inner_pane.add(label, BorderLayout.WEST);
+        }
+        else {
+        inner_pane.add(enabled, BorderLayout.WEST);
+        }
+
+        if (list == null) {
         enabled.setBorder(BorderFactory.createEmptyBorder(0,0,5,0));
-        inner_pane.setLayout(new BorderLayout());
-        if(argument.isRequired()) {
-            inner_pane.add(label, BorderLayout.WEST);
-        }
-        else {
-            inner_pane.add(enabled, BorderLayout.WEST);
-        }
-        if(value != null) {
+        if (value != null) {
             inner_pane.add(value, BorderLayout.CENTER);
         }
         }
         else {
-        JPanel control_pane = new JPanel(new GridLayout(2,1));
-        control_pane.add(enabled);
-        control_pane.add(value);
-        control_pane.setOpaque(false);
-
         JPanel left_pane = new JPanel(new BorderLayout());
-        left_pane.add(control_pane, BorderLayout.CENTER);
+        left_pane.add(new JLabel(""), BorderLayout.NORTH);
+        left_pane.add(value, BorderLayout.CENTER);
         left_pane.add(one, BorderLayout.SOUTH);
         left_pane.setOpaque(false);
@@ -577 +578 @@
         right_pane.setOpaque(false);
 
-        inner_pane.setLayout(new GridLayout(1,2));
-        inner_pane.add(left_pane);
-        inner_pane.add(right_pane);
-        }
+        JPanel control_pane = new JPanel(new GridLayout(1, 2));
+        control_pane.add(left_pane);
+        control_pane.add(right_pane);
+
+        inner_pane.add(control_pane, BorderLayout.CENTER);
+        }
+
         setLayout(new BorderLayout());
-        //add(owner_label, BorderLayout.NORTH);
         add(inner_pane, BorderLayout.CENTER);
     }
@@ -682 +685 @@
             return true;
         case Argument.METADATUM:
+        case Argument.METADATA:
             Object new_value_raw = ((JComboBox)value).getSelectedItem();
             if(new_value_raw instanceof ElementWrapper) {
@@ -711 +715 @@
             argument.setAssigned(true);
             return true;
+//          case Argument.METADATA:
+//              DefaultListModel model = (DefaultListModel)list.getModel();
+//              ArrayList values = new ArrayList();
+//              for(int i = 0; i < model.size(); i++) {
+//              values.add(model.get(i));
+//              }
+//              argument.setValues(values);
+//              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:
-            DefaultListModel model = (DefaultListModel)list.getModel();
-            ArrayList values = new ArrayList();
-            for(int i = 0; i < model.size(); i++) {
-            values.add(model.get(i));
-            }
-            argument.setValues(values);
             argument.setAssigned(true);
             return true;
@@ -824 +828 @@
         ElementWrapper element = (ElementWrapper) source.getSelectedItem();
         String name = element.toString();
-        if(!model.contains(name)) {
-            boolean found = false;
-            int index = 0;
-            while(!found && index < model.size()) {
-            String sibling = (String) model.get(index);
-            if(name.compareTo(sibling) < 0) {
-                model.add(index, name);
-                found = true;
-            }
-            else {
-                index++;
-            }
-            }
-            if(!found) {
-            model.addElement(name);
-            }
+        if (!model.contains(name)) {
+            model.addElement(name);
         }
         }