Changeset 8360

Timestamp:

2004-10-18T13:43:20+13:00 (20 years ago)

Author:

kjdon

Message:

changed the removelistener for classifier list - if remove a classifier it now selects the next one in the list (or previous one if the list one was deleted)

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/ClassifierManager.java (modified) (1 diff)

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

@@ -957 +957 @@
     }
 
-    /** This class listens for actions upon the remove button in the controls, and if detected calls the removeClassifier() method.
+    /** This class listens for actions upon the remove button in the controls, and if detected calls the <i>removeClassifier()</i> method.
      */
     private class RemoveListener
         implements ActionListener {
-        /** Any implementation of <i>ActionListener</i> must include this method so that we can be informed when an action has occured on one of our target controls, so we can remove the selected Classifier.
+        /** Any implementation of <i>ActionListener</i> must include this method so that we can be informed when an action has occured on one of our target controls.
          * @param event An <strong>ActionEvent</strong> containing information garnered from the control action.
-         * @see org.greenstone.gatherer.cdm.Classifier
          */
         public void actionPerformed(ActionEvent event) {
-        if(!classifier_list.isSelectionEmpty()) {
-            Object [] objects = classifier_list.getSelectedValues();
-            for(int i = 0; i < objects.length; i++) {
-            if(objects[i] instanceof Classifier) {
-                removeClassifier((Classifier)objects[i]);
-            }
-            }
-        }
-        }
-    }
-    }
+        if(classifier_list.isSelectionEmpty()) {
+            remove.setEnabled(false);
+            return;
+        }
+        int selected_index = classifier_list.getSelectedIndex();
+        Object selected_classifier = classifier_list.getSelectedValue();
+        if (!(selected_classifier instanceof Classifier)) {
+            return; // what else could we have here???
+        }
+        removeClassifier((Classifier)selected_classifier);
+
+        if (selected_index >= classifier_list.getModel().getSize()) {
+            selected_index--;
+        }
+        if (selected_index >=0) {
+            classifier_list.setSelectedIndex(selected_index);
+        } else {
+            // no more classifiers in the list
+            remove.setEnabled(false);
+        }
+        
+        }
+    }
+    }
+    
+
+    
 }