EventBus the prefs events.

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

src/com/dmdirc/ClientModule.java

@@ -221,13 +221,14 @@ public class ClientModule {
     @Provides
     @Singleton
     public PluginManager getPluginManager(
+            final EventBus eventBus,
             final IdentityController identityController,
             final ActionController actionController,
             final UpdateManager updateManager,
             final Provider<PluginInjectorInitialiser> initialiserProvider,
             final ObjectGraph objectGraph,
             @Directory(DirectoryType.PLUGINS) final String directory) {
-        final PluginManager manager = new PluginManager(identityController,
+        final PluginManager manager = new PluginManager(eventBus, identityController,
                 actionController, updateManager, initialiserProvider, objectGraph, directory);
         final CorePluginExtractor extractor = new CorePluginExtractor(manager, directory);
         checkBundledPlugins(extractor, manager, identityController.getGlobalConfiguration());

src/com/dmdirc/config/prefs/PreferencesDialogModel.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.config.prefs;
 
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.events.ClientPrefsClosedEvent;
+import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.plugins.PluginManager;
@@ -32,12 +32,16 @@ import com.dmdirc.util.collections.ListenerList;
 import com.dmdirc.util.validators.NumericalValidator;
 import com.dmdirc.util.validators.OptionalValidator;
 
+import com.google.common.eventbus.EventBus;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import javax.inject.Inject;
+
 /**
  * Manages categories that should appear in the preferences dialog.
  */
@@ -61,8 +65,8 @@ public class PreferencesDialogModel {
     private final ConfigProvider identity;
     /** Plugin manager. */
     private final PluginManager pluginManager;
-    /** Action Manager. */
-    private final ActionManager actionManager;
+    /** Event bus to post events on. */
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of PreferencesDialogModel.
@@ -73,29 +77,30 @@ public class PreferencesDialogModel {
      * @param urlHandlerPanel UI specific URL panel
      * @param configManager   Config manager to read settings from
      * @param identity        Identity to write settings to
-     * @param actionManager   Action manager to register and trigger actions with
      * @param pluginManager   Plugin manager to retrieve plugins from
+     * @param eventBus        Event bus to post events on
      */
+    @Inject
     public PreferencesDialogModel(final PreferencesInterface pluginPanel,
             final PreferencesInterface themePanel,
             final PreferencesInterface updatesPanel,
             final PreferencesInterface urlHandlerPanel,
             final AggregateConfigProvider configManager,
             final ConfigProvider identity,
-            final ActionManager actionManager,
-            final PluginManager pluginManager) {
+            final PluginManager pluginManager,
+            final EventBus eventBus) {
         this.pluginPanel = pluginPanel;
         this.themePanel = themePanel;
         this.updatesPanel = updatesPanel;
         this.urlHandlerPanel = urlHandlerPanel;
         this.configManager = configManager;
         this.identity = identity;
-        this.actionManager = actionManager;
         this.pluginManager = pluginManager;
+        this.eventBus = eventBus;
 
         addDefaultCategories();
 
-        actionManager.triggerEvent(CoreActionType.CLIENT_PREFS_OPENED, null, this);
+        eventBus.post(new ClientPrefsOpenedEvent(this));
     }
 
     public AggregateConfigProvider getConfigManager() {
@@ -626,7 +631,7 @@ public class PreferencesDialogModel {
      * @since 0.6
      */
     public void close() {
-        actionManager.triggerEvent(CoreActionType.CLIENT_PREFS_CLOSED, null);
+        eventBus.post(new ClientPrefsClosedEvent());
     }
 
 }

src/com/dmdirc/config/prefs/PreferencesManager.java

@@ -22,13 +22,15 @@
 
 package com.dmdirc.config.prefs;
 
-import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.interfaces.ActionController;
+import com.dmdirc.events.ConnectionPrefsRequestedEvent;
+import com.dmdirc.events.GroupChatPrefsRequestedEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.util.validators.NumericalValidator;
 import com.dmdirc.util.validators.OptionalValidator;
 
+import com.google.common.eventbus.EventBus;
+
 import javax.inject.Inject;
 
 /**
@@ -38,12 +40,12 @@ import javax.inject.Inject;
  */
 public class PreferencesManager {
 
-    /** The action controller to fire events on. */
-    private final ActionController actionController;
+    /** Event bus to public events on. */
+    private final EventBus eventBus;
 
     @Inject
-    public PreferencesManager(final ActionController actionController) {
-        this.actionController = actionController;
+    public PreferencesManager(final EventBus eventBus) {
+        this.eventBus = eventBus;
     }
 
     /**
@@ -125,8 +127,7 @@ public class PreferencesManager {
                 "Reconnect message", "Default quit message to use when reconnecting",
                 manager, identity));
 
-        actionController.triggerEvent(CoreActionType.CLIENT_PREFS_REQUESTED,
-                null, category, Boolean.TRUE);
+        eventBus.post(new ConnectionPrefsRequestedEvent(category));
 
         return category;
     }
@@ -239,8 +240,7 @@ public class PreferencesManager {
                 "Number of items of input history to keep",
                 manager, identity));
 
-        actionController.triggerEvent(CoreActionType.CLIENT_PREFS_REQUESTED,
-                null, category, Boolean.FALSE);
+        eventBus.post(new GroupChatPrefsRequestedEvent(category));
 
         return category;
     }

src/com/dmdirc/plugins/PluginManager.java

@@ -23,10 +23,9 @@
 package com.dmdirc.plugins;
 
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.config.prefs.PreferencesDialogModel;
+import com.dmdirc.events.ClientPrefsClosedEvent;
+import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.interfaces.ActionController;
-import com.dmdirc.interfaces.ActionListener;
-import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
@@ -34,6 +33,9 @@ import com.dmdirc.updater.components.PluginComponent;
 import com.dmdirc.updater.manager.UpdateManager;
 import com.dmdirc.util.collections.MapList;
 
+import com.google.common.eventbus.EventBus;
+import com.google.common.eventbus.Subscribe;
+
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -54,7 +56,7 @@ import dagger.ObjectGraph;
 /**
  * Searches for and manages plugins and services.
  */
-public class PluginManager implements ActionListener, ServiceManager {
+public class PluginManager implements ServiceManager {
 
     /** List of known plugins' file names to their corresponding {@link PluginInfo} objects. */
     private final Map<String, PluginInfo> knownPlugins = new HashMap<>();
@@ -80,6 +82,7 @@ public class PluginManager implements ActionListener, ServiceManager {
     /**
      * Creates a new instance of PluginManager.
      *
+     * @param eventBus            The event bus to subscribe to events on
      * @param identityController  The identity controller to use for configuration options.
      * @param actionController    The action controller to use for events.
      * @param updateManager       The update manager to inform about plugins.
@@ -88,6 +91,7 @@ public class PluginManager implements ActionListener, ServiceManager {
      * @param directory           The directory to load plugins from.
      */
     public PluginManager(
+            final EventBus eventBus,
             final IdentityController identityController,
             final ActionController actionController,
             final UpdateManager updateManager,
@@ -102,9 +106,7 @@ public class PluginManager implements ActionListener, ServiceManager {
         this.globalClassLoader = new GlobalClassLoader(this);
         this.objectGraph = objectGraph;
 
-        actionController.registerListener(this,
-                CoreActionType.CLIENT_PREFS_OPENED,
-                CoreActionType.CLIENT_PREFS_CLOSED);
+        eventBus.register(this);
     }
 
     /**
@@ -571,32 +573,31 @@ public class PluginManager implements ActionListener, ServiceManager {
         return new ArrayList<>(knownPlugins.values());
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void processEvent(final ActionType type, final StringBuffer format,
-            final Object... arguments) {
-        if (type.equals(CoreActionType.CLIENT_PREFS_OPENED)) {
-            for (PluginInfo pi : getPluginInfos()) {
-                if (!pi.isLoaded() && !pi.isTempLoaded()) {
-                    pi.loadPluginTemp();
-                }
-                if (pi.isLoaded() || pi.isTempLoaded()) {
-                    try {
-                        pi.getPlugin().showConfig((PreferencesDialogModel) arguments[0]);
-                    } catch (LinkageError | Exception le) {
-                        Logger.appError(ErrorLevel.MEDIUM,
-                                "Unable to show plugin configuration for "
-                                + pi.getMetaData().getFriendlyName(), le);
-                    }
-                }
+    @Subscribe
+    public void handlePrefsOpened(final ClientPrefsOpenedEvent event) {
+        for (PluginInfo pi : getPluginInfos()) {
+            if (!pi.isLoaded() && !pi.isTempLoaded()) {
+                pi.loadPluginTemp();
             }
-        } else if (type.equals(CoreActionType.CLIENT_PREFS_CLOSED)) {
-            for (PluginInfo pi : getPluginInfos()) {
-                if (pi.isTempLoaded()) {
-                    pi.unloadPlugin();
+            if (pi.isLoaded() || pi.isTempLoaded()) {
+                try {
+                    pi.getPlugin().showConfig(event.getModel());
+                } catch (LinkageError | Exception le) {
+                    Logger.appError(ErrorLevel.MEDIUM,
+                            "Unable to show plugin configuration for "
+                            + pi.getMetaData().getFriendlyName(), le);
                 }
             }
         }
     }
 
+    @Subscribe
+    public void handlePrefsClosed(final ClientPrefsClosedEvent event) {
+        for (PluginInfo pi : getPluginInfos()) {
+            if (pi.isTempLoaded()) {
+                pi.unloadPlugin();
+            }
+        }
+    }
+
 }

test/com/dmdirc/config/prefs/PreferencesDialogModelTest.java

@@ -22,32 +22,41 @@
 
 package com.dmdirc.config.prefs;
 
-import com.dmdirc.actions.ActionManager;
-import com.dmdirc.actions.CoreActionType;
+import com.dmdirc.events.ClientPrefsClosedEvent;
+import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.Service;
 
+import com.google.common.eventbus.EventBus;
+
 import java.util.ArrayList;
 import java.util.List;
 
 import org.junit.Before;
 import org.junit.Test;
-
-import static org.junit.Assert.*;
-import static org.mockito.Mockito.*;
-
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+@RunWith(MockitoJUnitRunner.class)
 public class PreferencesDialogModelTest {
 
-    private ActionManager actionManager;
-    private PluginManager pluginManager;
+    @Mock private EventBus eventBus;
+    @Mock private PluginManager pluginManager;
 
     @Before
     public void setup() {
-        actionManager = mock(ActionManager.class);
-        pluginManager = mock(PluginManager.class);
-
         final List<Service> services = new ArrayList<>();
         final Service tabcompleter = mock(Service.class);
         when(tabcompleter.getName()).thenReturn("tabber");
@@ -61,7 +70,7 @@ public class PreferencesDialogModelTest {
         AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
-                null, null, cm, null, actionManager, pluginManager);
+                null, null, cm, null, pluginManager, eventBus);
         assertNotNull(pm.getCategory("General"));
         assertNotNull(pm.getCategory("Connection"));
         assertNotNull(pm.getCategory("Messages"));
@@ -78,7 +87,7 @@ public class PreferencesDialogModelTest {
         when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesCategory category = mock(PreferencesCategory.class);
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
-                null, null, cm, null, actionManager, pluginManager);
+                null, null, cm, null, pluginManager, eventBus);
         pm.addCategory(category);
         pm.dismiss();
 
@@ -93,7 +102,7 @@ public class PreferencesDialogModelTest {
         when(cm.getOption("domain", "option")).thenReturn("fallback");
 
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
-                null, null, cm, null, actionManager, pluginManager);
+                null, null, cm, null, pluginManager, eventBus);
         pm.addCategory(category);
         assertFalse(pm.save());
 
@@ -108,7 +117,7 @@ public class PreferencesDialogModelTest {
         when(cm.getOption("domain", "option")).thenReturn("fallback");
 
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
-                null, null, cm, null, actionManager, pluginManager);
+                null, null, cm, null, pluginManager, eventBus);
         pm.addCategory(category);
         assertTrue(pm.save());
 
@@ -121,7 +130,7 @@ public class PreferencesDialogModelTest {
         when(cm.getOption("domain", "option")).thenReturn("fallback");
 
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
-                null, null, cm, null, actionManager, pluginManager);
+                null, null, cm, null, pluginManager, eventBus);
         assertNull(pm.getCategory("unittest123"));
     }
 
@@ -131,7 +140,7 @@ public class PreferencesDialogModelTest {
         when(cm.getOption("domain", "option")).thenReturn("fallback");
 
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
-                null, null, cm, null, actionManager, pluginManager);
+                null, null, cm, null, pluginManager, eventBus);
         assertNotNull(pm.getCategories());
         assertFalse(pm.getCategories().isEmpty());
 
@@ -146,7 +155,7 @@ public class PreferencesDialogModelTest {
         when(cm.getOption("domain", "option")).thenReturn("fallback");
 
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
-                null, null, cm, null, actionManager, pluginManager);
+                null, null, cm, null, pluginManager, eventBus);
         final PreferencesInterface tpi = mock(PreferencesInterface.class);
 
         pm.registerSaveListener(tpi);
@@ -160,9 +169,9 @@ public class PreferencesDialogModelTest {
         when(cm.getOption("domain", "option")).thenReturn("fallback");
 
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
-                null, null, cm, null, actionManager, pluginManager);
+                null, null, cm, null, pluginManager, eventBus);
 
-        verify(actionManager).triggerEvent(CoreActionType.CLIENT_PREFS_OPENED, null, pm);
+        verify(eventBus).post(isA(ClientPrefsOpenedEvent.class));
     }
 
     @Test
@@ -171,10 +180,10 @@ public class PreferencesDialogModelTest {
         AggregateConfigProvider cm = mock(AggregateConfigProvider.class);
         when(cm.getOption("domain", "option")).thenReturn("fallback");
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
-                null, null, cm, null, actionManager, pluginManager);
+                null, null, cm, null, pluginManager, eventBus);
         pm.close();
 
-        verify(actionManager).triggerEvent(CoreActionType.CLIENT_PREFS_CLOSED, null);
+        verify(eventBus).post(isA(ClientPrefsClosedEvent.class));
     }
 
     @Test
@@ -183,7 +192,7 @@ public class PreferencesDialogModelTest {
         when(cm.getOption("domain", "option")).thenReturn("fallback");
 
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
-                null, null, cm, null, actionManager, pluginManager);
+                null, null, cm, null, pluginManager, eventBus);
         final PreferencesCategory category = mock(PreferencesCategory.class);
         final PreferencesInterface tpi = mock(PreferencesInterface.class);
         when(category.hasObject()).thenReturn(true);

test/com/dmdirc/config/prefs/PreferencesManagerTest.java

@@ -22,48 +22,38 @@
 
 package com.dmdirc.config.prefs;
 
-import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.interfaces.ActionController;
+import com.dmdirc.events.ConnectionPrefsRequestedEvent;
+import com.dmdirc.events.GroupChatPrefsRequestedEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
-import org.junit.Before;
+import com.google.common.eventbus.EventBus;
+
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
 
-import static org.mockito.Mockito.*;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.verify;
 
+@RunWith(MockitoJUnitRunner.class)
 public class PreferencesManagerTest {
 
-    private ActionController actionController;
-    private AggregateConfigProvider configManager;
-    private PreferencesManager manager;
-
-    @Before
-    public void setup() {
-        this.actionController = mock(ActionController.class);
-        this.configManager = mock(AggregateConfigProvider.class);
-        this.manager = new PreferencesManager(actionController);
-    }
+    @Mock private EventBus eventBus;
+    @Mock private AggregateConfigProvider configManager;
 
     @Test
     public void testGettingChannelPrefsRaisesAction() {
-        this.manager.getChannelSettings(this.configManager, null);
-
-        verify(this.actionController).triggerEvent(
-                eq(CoreActionType.CLIENT_PREFS_REQUESTED),
-                (StringBuffer) isNull(),
-                any(PreferencesCategory.class),
-                eq(Boolean.FALSE));
+        new PreferencesManager(eventBus).getChannelSettings(this.configManager, null);
+        verify(eventBus).post(isA(GroupChatPrefsRequestedEvent.class));
     }
 
     @Test
     public void testGettingServerPrefsRaisesAction() {
-        this.manager.getServerSettings(this.configManager, null);
+        new PreferencesManager(eventBus).getServerSettings(this.configManager, null);
 
-        verify(this.actionController).triggerEvent(
-                eq(CoreActionType.CLIENT_PREFS_REQUESTED),
-                (StringBuffer) isNull(),
-                any(PreferencesCategory.class),
-                eq(Boolean.TRUE));
+        verify(eventBus).post(isA(GroupChatPrefsRequestedEvent.class));
+        verify(eventBus).post(isA(ConnectionPrefsRequestedEvent.class));
     }
 
 }