Changeset 4626 for trunk

Timestamp:

2003-06-12T18:08:42+12:00 (21 years ago)

Author:

kjdon

Message:

indented some comments, changed it so that custom classifiers are hidden rather than destroyed after they are used, fixed a couple of other bugs

File:

• trunk/gli/src/org/greenstone/gatherer/cdm/ClassifierManager.java (modified) (10 diffs)

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

@@ -228 +228 @@
     public int indexOf(Classifier classifier) {
     for(int i = 0; i < assigned.size(); i++) {
-        Classifier sibling = (Classifier) assigned.get(i);
-        if(sibling.equals(classifier)) {
-        return i;
+        Object elem = assigned.get(i);
+        if (elem instanceof Classifier) {
+        Classifier sibling = (Classifier)elem;
+        if(sibling.equals(classifier)) {
+            return i;
+        }
+        }
+    }
+    return -1;
+    }
+    // these two methods assume that a custome classifier can never be the same as a classifier
+    public int indexOf(CustomClassifier classifier) {
+    for(int i = 0; i < assigned.size(); i++) {
+        Object elem = assigned.get(i);
+        if (elem instanceof CustomClassifier) {
+        CustomClassifier sibling = (CustomClassifier) assigned.get(i);
+        if(sibling.equals(classifier)) {
+            return i;
+        }
         }
     }
@@ -327 +343 @@
         if(object instanceof CustomClassifier) {
             CustomClassifier classifier = (CustomClassifier) object;
-            if(!classifier.valueIsAdjusting()) {
+            if(!classifier.isProcessing()) { // are we already in the middle of processing??
             classifier.process(record);
-            }
+            } 
         }
         }
@@ -438 +454 @@
         CommandTokenizer tokenizer = new CommandTokenizer(command);
         if(tokenizer.countTokens() >= 6) {
-        tokenizer.nextToken();// Loose customclassifier
+        tokenizer.nextToken();// Lose customclassifier
         // Get class name.
         String class_name = tokenizer.nextToken();
@@ -449 +465 @@
             replaces = tokenizer.nextToken();
             }
-            else {
+            else if (arg_name.equalsIgnoreCase("-separations")){
             separations = tokenizer.nextToken();
             }
@@ -462 +478 @@
             custom_classifier.setGatherer(gatherer);
             custom_classifier.recreate(original, separations);
-            assigned.add(indexOf(original), custom_classifier);
+            assigned.add(index, custom_classifier);
             assigned.removeElement(original);
             }
@@ -856 +872 @@
     private class AddListener
         implements ActionListener {
-                /** Any implementation of ActionListener must include this method so that we can be informed when an action has occured on one of our target controls, so that we can add the selected Classifier.
-                 * @param event An <strong>ActionEvent</strong> containing information garnered from the control action.
-                 * @see org.greenstone.gatherer.Gatherer
-                 * @see org.greenstone.gatherer.cdm.ArgumentConfiguration
-                 * @see org.greenstone.gatherer.cdm.Classifier
-                 * @see org.greenstone.gatherer.cdm.CustomClassifier
-                 */
+        /** Any implementation of ActionListener must include this method so that we can be informed when an action has occured on one of our target controls, so that we can add the selected Classifier.
+         * @param event An <strong>ActionEvent</strong> containing information garnered from the control action.
+         * @see org.greenstone.gatherer.Gatherer
+         * @see org.greenstone.gatherer.cdm.ArgumentConfiguration
+         * @see org.greenstone.gatherer.cdm.Classifier
+         * @see org.greenstone.gatherer.cdm.CustomClassifier
+         */
         public void actionPerformed(ActionEvent event) {
         String name = (String)classifier.getSelectedItem();
@@ -928 +944 @@
                 assigned.refresh();
                 }
-                cc.destroy(); // Remove gui prompt or else.
+                cc.hide(); // Remove gui prompt or else.
                 cc = null;
             }
@@ -939 +955 @@
     private class ConfigureListener
         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.
-                 * @param event An <strong>ActionEvent</strong> containing information garnered from the control action.
-                 * @see org.greenstone.gatherer.cdm.ArgumentConfiguration
-                 * @see org.greenstone.gatherer.cdm.Classifier
-                 * @see org.greenstone.gatherer.cdm.CustomClassifier
-                 */
+        /** 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.ArgumentConfiguration
+         * @see org.greenstone.gatherer.cdm.Classifier
+         * @see org.greenstone.gatherer.cdm.CustomClassifier
+         */
         public void actionPerformed(ActionEvent event) {
         if(!classifier_list.isSelectionEmpty()) {
@@ -961 +977 @@
                 assigned.refresh();
             }
-            cc.destroy(); // Remove gui prompt or else.
+            cc.hide(); // Remove gui prompt or else.
             cc = null;
             }
@@ -981 +997 @@
             assignClassifier(custom_classifier);
         }
-        custom_classifier.destroy(); // Remove gui prompt or else.
+        custom_classifier.hide(); // Remove gui prompt or else.
         custom_classifier = null;
         }