Changeset 12749

Timestamp:

2006-09-15T10:06:05+12:00 (18 years ago)

Author:

mdewsnip

Message:

Fixed some bugs in noticing what type of rebuild is required. This is all done completely wrong though -- it should be done at the CollectionConfiguration level, not at the GUI level.

Location:

trunk/gli/src/org/greenstone/gatherer/cdm

Files:

• ArgumentConfiguration.java (modified) (2 diffs)
• ClassifierManager.java (modified) (4 diffs)
• PluginManager.java (modified) (4 diffs)

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

@@ -103 +103 @@
     cancel.addActionListener(this);
     ok.addActionListener(this);
-    ok.addActionListener(CollectionDesignManager.all_change_listener);
 
     button_pane.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
@@ -153 +152 @@
     }
 
+
+    public void addOKButtonActionListener(ActionListener action_listener)
+    {
+    ok.addActionListener(action_listener);
+    }
+
+
     /** Destructor. */
     public void destroy() {

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

@@ -315 +315 @@
         // Listeners
         add.addActionListener(new AddListener());
-        add.addActionListener(CollectionDesignManager.buildcol_change_listener);
         classifier_combobox.addItemListener(ccl);
         configure.addActionListener(new ConfigureListener());
-        configure.addActionListener(CollectionDesignManager.buildcol_change_listener);
         remove.addActionListener(new RemoveListener());
         remove.addActionListener(CollectionDesignManager.buildcol_change_listener);
@@ -427 +425 @@
 
         ArgumentConfiguration ac = new ArgumentConfiguration(new_classifier);
+        ac.addOKButtonActionListener(CollectionDesignManager.buildcol_change_listener);
         if (ac.display()) {
             assignClassifier(new_classifier);
@@ -462 +461 @@
             Classifier classifier = (Classifier) classifier_list.getSelectedValue();
             ArgumentConfiguration ac = new ArgumentConfiguration(classifier);
-            if(ac.display()) {
+            ac.addOKButtonActionListener(CollectionDesignManager.buildcol_change_listener);
+            if (ac.display()) {
                 refresh(classifier);
             }
@@ -487 +487 @@
            Classifier classifier = (Classifier) classifier_list.getSelectedValue();
            ArgumentConfiguration ac = new ArgumentConfiguration(classifier);
-           if(ac.display()) {
+           ac.addOKButtonActionListener(CollectionDesignManager.buildcol_change_listener);
+           if (ac.display()) {
                refresh(classifier);
            }

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

@@ -463 +463 @@
         
         // Listeners
-        add.addActionListener(new AddListener()); //all_change_listener is listening to the ArgumentConfiguration
+        add.addActionListener(new AddListener());
         configure.addActionListener(new ConfigureListener());
         MoveListener ml = new MoveListener();
@@ -593 +593 @@
 
         ArgumentConfiguration ac = new ArgumentConfiguration(new_plugin);
+        ac.addOKButtonActionListener(CollectionDesignManager.all_change_listener);
         if (ac.display()) {
             assignPlugin(new_plugin);
@@ -619 +620 @@
             if(!plugin.isSeparator()) {
                 ArgumentConfiguration ac = new ArgumentConfiguration(plugin);
-                if(ac.display()) {
+                ac.addOKButtonActionListener(CollectionDesignManager.all_change_listener);
+                if (ac.display()) {
                 refresh(plugin);
                 }
@@ -645 +647 @@
             if(!plugin.isSeparator()) {
             ArgumentConfiguration ac = new ArgumentConfiguration(plugin);
-            if(ac.display()) {
+            ac.addOKButtonActionListener(CollectionDesignManager.all_change_listener);
+            if (ac.display()) {
                 refresh(plugin);
             }