Changeset 13277

Timestamp:

2006-11-15T16:03:23+13:00 (17 years ago)

Author:

mdewsnip

Message:

Fixed a thread bug where the same plugin might be offered more than once because the first one wasn't assigned quickly enough.

File:

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

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

@@ -950 +950 @@
 
         if (event.getSource() == add_button) {
-        new AddPluginTask(suitable_plugins_combobox.getSelectedItem().toString()).start();
-        }
-    }
-    }
-
-
-    private class AddPluginTask
-    extends Thread
-    {
-    private String plugin_name;
-
-    public AddPluginTask(String plugin_name)
+        AddPluginWithoutConfigurationTask add_plugin_task = new AddPluginWithoutConfigurationTask(suitable_plugins_combobox.getSelectedItem().toString());
+        add_plugin_task.start();
+
+        // We have to wait for this task to complete before continuing, otherwise
+        // we might offer to add the same plugin again before the task has completed
+        try {
+            add_plugin_task.join();
+        }
+        catch (Exception exception) {
+            DebugStream.printStackTrace(exception);
+        }
+        }
+    }
+
+
+    private class AddPluginWithoutConfigurationTask
+        extends Thread
     {
-        this.plugin_name = plugin_name;
-    }
-
-    public void run()
-    {
-        // Retrieve the plugin
-        Plugin plugin = Plugins.getPlugin(plugin_name, true);
-        if (plugin == null) {
-        System.err.println("Error: getPlugin() returned null.");
-        return;
-        }
-
-        // Create a new element in the DOM
-        Element new_plugin_element = CollectionConfiguration.createElement(StaticStrings.PLUGIN_ELEMENT);
-        new_plugin_element.setAttribute(StaticStrings.TYPE_ATTRIBUTE, plugin.getName());
-        Plugin new_plugin = new Plugin(new_plugin_element, plugin);
-
-        // Just assign the plugin with no argument configuration
-        assignPlugin(new_plugin);
+        private String plugin_name;
+
+        public AddPluginWithoutConfigurationTask(String plugin_name)
+        {
+        this.plugin_name = plugin_name;
+        }
+
+        public void run()
+        {
+        // Retrieve the plugin
+        Plugin plugin = Plugins.getPlugin(plugin_name, true);
+        if (plugin == null) {
+            System.err.println("Error: getPlugin() returned null.");
+            return;
+        }
+
+        // Create a new element in the DOM
+        Element new_plugin_element = CollectionConfiguration.createElement(StaticStrings.PLUGIN_ELEMENT);
+        new_plugin_element.setAttribute(StaticStrings.TYPE_ATTRIBUTE, plugin.getName());
+        Plugin new_plugin = new Plugin(new_plugin_element, plugin);
+
+        // Just assign the plugin with no argument configuration
+        assignPlugin(new_plugin);
+        }
     }
     }