Changeset 12637 for trunk/gli/src/org/greenstone/gatherer/cdm/ClassifierManager.java

Timestamp:

2006-09-01T09:52:58+12:00 (18 years ago)

Author:

mdewsnip

Message:

The remainder of the code needed for the new plugins/classifiers stuff when using remote building.

File:

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

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

@@ -137 +137 @@
         StringBuffer xml = null;
         if (Gatherer.isGsdlRemote) {
-        // !! TO DO
+        String classinfo_output = RemoteGreenstoneServer.getScriptOptions("classinfo.pl", "&classifier=" + classifier);
+        xml = new StringBuffer(classinfo_output);
         }
         else {
@@ -563 +564 @@
     }
 
-    /** This class listens for actions upon the add button in the controls, and if detected calls the assignClassifier() method.
-     */
+
     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
-         */
-        public void actionPerformed(ActionEvent event) {
-        Object selected_object = classifier_combobox.getSelectedItem();
-        // If there is something in the combobox, but we haven't registered a selection, then add the object and select it!
-        if(selected_object != null) {
-            // Retrieve the base classifier
-            Classifier base_classifier = getClassifier(selected_object.toString(), true);
-
-            // Create a new element in the DOM
-            Element element = CollectionDesignManager.collect_config.document.createElement(CollectionConfiguration.CLASSIFY_ELEMENT);
-            element.setAttribute(CollectionConfiguration.TYPE_ATTRIBUTE, base_classifier.getName());
-            Classifier new_classifier = new Classifier(element, base_classifier);
-            
-            element = null;
-            // Automatically chain to configuration. This ensures required arguments are filled out.
-            ArgumentConfiguration ac = new ArgumentConfiguration(new_classifier);
-            if(ac.display()) {
-            if(!model.contains(new_classifier)) {
-                assignClassifier(new_classifier);
-                classifier_list.setSelectedValue(new_classifier, true);
-            }
-            else {
-                JOptionPane.showMessageDialog(Gatherer.g_man, Dictionary.get("CDM.ClassifierManager.Classifier_Exists"), Dictionary.get("General.Error"), JOptionPane.ERROR_MESSAGE);
-            }
-            }
-            ac = null;
-            new_classifier = null;
-        }
-        }
-    }
+        implements ActionListener
+    {
+        public void actionPerformed(ActionEvent event)
+        {
+        if (classifier_combobox.getSelectedItem() != null) {
+            // This must be done on a new thread for the remote building code
+            new AddClassifierTask(classifier_combobox.getSelectedItem().toString()).start();
+        }
+        }
+    }
+
+
+    private class AddClassifierTask
+        extends Thread
+    {
+        private String classifier_name;
+
+        public AddClassifierTask(String classifier_name)
+        {
+        this.classifier_name = classifier_name;
+        }
+
+        public void run()
+        {
+        // Retrieve the classifier
+        Classifier classifier = getClassifier(classifier_name, true);
+        if (classifier == null) {
+            System.err.println("Error: getClassifier() returned null.");
+            return;
+        }
+
+        // Create a new element in the DOM
+        Element new_classifier_element = CollectionDesignManager.collect_config.document.createElement(CollectionConfiguration.CLASSIFY_ELEMENT);
+        new_classifier_element.setAttribute(CollectionConfiguration.TYPE_ATTRIBUTE, classifier.getName());
+        Classifier new_classifier = new Classifier(new_classifier_element, classifier);
+
+        ArgumentConfiguration ac = new ArgumentConfiguration(new_classifier);
+        if (ac.display()) {
+            assignClassifier(new_classifier);
+            classifier_list.setSelectedValue(new_classifier, true);
+        }
+        }
+    }
+
 
     /** This listener reacts to changes in the current selection of the classifier combobox. */