Changeset 4465

Timestamp:

2003-06-03T16:25:09+12:00 (21 years ago)

Author:

jmt12

Message:

2030093: Now a custom classifier is called on its own thread, so the AWT EventDispatchThread is free to update the display and more importantly add new GValueNodes to the tree (what caused the NPE). Furthermore it now checks if the custom classifier is currently adjusting its value before asking it to process a new metadata changed event.

File:

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

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

@@ -319 +319 @@
         if(object instanceof CustomClassifier) {
             CustomClassifier classifier = (CustomClassifier) object;
-            classifier.process(record);
+            if(!classifier.valueIsAdjusting()) {
+            classifier.process(record);
+            }
         }
         }
@@ -874 +876 @@
         // Custom classifier
         else {
-            if(custom_classifier.display(true)) {
-            assignClassifier(custom_classifier);
-            }
-            custom_classifier.destroy(); // Remove gui prompt or else.
-            custom_classifier = null;
+            // Spawn a new thread to handle this, as custom_classifiers can be processor heavy.
+            CustomClassifierTask task = new CustomClassifierTask(custom_classifier);
+            task.start();
         }
         }
@@ -944 +944 @@
         }
     }
+
+    private class CustomClassifierTask
+        extends Thread {
+
+        private CustomClassifier custom_classifier;
+
+        CustomClassifierTask(CustomClassifier custom_classifier) {
+        this.custom_classifier = custom_classifier;
+        }
+
+        public void run() {
+        if(custom_classifier.display(true)) {
+            assignClassifier(custom_classifier);
+        }
+        custom_classifier.destroy(); // Remove gui prompt or else.
+        custom_classifier = null;
+        }
+    }
+
     /** This class listens for actions upon the remove button in the controls, and if detected calls the removeClassifier() method.
             */