Remove plugin (un)loaded events.

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

src/com/dmdirc/addons/notifications/NotificationsManager.java

@@ -24,22 +24,23 @@ package com.dmdirc.addons.notifications;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.interfaces.ActionListener;
-import com.dmdirc.interfaces.actions.ActionType;
+import com.dmdirc.events.PluginLoadedEvent;
+import com.dmdirc.events.PluginUnloadedEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Inject;
 
-public class NotificationsManager implements ActionListener {
+public class NotificationsManager {
 
     /** The notification methods that we know of. */
     private final List<String> methods = new ArrayList<>();
@@ -51,23 +52,26 @@ public class NotificationsManager implements ActionListener {
     private final AggregateConfigProvider globalConfig;
     /** Plugin manager. */
     private final PluginManager pluginManager;
+    /** Event bus to listen for events on. */
+    private final EventBus eventBus;
 
     @Inject
     public NotificationsManager(
             @PluginDomain(NotificationsPlugin.class) final String domain,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             @UserConfig final ConfigProvider userSettings,
+            final EventBus eventBus,
             final PluginManager pluginManager) {
         this.domain = domain;
         this.globalConfig = globalConfig;
         this.pluginManager = pluginManager;
+        this.eventBus = eventBus;
     }
 
     public void onLoad() {
         methods.clear();
         loadSettings();
-        ActionManager.getActionManager().registerListener(this,
-                CoreActionType.PLUGIN_LOADED, CoreActionType.PLUGIN_UNLOADED);
+        eventBus.register(this);
         for (PluginInfo target : pluginManager.getPluginInfos()) {
             if (target.isLoaded()) {
                 addPlugin(target);
@@ -77,7 +81,17 @@ public class NotificationsManager implements ActionListener {
 
     public void onUnload() {
         methods.clear();
-        ActionManager.getActionManager().unregisterListener(this);
+        eventBus.unregister(this);
+    }
+
+    @Subscribe
+    public void handlePluginLoaded(final PluginLoadedEvent event) {
+        addPlugin(event.getPlugin());
+    }
+
+    @Subscribe
+    public void handlePluginUnloaded(final PluginUnloadedEvent event) {
+        removePlugin(event.getPlugin());
     }
 
     /** Loads the plugins settings. */
@@ -89,16 +103,6 @@ public class NotificationsManager implements ActionListener {
         }
     }
 
-    @Override
-    public void processEvent(final ActionType type, final StringBuffer format,
-            final Object... arguments) {
-        if (type == CoreActionType.PLUGIN_LOADED) {
-            addPlugin((PluginInfo) arguments[0]);
-        } else if (type == CoreActionType.PLUGIN_UNLOADED) {
-            removePlugin((PluginInfo) arguments[0]);
-        }
-    }
-
     /**
      * Checks to see if a plugin implements the notification method interface and if it does, adds
      * the method to our list.

src/com/dmdirc/addons/nowplaying/NowPlayingManager.java

@@ -24,10 +24,9 @@ package com.dmdirc.addons.nowplaying;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
-import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.events.PluginLoadedEvent;
+import com.dmdirc.events.PluginUnloadedEvent;
 import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.interfaces.ActionListener;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.plugins.Plugin;
@@ -35,13 +34,16 @@ import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import javax.inject.Inject;
 
-public class NowPlayingManager implements ActionListener {
+public class NowPlayingManager {
 
     /** Plugin manager to get plugins from. */
     private final PluginManager pluginManager;
@@ -49,6 +51,8 @@ public class NowPlayingManager implements ActionListener {
     private final ActionController actionController;
     /** Global configuration to read settings from. */
     private final AggregateConfigProvider globalConfig;
+    /** Event bus to subscribe to events on. */
+    private final EventBus eventBus;
     /** This plugin's settings domain. */
     private final String domain;
     /** The sources that we know of. */
@@ -62,6 +66,7 @@ public class NowPlayingManager implements ActionListener {
     public NowPlayingManager(
             final PluginManager pluginManager,
             final ActionController actionController,
+            final EventBus eventBus,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             @UserConfig final ConfigProvider userConfig,
             @PluginDomain(NowPlayingPlugin.class) final String domain) {
@@ -69,6 +74,7 @@ public class NowPlayingManager implements ActionListener {
         this.actionController = actionController;
         this.globalConfig = globalConfig;
         this.domain = domain;
+        this.eventBus = eventBus;
     }
 
     /**
@@ -78,8 +84,7 @@ public class NowPlayingManager implements ActionListener {
         sources.clear();
         managers.clear();
         order = getSettings();
-        actionController.registerListener(this, CoreActionType.PLUGIN_LOADED,
-                CoreActionType.PLUGIN_UNLOADED);
+        eventBus.register(this);
         for (PluginInfo target : pluginManager.getPluginInfos()) {
             if (target.isLoaded()) {
                 addPlugin(target);
@@ -93,7 +98,17 @@ public class NowPlayingManager implements ActionListener {
     public void onUnload() {
         sources.clear();
         managers.clear();
-        actionController.unregisterListener(this);
+        eventBus.unregister(this);
+    }
+
+    @Subscribe
+    public void handlePluginLoaded(final PluginLoadedEvent event) {
+        addPlugin(event.getPlugin());
+    }
+
+    @Subscribe
+    public void handlePluginUnloaded(final PluginUnloadedEvent event) {
+        removePlugin(event.getPlugin());
     }
 
     /**
@@ -282,14 +297,4 @@ public class NowPlayingManager implements ActionListener {
         return res;
     }
 
-    @Override
-    public void processEvent(final ActionType type, final StringBuffer format,
-            final Object... arguments) {
-        if (type == CoreActionType.PLUGIN_LOADED) {
-            addPlugin((PluginInfo) arguments[0]);
-        } else if (type == CoreActionType.PLUGIN_UNLOADED) {
-            removePlugin((PluginInfo) arguments[0]);
-        }
-    }
-
 }