Changeset 5088

Timestamp:

2003-08-04T11:45:43+12:00 (21 years ago)

Author:

jmt12

Message:

Ensures that a default search type is provided, and that at least type is selected at all times. Also fixed bug where buttons never became active - ever

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/SearchTypeManager.java (modified) (8 diffs)

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

@@ -52 +52 @@
     extends DOMProxyListModel {
 
+    static final public String[] SEARCH_TYPES = {"form", "plain"};
+
     /** The default size of a label, in an attempt to make labels/fields line up. */
     static final private Dimension LABEL_SIZE = new Dimension(150,25);
 
-    static final private String[] SEARCH_TYPES = {"form", "plain"};
 
     /** The controls used to edit the search types. */
@@ -125 +126 @@
         title_label.setHorizontalAlignment(JLabel.CENTER);
         instructions_textarea = new JTextArea("CDM.SearchTypeManager.Instructions");
-        instructions_textarea.setCaretPosition(0);
         instructions_textarea.setEditable(false);
         instructions_textarea.setLineWrap(true);
-        instructions_textarea.setRows(4);
+        instructions_textarea.setRows(6);
         instructions_textarea.setWrapStyleWord(true);
 
@@ -257 +257 @@
     
     public void gainFocus() {
+        instructions_textarea.setCaretPosition(0);
         validateControls(isMGPPEnabled());
     }
@@ -266 +267 @@
     private void validateControls(boolean advanced_search_enabled) {
         // Enable or disable controls based on whether MGPP is enabled
-        add_button.setEnabled(add_button.isEnabled() && advanced_search_enabled);
+        // validate add button, which depends on the current combobox selection and the contents of the assigned search types list
+        Object selected_item = search_type_combobox.getSelectedItem();
+        add_button.setEnabled(advanced_search_enabled && selected_item != null && !model.contains(selected_item));
+        // validate other controls.
         current_search_types_list.setEnabled(advanced_search_enabled);
         enable_advanced_searches_checkbox.setSelected(advanced_search_enabled);
         search_type_combobox.setEnabled(advanced_search_enabled);
-        remove_button.setEnabled(remove_button.isEnabled() && advanced_search_enabled);
+        remove_button.setEnabled(current_search_types_list.getModel().getSize() > 1 && !current_search_types_list.isSelectionEmpty() && advanced_search_enabled);
     }
 
@@ -301 +305 @@
         public void valueChanged(ListSelectionEvent event) {
         if(!event.getValueIsAdjusting()) {
-            remove_button.setEnabled(!current_search_types_list.isSelectionEmpty());
+            remove_button.setEnabled(current_search_types_list.getModel().getSize() > 1 && !current_search_types_list.isSelectionEmpty());
         }
         }
@@ -316 +320 @@
         boolean advanced_search_enabled = enable_advanced_searches_checkbox.isSelected();
         model.root.setAttribute(CollectionConfiguration.ASSIGNED_ATTRIBUTE, (advanced_search_enabled ? CollectionConfiguration.TRUE_STR : CollectionConfiguration.FALSE_STR));
+        CollectionDesignManager.index_manager.setMGPPEnabled(advanced_search_enabled);
         validateControls(advanced_search_enabled);
-        CollectionDesignManager.index_manager.setMGPPEnabled(advanced_search_enabled);
         Gatherer.g_man.wait(false);
         }
@@ -335 +339 @@
             }
         }
+        Object selected_object = search_type_combobox.getSelectedItem();
+        if(selected_object != null) {
+            add_button.setEnabled(!model.contains(selected_object));
+        }
+        else {
+            add_button.setEnabled(false);
+        }
         remove_button.setEnabled(false);
         }
@@ -373 +384 @@
         Object selected_object = search_type_combobox.getSelectedItem();
         if(selected_object != null) {
-            add_button.setEnabled(model.contains(selected_object));
+            add_button.setEnabled(!model.contains(selected_object));
         }
         else {