Merge pull request #485 from csmith/eventbus

Explicitly pass event bus in to a few places.

channelwho/src/main/java/com/dmdirc/addons/channelwho/ConnectionHandler.java

@@ -22,13 +22,13 @@
 
 package com.dmdirc.addons.channelwho;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.ConfigBinder;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.ChannelUserAwayEvent;
 import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.events.ServerNumericEvent;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -51,22 +51,23 @@ import net.engio.mbassy.listener.Handler;
 public class ConnectionHandler {
 
     private final Multimap<String, GroupChatUser> users;
+    private final DMDircMBassador eventBus;
     private final Connection connection;
     private final String domain;
     private final ScheduledExecutorService executorService;
-    private final ConnectionManager connectionManager;
     private final ConfigBinder configBinder;
     private ScheduledFuture<?> future;
 
     public ConnectionHandler(
             final AggregateConfigProvider config,
             final ScheduledExecutorService executorService,
-            final ConnectionManager connectionManager, final String domain,
+            final DMDircMBassador eventBus,
+            final String domain,
             final Connection connection) {
+        this.eventBus = eventBus;
         this.connection = connection;
         this.domain = domain;
         this.executorService = executorService;
-        this.connectionManager = connectionManager;
         configBinder = config.getBinder().withDefaultDomain(domain);
         users = HashMultimap.create();
     }
@@ -125,9 +126,8 @@ public class ConnectionHandler {
         if (event.getConnection().equals(connection) && event.getNumeric() == 301) {
             final String nickname = event.getArgs()[3];
             final String reason = event.getArgs()[4];
-            users.removeAll(nickname).forEach(u -> u.getGroupChat().getEventBus()
-                .publishAsync(new ChannelUserAwayEvent(u.getGroupChat(), u,
-                        Optional.ofNullable(reason))));
+            users.removeAll(nickname).forEach(u -> eventBus.publishAsync(
+                new ChannelUserAwayEvent(u.getGroupChat(), u, Optional.ofNullable(reason))));
         }
     }
 }

channelwho/src/main/java/com/dmdirc/addons/channelwho/ConnectionHandlerFactory.java

@@ -23,8 +23,8 @@
 package com.dmdirc.addons.channelwho;
 
 import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.ConnectionManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 
@@ -40,23 +40,23 @@ public class ConnectionHandlerFactory {
 
     private final AggregateConfigProvider config;
     private final ScheduledExecutorService executorService;
-    private final ConnectionManager connectionManager;
+    private final DMDircMBassador eventBus;
     private final String domain;
 
     @Inject
     public ConnectionHandlerFactory(@GlobalConfig final AggregateConfigProvider config,
             @Named("channelwho") final ScheduledExecutorService executorService,
-            final ConnectionManager connectionManager,
+            final DMDircMBassador eventBus,
             @PluginDomain(ChannelWhoPlugin.class) final String domain) {
         this.config = config;
         this.executorService = executorService;
-        this.connectionManager = connectionManager;
+        this.eventBus = eventBus;
         this.domain = domain;
     }
 
     public ConnectionHandler get(final Connection connection) {
         final ConnectionHandler handler = new ConnectionHandler(config, executorService,
-                connectionManager, domain, connection);
+            eventBus, domain, connection);
         handler.load();
         return handler;
     }

channelwho/src/test/java/com/dmdirc/addons/channelwho/ConnectionHandlerTest.java

@@ -97,10 +97,9 @@ public class ConnectionHandlerTest {
         when(groupChatUser.getNickname()).thenReturn("nickname");
         when(channelUserAwayEvent.getUser()).thenReturn(groupChatUser);
         when(channelUserAwayEvent.getChannel()).thenReturn(groupChat);
-        when(groupChat.getEventBus()).thenReturn(eventBus);
         when(groupChatUser.getUser()).thenReturn(user);
-        instance = new ConnectionHandler(config, scheduledExecutorService, connectionManager,
-                "domain", connection);
+        instance = new ConnectionHandler(config, scheduledExecutorService, eventBus,
+            "domain", connection);
         instance.handleWhoInterval(5);
 
         when(serverNumericEvent.getConnection()).thenReturn(connection);

contactlist/src/main/java/com/dmdirc/addons/contactlist/ContactListCommand.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.contactlist;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -47,14 +48,19 @@ public class ContactListCommand extends Command implements IntelligentCommand {
             "contactlist - show a contact list for the current channel",
             CommandType.TYPE_CHANNEL);
 
+    private final DMDircMBassador eventBus;
+
     /**
      * Creates a new instance of this command.
      *
      * @param controller The controller to use for command information.
      */
     @Inject
-    public ContactListCommand(final CommandController controller) {
+    public ContactListCommand(
+            final CommandController controller,
+            final DMDircMBassador eventBus) {
         super(controller);
+        this.eventBus = eventBus;
     }
 
     @Override
@@ -62,7 +68,8 @@ public class ContactListCommand extends Command implements IntelligentCommand {
             final CommandArguments args, final CommandContext context) {
         final ChannelCommandContext chanContext = (ChannelCommandContext) context;
 
-        final ContactListListener listener = new ContactListListener(chanContext.getGroupChat());
+        final ContactListListener listener =
+                new ContactListListener(chanContext.getGroupChat(), eventBus);
         listener.addListeners();
         chanContext.getGroupChat().getUsers().forEach(listener::clientAdded);
     }

contactlist/src/main/java/com/dmdirc/addons/contactlist/ContactListListener.java

@@ -49,9 +49,9 @@ public class ContactListListener {
      *
      * @param groupChat The group chat to show a contact list for
      */
-    public ContactListListener(final GroupChat groupChat) {
+    public ContactListListener(final GroupChat groupChat, final DMDircMBassador eventBus) {
         this.groupChat = groupChat;
-        this.eventBus = groupChat.getEventBus();
+        this.eventBus = eventBus;
     }
 
     /**