Use new scoped event bus.

Change-Id: Iad1f97cc02ce17c909df72e72c8aa7a0cd393bad
Reviewed-on: http://gerrit.dmdirc.com/3265
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

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

@@ -34,8 +34,6 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
-import com.google.common.eventbus.EventBus;
-
 import javax.inject.Inject;
 
 /**
@@ -47,20 +45,15 @@ public class ContactListCommand extends Command implements IntelligentCommand {
     public static final CommandInfo INFO = new BaseCommandInfo("contactlist",
             "contactlist - show a contact list for the current channel",
             CommandType.TYPE_CHANNEL);
-    /** Event bus to listen to events on. */
-    private final EventBus eventBus;
 
     /**
      * Creates a new instance of this command.
      *
      * @param controller The controller to use for command information.
-     * @param eventBus   Event bus to listen to events on
      */
     @Inject
-    public ContactListCommand(final CommandController controller,
-            final EventBus eventBus) {
+    public ContactListCommand(final CommandController controller) {
         super(controller);
-        this.eventBus = eventBus;
     }
 
     /** {@inheritDoc} */
@@ -69,8 +62,7 @@ public class ContactListCommand extends Command implements IntelligentCommand {
             final CommandArguments args, final CommandContext context) {
         final ChannelCommandContext chanContext = (ChannelCommandContext) context;
 
-        final ContactListListener listener = new ContactListListener(chanContext.getChannel(),
-                eventBus);
+        final ContactListListener listener = new ContactListListener(chanContext.getChannel());
         listener.addListeners();
         listener.clientListUpdated(chanContext.getChannel().getChannelInfo().getChannelClients());
     }

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

@@ -51,14 +51,12 @@ public class ContactListListener implements NicklistListener, FrameCloseListener
     /**
      * Creates a new ContactListListener for the specified channel.
      *
-     * @param channel  The channel to show a contact list for
-     * @param eventBus Event bus to listen to events with
+     * @param channel The channel to show a contact list for
      */
     @Inject
-    public ContactListListener(final Channel channel,
-            final EventBus eventBus) {
+    public ContactListListener(final Channel channel) {
         this.channel = channel;
-        this.eventBus = eventBus;
+        this.eventBus = channel.getEventBus();
     }
 
     /**
@@ -110,16 +108,12 @@ public class ContactListListener implements NicklistListener, FrameCloseListener
 
     @Subscribe
     public void handleUserAway(final ChannelUserAwayEvent event) {
-        if (event.getChannel() == channel) {
-            clientAdded(event.getUser());
-        }
+        clientAdded(event.getUser());
     }
 
     @Subscribe
     public void handleUserBack(final ChannelUserBackEvent event) {
-        if (event.getChannel() == channel) {
-            clientAdded(event.getUser());
-        }
+        clientAdded(event.getUser());
     }
 
     @Override