Changeset 5234

Timestamp:

2003-08-21T11:09:06+12:00 (21 years ago)

Author:

jmt12

Message:

Move buttons now actually do something ;)

File:

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

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

@@ -88 +88 @@
     }
 
+    public void moveSearchType(SearchType search_type, boolean direction) {
+    // Try to move the classifier one step in the desired direction.
+    int index = indexOf(search_type);
+    if(direction) {
+        index--;
+    }
+    else {
+        index++;
+    }
+    // Check we aren't at an edge
+    if((direction && index < 0) || (!direction && index >= getSize())) {
+        String args[] = new String[2];
+        args[0] = Gatherer.dictionary.get("CDM.SearchTypeManager.SearchType");
+        args[1] = search_type.toString();
+        String message = null;
+        if(direction) {
+        message = Gatherer.dictionary.get("CDM.Move.At_Top", args);
+        }
+        else {
+        message = Gatherer.dictionary.get("CDM.Move.At_Bottom", args);
+        }
+        JOptionPane.showMessageDialog(Gatherer.g_man, message, Gatherer.dictionary.get("CDM.Move.Title"), JOptionPane.ERROR_MESSAGE);
+        return;
+    }
+    remove(search_type);
+    add(index, search_type);
+    Gatherer.c_man.configurationChanged(); 
+    }
+
     public void removeSearchType(SearchType searchtype) {
     if(contains(searchtype)) {
@@ -121 +150 @@
         title_label = new JLabel("CDM.SearchTypeManager.Title");
         title_label.setHorizontalAlignment(JLabel.CENTER);
-        instructions_textarea = new JTextArea("CDM.SearchTypeManager.Instructions");
+        instructions_textarea = new JTextArea(Gatherer.dictionary.get("CDM.SearchTypeManager.Instructions"));
+        instructions_textarea.setCaretPosition(0);
         instructions_textarea.setEditable(false);
         instructions_textarea.setLineWrap(true);
@@ -153 +183 @@
 
         JPanel search_type_panel = new JPanel();
-        search_type_label = new JLabel("CDM.SearchTypeManager.SearchType");
+        search_type_label = new JLabel("CDM.SearchTypeManager.SearchType_Selection");
         search_type_combobox = new GComboBox(SEARCH_TYPES);
         search_type_combobox.setBackgroundNonSelectionColor(Gatherer.config.getColor("coloring.editable_background", false));
@@ -175 +205 @@
         current_search_types_list.addListSelectionListener(new CurrentSearchTypesListSelectionListener());
         enable_advanced_searches_checkbox.addActionListener(new EnableAdvancedSearchesActionListener());
+        move_up_button.addActionListener(new MoveListener(true));
+        move_down_button.addActionListener(new MoveListener(false));
         Gatherer.dictionary.register(add_button, null, false);
         Gatherer.dictionary.register(current_search_types_label, null, false);
         Gatherer.dictionary.register(enable_advanced_searches_checkbox, null, false);
-        Gatherer.dictionary.register(instructions_textarea, null, false);
+        //Gatherer.dictionary.register(instructions_textarea, null, false);
         Gatherer.dictionary.register(move_up_button, null, false);
         Gatherer.dictionary.register(move_down_button, null, false);
@@ -234 +266 @@
         Gatherer.dictionary.deregister(current_search_types_label);
         Gatherer.dictionary.deregister(enable_advanced_searches_checkbox);
-        Gatherer.dictionary.deregister(instructions_textarea);
+        //Gatherer.dictionary.deregister(instructions_textarea);
         Gatherer.dictionary.deregister(move_up_button);
         Gatherer.dictionary.deregister(move_down_button);
@@ -291 +323 @@
         public void valueChanged(ListSelectionEvent event) {
         if(!event.getValueIsAdjusting()) {
-            if (current_search_types_list.isSelectionEmpty()) {
+            SearchType search_type = null;
+            if ((search_type = (SearchType) current_search_types_list.getSelectedValue()) != null) {
+            int index = model.indexOf(search_type);
+            // Move up is only enabled if the current selection isn't at index 0
+            move_up_button.setEnabled(index != 0);
+            // Move down is only enabled if the current selection isn't at index getSize() - 1
+            move_down_button.setEnabled(index != model.getSize() - 1);
+            // Remove is only enabled if this isn't the last search type
+            remove_button.setEnabled(current_search_types_list.getModel().getSize() > 1);
+            }
+            else {
             move_up_button.setEnabled(false);
             move_down_button.setEnabled(false);
-            }
-            else {
-            move_up_button.setEnabled(true);
-            move_down_button.setEnabled(true);
-            remove_button.setEnabled(current_search_types_list.getModel().getSize() > 1);
+            remove_button.setEnabled(false);
             }
         }
@@ -344 +382 @@
     }
 
+    private class MoveListener
+        implements ActionListener {
+        private boolean move_up;
+        public MoveListener(boolean move_up) {
+        this.move_up = move_up;
+        }
+        public void actionPerformed(ActionEvent event) {
+        // Retrieve the first selected search type (if any)
+        SearchType search_type = null;
+        if((search_type = (SearchType) current_search_types_list.getSelectedValue()) != null) {
+            // Move search type
+            moveSearchType(search_type, move_up);
+            // Reselect the moved search type
+            current_search_types_list.setSelectedValue(search_type, true);
+        }
+        // No selection - no movement
+        else {
+            move_up_button.setEnabled(false);
+            move_down_button.setEnabled(false);
+        }
+        }
+    }
+
     /** Listens for changes in the search types combobox, and enabled add button appropriately. */
     private class SearchTypesActionDocumentListener