Changeset 6324

Timestamp:

2003-12-19T14:53:47+13:00 (20 years ago)

Author:

jmt12

Message:

Now whenever a JSpinner loses focus prematurely, a mouse listener ensures that changes are commited before the focus lose is processed

File:

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

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

@@ -38 +38 @@
 import org.greenstone.gatherer.cdm.CollectionDesignManager;
 import org.greenstone.gatherer.cdm.PlugIn;
+import org.greenstone.gatherer.gui.GComboBox;
+import org.greenstone.gatherer.gui.GLIButton;
 import org.greenstone.gatherer.gui.ModalDialog;
 import org.greenstone.gatherer.gui.SimpleMenuBar;
@@ -118 +120 @@
 
     JPanel button_pane = new JPanel();
-    cancel = new JButton();
+    cancel = new GLIButton();
     cancel.setMnemonic(KeyEvent.VK_C);
     Dictionary.setBoth(cancel, "General.Cancel", "General.Pure_Cancel_Tooltip");
-    ok = new JButton();
+    ok = new GLIButton();
     ok.setMnemonic(KeyEvent.VK_O);
     Dictionary.setBoth(ok, "General.OK", "General.OK_Tooltip");
@@ -324 +326 @@
         }
         Collections.sort(options_model);
-        value = new JComboBox(options_model.toArray());
-        ((JComboBox)value).setEditable(true);
+        value = new GComboBox(options_model.toArray(), false);
+        //((JComboBox)value).setEditable(false);
         ((JComboBox)value).addActionListener(new ToolTipUpdater());
-        if(existing_value != null) {
+        if(existing_value != null && existing_value.length() > 0) {
             // Select the correct value. Since they're all text strings we better iterate to be safe.
             selectValue((JComboBox)value, existing_value);
         }
         else if(default_value != null) {
+            ///ystem.err.println("Default for argument: " + argument.getName());
             // Same as above except for default value.
             selectValue((JComboBox)value, default_value);
@@ -340 +343 @@
         break;
         case Argument.HIERARCHY:
-        value = new JComboBox(Gatherer.c_man.getCollection().msm.getAssignedElements(true));
+        value = new GComboBox(Gatherer.c_man.getCollection().msm.getAssignedElements(true), false);
         /** @TODO - figure out a smarter way of allowing Greenstone extracted metadata to be selected. */
-        ((JComboBox)value).setEditable(true);
+        //((JComboBox)value).setEditable(false);
         ((JComboBox)value).addItemListener(new HierarchyListener());
         // Now ensure we have the existing value or default value selected if either exist.
-        if(existing_value != null) {
+        if(existing_value != null && existing_value.length() > 0) {
             selectValue((JComboBox)value, existing_value);
         }
@@ -375 +378 @@
         case Argument.STRING:
         // Use a standard text field
-        if(existing_value != null) {
+        if(existing_value != null && existing_value.length() > 0) {
             value = new JTextField(existing_value);
         }
@@ -405 +408 @@
         break;
         case Argument.LANGUAGE:
-        value = new JComboBox(CollectionDesignManager.language_manager.getLanguageCodes().toArray());
+        value = new GComboBox(CollectionDesignManager.language_manager.getLanguageCodes().toArray(), false);
+        //((JComboBox)value).setEditable(false);
         // Now ensure we have the existing value or default value selected if either exist.
         Language selected = null;
-        if(existing_value != null) {
+        if(existing_value != null && existing_value.length() > 0) {
             selected = CollectionDesignManager.language_manager.getLanguage(existing_value);
         }
@@ -419 +423 @@
         break;
         case Argument.METADATUM:
-        value = new JComboBox(Gatherer.c_man.getCollection().msm.getAssignedElements());
+        value = new GComboBox(Gatherer.c_man.getCollection().msm.getAssignedElements(), false);
+        //((JComboBox)value).setEditable(false);
         //((JComboBox)value).setEditable(true);
         // Now ensure we have the existing value or default value selected if either exist.
-        if(existing_value != null) {
+        if(existing_value != null && existing_value.length() > 0) {
             boolean found = selectValue((JComboBox)value, existing_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
@@ -437 +442 @@
         // Comma separated metadata values.
         ArrayList values = argument.getValues();
-        value = new JComboBox(Gatherer.c_man.getCollection().msm.getAssignedElements());
+        value = new GComboBox(Gatherer.c_man.getCollection().msm.getAssignedElements(), false);
+        //((JComboBox)value).setEditable(false);
         DefaultListModel model = new DefaultListModel();
         list = new JList(model);
@@ -445 +451 @@
         }
 
-        one = new JButton();
+        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 JButton();
+        two = new GLIButton();
         two.addActionListener(new RemoveListener(list));
+        two.setMnemonic(KeyEvent.VK_R);
         Dictionary.setBoth(two, "CDM.ArgumentConfiguration.Remove", "CDM.ArgumentConfiguration.Remove_Tooltip");
 
@@ -655 +663 @@
             // But we have to be careful as an arbitary string object could be zero length
             String new_value = new_value_raw.toString();
-            System.err.println("The current value is: " + new_value);
+            ///ystem.err.println("The current value is: " + new_value);
             if(new_value.length() > 0) {
                 argument.setValue(new_value);
@@ -727 +735 @@
      */
     public boolean selectValue(JComboBox combobox, String target) {
+        ///ystem.err.println("Searching for the target string: " + target);
         for(int i = 0; i < combobox.getItemCount(); i++) {
         Object object = combobox.getItemAt(i);
         if(object instanceof ListOption) {
             ListOption lo = (ListOption) object;
-            if(lo.getValue().equals(target)) {
+            ///ystem.err.print("/tChecking: " + lo.getValue() + "... ");
+            if(lo.getValue().startsWith(target)) {
+            ///ystem.err.println("Match!");
             combobox.setSelectedIndex(i);
             return true;
             }
+            /*
+            else {
+            System.err.println("No Match.");
+            }
+            */
         }
         else if(object instanceof ElementWrapper) {
@@ -987 +1003 @@
         public void actionPerformed(ActionEvent event) {
         JComboBox source = (JComboBox)event.getSource();
-        ListOption lo = (ListOption)source.getSelectedItem();
-        if(lo != null) {
-           String description = Utility.formatHTMLWidth(lo.getDesc(), 60);
-           source.setToolTipText(description);
-        }
-        else {
-           source.setToolTipText(StaticStrings.EMPTY_STR);
+        Object object = source.getSelectedItem();
+        if(object instanceof ListOption) {
+            ListOption lo = (ListOption)object;
+            if(lo != null) {
+            String description = Utility.formatHTMLWidth(lo.getDesc(), 60);
+            source.setToolTipText(description);
+            }
+            else {
+            source.setToolTipText(StaticStrings.EMPTY_STR);
+            }
         }
         }