Remove plugin (un)loaded actions.

Depends-On: I413a3f6f72999262bf4426de082cc8c9946a6f90
Change-Id: I84f07c00e0589ff25ae1b4a01f5671488b847925
Reviewed-on: http://gerrit.dmdirc.com/3450
Reviewed-by: Chris Smith <chris@dmdirc.com>
Automatic-Compile: DMDirc Build Manager

src/com/dmdirc/actions/CoreActionType.java

@@ -220,8 +220,10 @@ public enum CoreActionType implements ActionType {
     /** Query nick change. */
     QUERY_NICKCHANGE(QueryEvents.QUERY_EVENT_WITH_ARG, "Query: user changed nicks"),
     /** Plugin loaded. */
+    @Deprecated
     PLUGIN_LOADED(PluginEvents.PLUGIN_EVENT, "Plugin loaded"),
     /** Plugin unloaded. */
+    @Deprecated
     PLUGIN_UNLOADED(PluginEvents.PLUGIN_EVENT, "Plugin unloaded"),
     /** Plugins have been refreshed. */
     PLUGIN_REFRESH(PluginEvents.PLUGIN_EVENT, "Plugins refreshed"),

src/com/dmdirc/events/PluginEvent.java

@@ -22,9 +22,21 @@
 
 package com.dmdirc.events;
 
+import com.dmdirc.plugins.PluginInfo;
+
 /**
  * Base class for all plugin events.
  */
 public abstract class PluginEvent extends DMDircEvent {
 
+    private PluginInfo plugin;
+
+    public PluginEvent(final PluginInfo plugin) {
+        this.plugin = plugin;
+    }
+
+    public PluginInfo getPlugin() {
+        return plugin;
+    }
+
 }

src/com/dmdirc/events/PluginLoadedEvent.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.events;
+
+import com.dmdirc.plugins.PluginInfo;
+
+/**
+ * Fired when a plugin is loaded.
+ */
+public class PluginLoadedEvent extends PluginEvent {
+
+    public PluginLoadedEvent(final PluginInfo plugin) {
+        super(plugin);
+    }
+}

src/com/dmdirc/events/PluginUnloadedEvent.java

@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.events;
+
+import com.dmdirc.plugins.PluginInfo;
+
+/**
+ * Fired when a plugin is loaded.
+ */
+public class PluginUnloadedEvent extends PluginEvent {
+
+    public PluginUnloadedEvent(final PluginInfo plugin) {
+        super(plugin);
+    }
+}

src/com/dmdirc/plugins/PluginInfo.java

@@ -22,10 +22,10 @@
 
 package com.dmdirc.plugins;
 
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.config.ConfigFileBackedConfigProvider;
 import com.dmdirc.config.InvalidIdentityFileException;
+import com.dmdirc.events.PluginLoadedEvent;
+import com.dmdirc.events.PluginUnloadedEvent;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.logger.ErrorLevel;
@@ -34,6 +34,8 @@ import com.dmdirc.util.SimpleInjector;
 import com.dmdirc.util.resourcemanager.ResourceManager;
 import com.dmdirc.util.validators.ValidationResponse;
 
+import com.google.common.eventbus.EventBus;
+
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -91,12 +93,15 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
     private final Map<String, ExportInfo> exports = new HashMap<>();
     /** List of configuration providers. */
     private final List<ConfigProvider> configProviders = new ArrayList<>();
+    /** Event bus to post plugin loaded events to. */
+    private final EventBus eventBus;
 
     /**
      * Create a new PluginInfo.
      *
      * @param metadata            The plugin's metadata information
      * @param injectorInitialiser The initialiser to use for the plugin's injector.
+     * @param eventBus            Event bus to post event loaded events on.
      * @param identityController  The identity controller to add and remove settings from.
      * @param objectGraph         The object graph to give to plugins for DI purposes.
      *
@@ -105,10 +110,12 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
     public PluginInfo(
             final PluginMetaData metadata,
             final Provider<PluginInjectorInitialiser> injectorInitialiser,
+            final EventBus eventBus,
             final IdentityController identityController,
             final ObjectGraph objectGraph) throws PluginException {
         this.injectorInitialiser = injectorInitialiser;
         this.objectGraph = objectGraph;
+        this.eventBus = eventBus;
         this.identityController = identityController;
         this.filename = new File(metadata.getPluginUrl().getPath()).getName();
         this.metaData = metadata;
@@ -627,8 +634,8 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
             loadClass(metaData.getMainClass());
 
             if (isLoaded()) {
-                ActionManager.getActionManager().triggerEvent(
-                        CoreActionType.PLUGIN_LOADED, null, this);
+                //TODO plugin loading shouldnt be done from here, event bus shouldn't be here.
+                eventBus.post(new PluginLoadedEvent(this));
             }
 
             isLoading = false;
@@ -846,8 +853,8 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
                     Logger.appError(ErrorLevel.MEDIUM, lastError, e);
                 }
 
-                ActionManager.getActionManager().triggerEvent(
-                        CoreActionType.PLUGIN_UNLOADED, null, this);
+                //TODO plugin unloading shouldnt be done from here, event bus shouldn't be here.
+                eventBus.post(new PluginUnloadedEvent(this));
                 synchronized (provides) {
                     for (Service service : provides) {
                         service.delProvider(this);

src/com/dmdirc/plugins/PluginManager.java

@@ -78,6 +78,8 @@ public class PluginManager implements ServiceManager {
     private final GlobalClassLoader globalClassLoader;
     /** The graph to pass to plugins for DI purposes. */
     private final ObjectGraph objectGraph;
+    /** Event bus to pass to plugin info for plugin loaded events. */
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of PluginManager.
@@ -105,6 +107,7 @@ public class PluginManager implements ServiceManager {
         this.directory = directory;
         this.globalClassLoader = new GlobalClassLoader(this);
         this.objectGraph = objectGraph;
+        this.eventBus = eventBus;
 
         eventBus.register(this);
     }
@@ -264,7 +267,7 @@ public class PluginManager implements ServiceManager {
                             + "!/META-INF/plugin.config"),
                     new URL("file:" + getDirectory() + filename));
             metadata.load();
-            final PluginInfo pluginInfo = new PluginInfo(metadata, initialiserProvider,
+            final PluginInfo pluginInfo = new PluginInfo(metadata, initialiserProvider, eventBus,
                     identityController, objectGraph);
             final PluginInfo existing = getPluginInfoByName(metadata.getName());
             if (existing != null) {