Merge pull request #707 from csmith/master

Use EventBus interface.

src/main/java/com/dmdirc/ChannelEventHandler.java

@@ -47,6 +47,7 @@ import com.dmdirc.events.ChannelTopicUnsetEvent;
 import com.dmdirc.events.ChannelUserAwayEvent;
 import com.dmdirc.events.ChannelUserBackEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.parser.common.AwayState;
 import com.dmdirc.parser.events.ChannelCTCPEvent;
 import com.dmdirc.parser.events.ChannelListModeEvent;
@@ -76,10 +77,10 @@ public class ChannelEventHandler extends EventHandler {
     /** The channel that owns this event handler. */
     private final Channel owner;
     /** Event bus to send events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final GroupChatUserManager groupChatUserManager;
 
-    public ChannelEventHandler(final Channel owner, final DMDircMBassador eventBus,
+    public ChannelEventHandler(final Channel owner, final EventBus eventBus,
             final GroupChatUserManager groupChatUserManager) {
         this.owner = owner;
         this.eventBus = eventBus;

src/main/java/com/dmdirc/ChannelFactory.java

@@ -27,6 +27,7 @@ import com.dmdirc.commandparser.parsers.ChannelCommandParser;
 import com.dmdirc.events.ChannelOpenedEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.ui.WindowManager;
@@ -44,7 +45,7 @@ public class ChannelFactory {
 
     private final TabCompleterFactory tabCompleterFactory;
     private final CommandController commandController;
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final BackBufferFactory backBufferFactory;
     private final GroupChatUserManager groupChatUserManager;
     private final WindowManager windowManager;
@@ -52,7 +53,7 @@ public class ChannelFactory {
     @Inject
     public ChannelFactory(final TabCompleterFactory tabCompleterFactory,
             final CommandController commandController,
-            final DMDircMBassador eventBus, final BackBufferFactory backBufferFactory,
+            final EventBus eventBus, final BackBufferFactory backBufferFactory,
             final GroupChatUserManager groupChatUserManager, final WindowManager windowManager) {
         this.tabCompleterFactory = tabCompleterFactory;
         this.commandController = commandController;

src/main/java/com/dmdirc/ClientModule.java

@@ -35,6 +35,7 @@ import com.dmdirc.config.profiles.ProfilesModule;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ConnectionFactory;
 import com.dmdirc.interfaces.ConnectionManager;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
@@ -109,7 +110,7 @@ public class ClientModule {
 
     @Provides
     @Singleton
-    public DMDircMBassador getMBassador() {
+    public EventBus getMBassador() {
         return new DMDircMBassador();
     }
 
@@ -137,7 +138,7 @@ public class ClientModule {
     @Provides
     @Singleton
     public ThemeManager getThemeManager(
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final IdentityController controller,
             @Directory(DirectoryType.THEMES) final String directory) {
         final ThemeManager manager = new ThemeManager(controller, directory);

src/main/java/com/dmdirc/CustomWindow.java

@@ -23,6 +23,7 @@
 package com.dmdirc;
 
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.core.components.WindowComponent;
@@ -60,7 +61,7 @@ public class CustomWindow extends FrameContainer {
             final String name,
             final String title,
             final AggregateConfigProvider configProvider,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final BackBufferFactory backBufferFactory) {
         super("custom", name, title, configProvider, backBufferFactory,
                 eventBus, Collections.singletonList(WindowComponent.TEXTAREA.getIdentifier()));

src/main/java/com/dmdirc/FrameContainer.java

@@ -29,6 +29,7 @@ import com.dmdirc.events.FrameIconChangedEvent;
 import com.dmdirc.events.FrameNameChangedEvent;
 import com.dmdirc.events.FrameTitleChangedEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.InputModel;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -65,7 +66,7 @@ public class FrameContainer implements WindowModel {
     /** The UI components that this frame requires. */
     private final Set<String> components;
     /** Event bus to dispatch events to. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** The manager handling this frame's unread status. */
     private final UnreadStatusManager unreadStatusManager;
     /** The back buffer factory. */
@@ -88,7 +89,7 @@ public class FrameContainer implements WindowModel {
             final String title,
             final AggregateConfigProvider config,
             final BackBufferFactory backBufferFactory,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final Collection<String> components) {
         this.configManager = config;
         this.name = name;
@@ -157,7 +158,7 @@ public class FrameContainer implements WindowModel {
     }
 
     @Override
-    public DMDircMBassador getEventBus() {
+    public EventBus getEventBus() {
         return eventBus;
     }
 

src/main/java/com/dmdirc/GlobalWindow.java

@@ -27,6 +27,7 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.ui.WindowManager;
@@ -53,7 +54,7 @@ public class GlobalWindow extends FrameContainer {
     @Inject
     public GlobalWindow(@GlobalConfig final AggregateConfigProvider config,
             final GlobalCommandParser parser, final TabCompleterFactory tabCompleterFactory,
-            final DMDircMBassador eventBus, final BackBufferFactory backBufferFactory) {
+            final EventBus eventBus, final BackBufferFactory backBufferFactory) {
         super("icon", "Global", "(Global)", config, backBufferFactory, eventBus,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
                         WindowComponent.INPUTFIELD.getIdentifier()));

src/main/java/com/dmdirc/Main.java

@@ -30,6 +30,7 @@ import com.dmdirc.events.FeedbackNagEvent;
 import com.dmdirc.events.FirstRunEvent;
 import com.dmdirc.interfaces.CommandController.CommandDetails;
 import com.dmdirc.interfaces.ConnectionManager;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.Migrator;
 import com.dmdirc.interfaces.SystemLifecycleComponent;
 import com.dmdirc.interfaces.config.IdentityController;
@@ -92,7 +93,7 @@ public class Main {
     /** The set of migrators to execute on startup. */
     private final Set<Migrator> migrators;
     /** The event bus to dispatch events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** The commands to load into the command manager. */
     private final Set<CommandDetails> commands;
     /** Mode alias reporter to use. */
@@ -123,7 +124,7 @@ public class Main {
             final GlobalWindowManager globalWindowManager,
             final Set<SystemLifecycleComponent> lifecycleComponents,
             final Set<Migrator> migrators,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final Set<CommandDetails> commands,
             final ModeAliasReporter reporter,
             final ServiceManager serviceManager,

src/main/java/com/dmdirc/ServerEventHandler.java

@@ -52,6 +52,7 @@ import com.dmdirc.events.ServerWallusersEvent;
 import com.dmdirc.events.StatusBarMessageEvent;
 import com.dmdirc.events.UserInfoResponseEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.parser.common.AwayState;
 import com.dmdirc.parser.events.AuthNoticeEvent;
 import com.dmdirc.parser.events.AwayStateEvent;
@@ -113,7 +114,7 @@ public class ServerEventHandler extends EventHandler {
     /** Group chat manager to poke for channel events. */
     private final GroupChatManagerImpl groupChatManager;
     /** Event bus to post events to. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of ServerEventHandler.
@@ -122,7 +123,7 @@ public class ServerEventHandler extends EventHandler {
      * @param eventBus The event bus to post events to
      */
     public ServerEventHandler(final Server owner, final GroupChatManagerImpl groupChatManager,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         this.owner = owner;
         this.groupChatManager = groupChatManager;
         this.eventBus = eventBus;

src/main/java/com/dmdirc/ServerFactoryImpl.java

@@ -26,6 +26,7 @@ import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.ServerCommandParser;
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.interfaces.config.IdentityFactory;
@@ -52,7 +53,7 @@ public class ServerFactoryImpl {
     private final IdentityFactory identityFactory;
     private final Provider<QueryFactory> queryFactory;
     private final Provider<CommandController> commandController;
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final MessageEncoderFactory messageEncoderFactory;
     private final ConfigProvider userSettings;
     private final BackBufferFactory backBufferFactory;
@@ -66,7 +67,7 @@ public class ServerFactoryImpl {
             final IdentityFactory identityFactory,
             final Provider<QueryFactory> queryFactory,
             final Provider<CommandController> commandController,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final MessageEncoderFactory messageEncoderFactory,
             @ClientModule.UserConfig final ConfigProvider userSettings,
             final BackBufferFactory backBufferFactory,

src/main/java/com/dmdirc/ServerManager.java

@@ -27,6 +27,7 @@ import com.dmdirc.config.profiles.ProfileManager;
 import com.dmdirc.events.FrameClosingEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionManager;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.parser.common.ChannelJoinRequest;
@@ -75,7 +76,7 @@ public class ServerManager implements ConnectionManager {
     /** Concrete server factory to use. */
     private final ServerFactoryImpl serverFactoryImpl;
     /** Event bus for servers. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of ServerManager.
@@ -92,7 +93,7 @@ public class ServerManager implements ConnectionManager {
             final IdentityFactory identityFactory,
             final WindowManager windowManager,
             final ServerFactoryImpl serverFactory,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         this.profileManager = profileManager;
         this.identityFactory = identityFactory;
         this.windowManager = windowManager;

src/main/java/com/dmdirc/SystemLifecycleController.java

@@ -25,6 +25,7 @@ package com.dmdirc;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.events.ClientClosedEvent;
 import com.dmdirc.interfaces.ConnectionManager;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.SystemLifecycleComponent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -49,7 +50,7 @@ public class SystemLifecycleController implements LifecycleController {
     /** Manager to use to disconnect servers. */
     private final ConnectionManager connectionManager;
     /** The event bus to raise client closed events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** The identity controller to save when quitting. */
     private final IdentityController identityController;
 
@@ -58,7 +59,7 @@ public class SystemLifecycleController implements LifecycleController {
             @GlobalConfig final AggregateConfigProvider configProvider,
             final Set<SystemLifecycleComponent> lifecycleComponents,
             final ConnectionManager connectionManager,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final IdentityController identityController) {
         this.configProvider = configProvider;
         this.lifecycleComponents = new HashSet<>(lifecycleComponents);

src/main/java/com/dmdirc/commandparser/PopupManager.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.commandparser;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ClientPopupGeneratedEvent;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import javax.inject.Inject;
@@ -37,7 +37,7 @@ public class PopupManager {
     /** The command controller to use for items. */
     private final CommandController commandController;
     /** The bus to dispatch events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of PopupManager.
@@ -46,7 +46,7 @@ public class PopupManager {
      * @param eventBus          The bus to dispatch events on.
      */
     @Inject
-    public PopupManager(final CommandController commandController, final DMDircMBassador eventBus) {
+    public PopupManager(final CommandController commandController, final EventBus eventBus) {
         this.commandController = commandController;
         this.eventBus = eventBus;
     }

src/main/java/com/dmdirc/commandparser/auto/AutoCommandManager.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.commandparser.auto;
 
-import com.dmdirc.DMDircMBassador;
+import com.dmdirc.interfaces.EventBus;
 
 import java.util.Collections;
 import java.util.Map;
@@ -42,7 +42,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 public class AutoCommandManager {
 
     /** The bus to listen for events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** The factory to use to create handlers. */
     private final AutoCommandHandlerFactory factory;
     /** Known auto commands, mapped on to their handlers. */
@@ -58,7 +58,7 @@ public class AutoCommandManager {
      */
     @Inject
     public AutoCommandManager(
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final AutoCommandHandlerFactory factory) {
         this.eventBus = eventBus;
         this.factory = factory;

src/main/java/com/dmdirc/commandparser/commands/global/OpenWindow.java

@@ -24,7 +24,6 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.CustomWindow;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -34,6 +33,7 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.WindowManager;
@@ -58,7 +58,7 @@ public class OpenWindow extends Command implements IntelligentCommand {
     /** Window management. */
     private final WindowManager windowManager;
     /** The bus to dispatch events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** The config provider to retrieve settings from. */
     private final AggregateConfigProvider configProvider;
     /** Back buffer factory. */
@@ -71,7 +71,7 @@ public class OpenWindow extends Command implements IntelligentCommand {
     public OpenWindow(
             final CommandController controller,
             final WindowManager windowManager,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             @GlobalConfig final AggregateConfigProvider configProvider,
             final BackBufferFactory backBufferFactory) {
         super(controller);

src/main/java/com/dmdirc/commandparser/commands/server/JoinChannelCommand.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.commands.server;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -34,6 +33,7 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.events.ClientLineAddedEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.WindowManager;
@@ -82,7 +82,7 @@ public class JoinChannelCommand extends Command implements IntelligentCommand {
     public JoinChannelCommand(
             final CommandController controller,
             final WindowManager windowManager,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         super(controller);
         this.windowManager = windowManager;
         eventBus.subscribe(this);

src/main/java/com/dmdirc/commandparser/parsers/ChannelCommandParser.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.parsers;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -30,6 +29,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.WindowModel;
 
@@ -55,7 +55,7 @@ public class ChannelCommandParser extends ChatCommandParser {
     public ChannelCommandParser(
             final WindowModel owner,
             final CommandController commandController,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final GroupChat groupChat) {
         super(owner, commandController, eventBus, groupChat);
 

src/main/java/com/dmdirc/commandparser/parsers/ChatCommandParser.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.parsers;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -31,6 +30,7 @@ import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.Chat;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;
@@ -57,7 +57,7 @@ public class ChatCommandParser extends ServerCommandParser {
     public ChatCommandParser(
             final WindowModel owner,
             final CommandController commandController,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final Chat chat) {
         super(owner.getConfigManager(), commandController, eventBus, chat.getConnection().get());
         this.owner = chat;

src/main/java/com/dmdirc/commandparser/parsers/CommandParser.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.parsers;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandInfoPair;
@@ -36,6 +35,7 @@ import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.events.UnknownCommandEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.InputModel;
 import com.dmdirc.interfaces.WindowModel;
@@ -68,7 +68,7 @@ public abstract class CommandParser implements Serializable {
     /** Command manager to use. */
     protected final CommandController commandManager;
     /** Event bus to post events to. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of CommandParser.
@@ -80,7 +80,7 @@ public abstract class CommandParser implements Serializable {
     protected CommandParser(
             final ReadOnlyConfigProvider configManager,
             final CommandController commandManager,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         this.eventBus = eventBus;
         commands = new HashMap<>();
         history = new RollingList<>(configManager.getOptionInt("general", "commandhistory"));

src/main/java/com/dmdirc/commandparser/parsers/GlobalCommandParser.java

@@ -23,7 +23,6 @@
 package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.ClientModule;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -31,6 +30,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
@@ -64,7 +64,7 @@ public class GlobalCommandParser extends CommandParser {
     public GlobalCommandParser(
             @ClientModule.GlobalConfig final AggregateConfigProvider configManager,
             final CommandController commandManager,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         super(configManager, commandManager, eventBus);
     }
 

src/main/java/com/dmdirc/commandparser/parsers/QueryCommandParser.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.parsers;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -30,6 +29,7 @@ import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.QueryCommandContext;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.WindowModel;
 
@@ -56,7 +56,7 @@ public class QueryCommandParser extends ChatCommandParser {
      * @param eventBus          Event bus to post events on
      */
     public QueryCommandParser(final WindowModel owner, final CommandController commandController,
-            final DMDircMBassador eventBus, final PrivateChat query) {
+            final EventBus eventBus, final PrivateChat query) {
         super(owner, commandController, eventBus, query);
         this.query = query;
     }

src/main/java/com/dmdirc/commandparser/parsers/ServerCommandParser.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.parsers;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.ServerState;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -33,6 +32,7 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
@@ -63,7 +63,7 @@ public class ServerCommandParser extends GlobalCommandParser {
     public ServerCommandParser(
             final AggregateConfigProvider configManager,
             final CommandController commandController,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final Connection connection) {
         super(configManager, commandController, eventBus);
         this.server = checkNotNull(connection);

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.config.prefs;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ClientPrefsClosedEvent;
 import com.dmdirc.events.ClientPrefsOpenedEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.plugins.Service;
@@ -65,7 +65,7 @@ public class PreferencesDialogModel {
     /** Service manager. */
     private final ServiceManager serviceManager;
     /** Event bus to post events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of PreferencesDialogModel.
@@ -78,7 +78,7 @@ public class PreferencesDialogModel {
             final AggregateConfigProvider configManager,
             final ConfigProvider identity,
             final ServiceManager serviceManager,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         this.pluginPanel = pluginPanel;
         this.themePanel = themePanel;
         this.updatesPanel = updatesPanel;

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.config.prefs;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ConnectionPrefsRequestedEvent;
 import com.dmdirc.events.GroupChatPrefsRequestedEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.util.validators.NumericalValidator;
@@ -40,10 +40,10 @@ import javax.inject.Inject;
 public class PreferencesManager {
 
     /** Event bus to public events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     @Inject
-    public PreferencesManager(final DMDircMBassador eventBus) {
+    public PreferencesManager(final EventBus eventBus) {
         this.eventBus = eventBus;
     }
 

src/main/java/com/dmdirc/config/profiles/ProfileManager.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.config.profiles;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ProfileAddedEvent;
 import com.dmdirc.events.ProfileDeletedEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.util.SystemInfo;
 
 import com.google.common.collect.Iterables;
@@ -45,12 +45,12 @@ import javax.inject.Singleton;
 @Singleton
 public class ProfileManager {
 
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final List<Profile> profiles;
     private final Profile defaultProfile;
 
     @Inject
-    public ProfileManager(final DMDircMBassador eventBus, final SystemInfo systemInfo) {
+    public ProfileManager(final EventBus eventBus, final SystemInfo systemInfo) {
         this.eventBus = eventBus;
         profiles = new ArrayList<>();
         final String nick = systemInfo.getProperty("user.name").replace(' ', '_');

src/main/java/com/dmdirc/interfaces/GroupChat.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.interfaces;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Topic;
 import com.dmdirc.parser.common.ChannelListModeItem;
 
@@ -61,7 +60,7 @@ public interface GroupChat extends Chat {
      *
      * @return An event bus scoped to this channel.
      */
-    DMDircMBassador getEventBus();
+    EventBus getEventBus();
 
     /**
      * Retrieves the maximum length that a topic on this channel can be.

src/main/java/com/dmdirc/interfaces/WindowModel.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.interfaces;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.FrameIconChangedEvent;
 import com.dmdirc.events.FrameNameChangedEvent;
 import com.dmdirc.events.FrameTitleChangedEvent;
@@ -61,7 +60,7 @@ public interface WindowModel {
 
     AggregateConfigProvider getConfigManager();
 
-    DMDircMBassador getEventBus();
+    EventBus getEventBus();
 
     /**
      * Changes the name of this container, and fires a {@link FrameNameChangedEvent}.

src/main/java/com/dmdirc/logger/DiskLoggingErrorManager.java

@@ -22,13 +22,13 @@
 
 package com.dmdirc.logger;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.config.ConfigBinder;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.ErrorEvent;
 import com.dmdirc.events.ProgramErrorEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import com.google.common.collect.Lists;
@@ -52,7 +52,7 @@ import net.engio.mbassy.listener.Handler;
 public class DiskLoggingErrorManager {
 
     /** The event bus to listen for errors on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** The directory to log errors to. */
     private final Path errorsDirectory;
     /** Error creating directory, don't write to disk. */
@@ -63,7 +63,7 @@ public class DiskLoggingErrorManager {
     @Inject
     public DiskLoggingErrorManager(
             @Directory(DirectoryType.ERRORS) final Path errorsDirectory,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         this.errorsDirectory = errorsDirectory;
         this.eventBus = eventBus;
     }

src/main/java/com/dmdirc/logger/ProgramError.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.logger;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ProgramErrorStatusEvent;
+import com.dmdirc.interfaces.EventBus;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Throwables;
@@ -54,7 +54,7 @@ public class ProgramError implements Serializable {
     /** Date/time error first occurred. */
     private final LocalDateTime date;
     /** The eventbus to post status changes to. */
-    private final Optional<DMDircMBassador> eventBus;
+    private final Optional<EventBus> eventBus;
     /** Is this an application error? */
     private final boolean appError;
     /** Error report Status. */
@@ -76,7 +76,7 @@ public class ProgramError implements Serializable {
             @Nonnull final String message,
             @Nullable final Throwable exception,
             @Nonnull final LocalDateTime date,
-            @Nullable final DMDircMBassador eventBus,
+            @Nullable final EventBus eventBus,
             final boolean appError) {
         checkNotNull(level);
         checkNotNull(message);

src/main/java/com/dmdirc/logger/ProgramErrorFactory.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.logger;
 
-import com.dmdirc.DMDircMBassador;
+import com.dmdirc.interfaces.EventBus;
 
 import java.time.LocalDateTime;
 
@@ -34,10 +34,10 @@ import javax.inject.Inject;
  */
 public class ProgramErrorFactory {
 
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     @Inject
-    public ProgramErrorFactory(final DMDircMBassador eventBus) {
+    public ProgramErrorFactory(final EventBus eventBus) {
         this.eventBus = eventBus;
     }
 

src/main/java/com/dmdirc/logger/ProgramErrorManager.java

@@ -22,12 +22,12 @@
 
 package com.dmdirc.logger;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ErrorEvent;
 import com.dmdirc.events.FatalProgramErrorEvent;
 import com.dmdirc.events.NonFatalProgramErrorEvent;
 import com.dmdirc.events.ProgramErrorDeletedEvent;
 import com.dmdirc.events.ProgramErrorEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.util.EventUtils;
 import com.dmdirc.util.LogUtils;
 
@@ -56,14 +56,14 @@ import net.engio.mbassy.listener.Handler;
 public class ProgramErrorManager {
 
     /** The event bus to listen for errors on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** The current list of errors. */
     private final Set<ProgramError> errors;
     /** Factory to create {@link ProgramError}s. */
     private final ProgramErrorFactory programErrorFactory;
 
     @Inject
-    public ProgramErrorManager(final DMDircMBassador eventBus,
+    public ProgramErrorManager(final EventBus eventBus,
             final ProgramErrorFactory programErrorFactory) {
         this.eventBus = eventBus;
         this.programErrorFactory = programErrorFactory;

src/main/java/com/dmdirc/logger/SentryLoggingErrorManager.java

@@ -22,12 +22,12 @@
 
 package com.dmdirc.logger;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.ConfigBinder;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.ProgramErrorAddedEvent;
 import com.dmdirc.events.ProgramErrorEvent;
 import com.dmdirc.events.ProgramErrorStatusEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import com.google.common.base.Throwables;
@@ -56,7 +56,7 @@ public class SentryLoggingErrorManager {
             IllegalAccessError.class, OutOfMemoryError.class,
             NoSuchFieldError.class,};
     /** The event bus to listen for errors on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** Sentry error reporter factory. */
     private final SentryErrorReporter sentryErrorReporter;
     /** Thread used for sending errors. */
@@ -69,7 +69,7 @@ public class SentryLoggingErrorManager {
     private boolean sendReports;
 
     @Inject
-    public SentryLoggingErrorManager(final DMDircMBassador eventBus,
+    public SentryLoggingErrorManager(final EventBus eventBus,
             final SentryErrorReporter sentryErrorReporter,
             @Named("errors") final ExecutorService executorService) {
         this.eventBus = eventBus;

src/main/java/com/dmdirc/plugins/PluginEventFormatManager.java

@@ -23,9 +23,9 @@
 package com.dmdirc.plugins;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.PluginLoadedEvent;
 import com.dmdirc.events.PluginUnloadedEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.SystemLifecycleComponent;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.EventFormatProvider;
@@ -51,14 +51,14 @@ import net.engio.mbassy.listener.Handler;
 @Singleton
 public class PluginEventFormatManager implements SystemLifecycleComponent {
 
-    private final DMDircMBassador eventbus;
+    private final EventBus eventbus;
     private final MultiEventFormatProvider multiEventFormatProvider;
     private final Map<PluginInfo, EventFormatProvider> providers = new HashMap<>();
     private final ColourManager colourManager;
 
     @Inject
     public PluginEventFormatManager(
-            final DMDircMBassador eventbus,
+            final EventBus eventbus,
             final MultiEventFormatProvider multiEventFormatProvider,
             @GlobalConfig final ColourManager colourManager) {
         this.eventbus = eventbus;

src/main/java/com/dmdirc/plugins/PluginInfo.java

@@ -22,11 +22,11 @@
 
 package com.dmdirc.plugins;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.ConfigFileBackedConfigProvider;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.events.PluginLoadedEvent;
 import com.dmdirc.events.PluginUnloadedEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.util.validators.ValidationResponse;
@@ -93,7 +93,7 @@ public class PluginInfo implements ServiceProvider {
     /** List of configuration providers. */
     private final Collection<ConfigProvider> configProviders = new ArrayList<>();
     /** Event bus to post plugin loaded events to. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** File system for the plugin's jar. */
     private final FileSystem pluginFilesystem;
 
@@ -111,7 +111,7 @@ public class PluginInfo implements ServiceProvider {
             final PluginManager pluginManager,
             final ServiceManager serviceManager,
             final PluginMetaData metadata,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final IdentityController identityController,
             final ObjectGraph objectGraph) throws PluginException {
         this.pluginManager = pluginManager;

src/main/java/com/dmdirc/plugins/PluginManager.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.plugins;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.PluginRefreshEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.updater.components.PluginComponent;
 import com.dmdirc.updater.manager.UpdateManager;
@@ -71,7 +71,7 @@ public class PluginManager {
     /** 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 DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** The service manager to use. */
     private final ServiceManager serviceManager;
 
@@ -85,7 +85,7 @@ public class PluginManager {
      * @param directory           The directory to load plugins from.
      */
     public PluginManager(
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final ServiceManager serviceManager,
             final IdentityController identityController,
             final UpdateManager updateManager,

src/main/java/com/dmdirc/plugins/PluginModule.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.plugins;
 
-import com.dmdirc.DMDircMBassador;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.SystemLifecycleComponent;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.updater.manager.UpdateManager;
@@ -46,7 +46,7 @@ public class PluginModule {
     @Provides
     @Singleton
     public PluginManager getPluginManager(
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final IdentityController identityController,
             final UpdateManager updateManager,
             final ObjectGraph objectGraph,

src/main/java/com/dmdirc/tls/CertificateManager.java

@@ -22,10 +22,10 @@
 
 package com.dmdirc.tls;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ServerCertificateProblemEncounteredEvent;
 import com.dmdirc.events.ServerCertificateProblemResolvedEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 
@@ -90,7 +90,7 @@ public class CertificateManager implements X509TrustManager {
     /** Used to synchronise the manager with the certificate dialog. */
     private final Semaphore actionSem = new Semaphore(0);
     /** The event bus to post errors to. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** The action to perform. */
     private CertificateAction action;
     /** A list of problems encountered most recently. */
@@ -115,7 +115,7 @@ public class CertificateManager implements X509TrustManager {
             final String serverName,
             final AggregateConfigProvider config,
             final ConfigProvider userSettings,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         this.connection = connection;
         this.serverName = serverName;
         this.config = config;

src/main/java/com/dmdirc/ui/WindowManager.java

@@ -23,10 +23,10 @@
 package com.dmdirc.ui;
 
 import com.dmdirc.CustomWindow;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Precondition;
 import com.dmdirc.events.FrameClosingEvent;
 import com.dmdirc.events.FrameOpenedEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.ui.FrameListener;
 import com.dmdirc.util.collections.ListenerList;
@@ -69,13 +69,13 @@ public class WindowManager {
     /** Counter to use for ID assignments. */
     private final AtomicLong nextId = new AtomicLong(0L);
     /** Event bus to dispatch window events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of {@link WindowManager}.
      */
     @Inject
-    public WindowManager(final DMDircMBassador eventBus) {
+    public WindowManager(final EventBus eventBus) {
         this.eventBus = eventBus;
         eventBus.subscribe(this);
     }

src/main/java/com/dmdirc/ui/core/about/CoreAboutDialogModel.java

@@ -22,11 +22,11 @@
 
 package com.dmdirc.ui.core.about;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.commandline.CommandLineParser;
 import com.dmdirc.events.ClientInfoRequestEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.ui.AboutDialogModel;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.util.ClientInfo;
@@ -56,7 +56,7 @@ public class CoreAboutDialogModel implements AboutDialogModel {
     private static final Logger LOGGER = LoggerFactory.getLogger(CoreAboutDialogModel.class);
     private final Path baseDirectory;
     private final ClientInfo clientInfo;
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final PluginManager pluginManager;
     private final CommandLineParser commandLineParser;
     private String about;
@@ -67,7 +67,7 @@ public class CoreAboutDialogModel implements AboutDialogModel {
 
     @Inject
     public CoreAboutDialogModel(@Directory(DirectoryType.BASE) final Path baseDirectory,
-            final ClientInfo clientInfo, final DMDircMBassador eventBus,
+            final ClientInfo clientInfo, final EventBus eventBus,
             final PluginManager pluginManager, final CommandLineParser commandLineParser) {
         this.baseDirectory = baseDirectory;
         this.clientInfo = clientInfo;

src/main/java/com/dmdirc/ui/core/errors/CoreErrorsDialogModel.java

@@ -22,10 +22,10 @@
 
 package com.dmdirc.ui.core.errors;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.NonFatalProgramErrorEvent;
 import com.dmdirc.events.ProgramErrorDeletedEvent;
 import com.dmdirc.events.ProgramErrorStatusEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.ui.ErrorsDialogModel;
 import com.dmdirc.interfaces.ui.ErrorsDialogModelListener;
 import com.dmdirc.logger.ErrorManager;
@@ -51,13 +51,13 @@ public class CoreErrorsDialogModel implements ErrorsDialogModel {
 
     private final ListenerList listenerList;
     private final ErrorManager errorManager;
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private Optional<DisplayableError> selectedError;
     private final Set<DisplayableError> errors;
 
     @Inject
     public CoreErrorsDialogModel(final ErrorManager errorManager,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         this.listenerList = new ListenerList();
         this.errorManager = errorManager;
         this.eventBus = eventBus;

src/main/java/com/dmdirc/ui/core/feedback/FeedbackSender.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.ui.core.feedback;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.StatusBarMessageEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.util.io.Downloader;
@@ -39,14 +39,14 @@ import java.util.Map;
 public class FeedbackSender implements Runnable {
 
     private final Map<String, String> postData;
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final AggregateConfigProvider config;
     private final Downloader downloader;
 
     public FeedbackSender(
             final AggregateConfigProvider config,
             final Downloader downloader,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final String name,
             final String email,
             final String feedback,

src/main/java/com/dmdirc/ui/core/feedback/FeedbackSenderFactory.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.ui.core.feedback;
 
-import com.dmdirc.DMDircMBassador;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.io.Downloader;
 
@@ -37,12 +37,12 @@ public class FeedbackSenderFactory {
 
     private final AggregateConfigProvider config;
     private final Downloader downloader;
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     @Inject
     public FeedbackSenderFactory(
             @GlobalConfig final AggregateConfigProvider config,
-            final Downloader downloader, final DMDircMBassador eventBus) {
+            final Downloader downloader, final EventBus eventBus) {
         this.config = config;
         this.downloader = downloader;
         this.eventBus = eventBus;

src/main/java/com/dmdirc/ui/core/newserver/CoreNewServerDialogModel.java

@@ -24,12 +24,12 @@ package com.dmdirc.ui.core.newserver;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.config.profiles.ProfileManager;
 import com.dmdirc.events.ProfileAddedEvent;
 import com.dmdirc.events.ProfileDeletedEvent;
 import com.dmdirc.interfaces.ConnectionManager;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.ui.NewServerDialogModel;
@@ -66,7 +66,7 @@ public class CoreNewServerDialogModel implements NewServerDialogModel {
     private final ConnectionManager connectionManager;
     private final ProfileManager profileManager;
     private final List<Profile> profiles;
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private Optional<Profile> selectedProfile;
     private Optional<String> hostname;
     private Optional<Integer> port;
@@ -80,7 +80,7 @@ public class CoreNewServerDialogModel implements NewServerDialogModel {
             @UserConfig final ConfigProvider userConfig,
             final ProfileManager profileManager,
             final ConnectionManager connectionManager,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         this.globalConfig = globalConfig;
         this.userConfig = userConfig;
         this.profileManager = profileManager;

src/main/java/com/dmdirc/ui/core/util/URLHandler.java

@@ -22,10 +22,10 @@
 
 package com.dmdirc.ui.core.util;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.StatusBarMessageEvent;
 import com.dmdirc.events.UnknownURLEvent;
 import com.dmdirc.interfaces.ConnectionManager;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.util.CommandUtils;
@@ -51,7 +51,7 @@ public class URLHandler {
     /** The time a browser was last launched. */
     private static Date lastLaunch;
     /** Event bus to fire unknown protocol errors on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** Config manager. */
     private final AggregateConfigProvider config;
     /** Server manager to use to connect to servers. */
@@ -68,7 +68,7 @@ public class URLHandler {
      */
     @Inject
     public URLHandler(
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final AggregateConfigProvider globalConfig,
             final ConnectionManager connectionManager) {
         this.eventBus = eventBus;

src/main/java/com/dmdirc/ui/input/InputHandler.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.ui.input;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfoPair;
@@ -32,6 +31,7 @@ import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.events.ClientUserInputEvent;
 import com.dmdirc.events.FrameClosingEvent;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.InputField;
@@ -119,7 +119,7 @@ public abstract class InputHandler implements ConfigChangeListener {
     /** The controller to use to retrieve command information. */
     private final CommandController commandController;
     /** The event bus to use to dispatch input events. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** Executor service. */
     private final ScheduledExecutorService executorService;
 
@@ -140,7 +140,7 @@ public abstract class InputHandler implements ConfigChangeListener {
             final CommandParser commandParser,
             final WindowModel parentWindow,
             final TabCompleterUtils tabCompleterUtils,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         buffer = new RollingList<>(parentWindow.getConfigManager()
                 .getOptionInt("ui", "inputbuffersize"), "");
 

src/main/java/com/dmdirc/ui/messages/BackBuffer.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.events.DisplayableEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.util.EventUtils;
 
@@ -39,7 +39,7 @@ public class BackBuffer {
 
     private final IRCDocument document;
     private final Styliser styliser;
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final EventFormatter formatter;
     private final WindowModel owner;
 

src/main/java/com/dmdirc/ui/messages/UnreadStatusManager.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.BaseChannelTextEvent;
 import com.dmdirc.events.BaseQueryTextEvent;
@@ -31,6 +30,7 @@ import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.events.DisplayableEvent;
 import com.dmdirc.events.QueryHighlightEvent;
 import com.dmdirc.events.UnreadStatusChangedEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.util.colours.Colour;
 
@@ -43,7 +43,7 @@ import net.engio.mbassy.listener.Handler;
  */
 public class UnreadStatusManager {
 
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final WindowModel container;
     private final ColourManager colourManager;
 

src/main/java/com/dmdirc/updater/UpdaterModule.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.updater;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandline.CommandLineParser;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.updater.checking.CheckResultConsolidator;
 import com.dmdirc.updater.checking.DMDircCheckStrategy;
@@ -107,7 +107,7 @@ public class UpdaterModule {
             final CommandLineParser commandLineParser,
             final DMDircUpdateManager updateManager,
             final IdentityController identityController,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         UpdateChecker.init(updateManager, identityController);
 
         commandLineParser.getLauncherVersion().ifPresent(version ->

src/main/java/com/dmdirc/updater/components/ClientComponent.java

@@ -22,11 +22,11 @@
 
 package com.dmdirc.updater.components;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Main;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.events.StatusBarMessageEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.updater.UpdateComponent;
@@ -47,7 +47,7 @@ public class ClientComponent implements UpdateComponent {
     /** The controller to read settings from. */
     private final IdentityController identityController;
     /** The event bus to post messages to. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** Base directory to move updates to. */
     private final Path baseDirectory;
 
@@ -60,7 +60,7 @@ public class ClientComponent implements UpdateComponent {
     @Inject
     public ClientComponent(
             final IdentityController identityController,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             @Directory(DirectoryType.BASE) final Path baseDirectory) {
         this.identityController = identityController;
         this.eventBus = eventBus;

src/test/java/com/dmdirc/InviteManagerImplTest.java

@@ -23,6 +23,7 @@
 package com.dmdirc;
 
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.WindowModel;
 
@@ -40,7 +41,7 @@ public class InviteManagerImplTest {
 
     @Mock private Connection connection;
     @Mock private WindowModel frameContainer;
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private User user;
 
     private InviteManagerImpl inviteManager;

src/test/java/com/dmdirc/ServerManagerTest.java

@@ -24,6 +24,7 @@ package com.dmdirc;
 
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.config.profiles.ProfileManager;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.GroupChatManager;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -66,7 +67,7 @@ public class ServerManagerTest {
     @Mock private Server server;
     @Mock private WindowModel windowModel;
     @Mock private GroupChatManager groupChatManager;
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private Channel channel;
 
     @Captor private ArgumentCaptor<URI> uriCaptor;

src/test/java/com/dmdirc/WritableFrameContainerTest.java

@@ -26,6 +26,7 @@ import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.ConfigBinder;
 import com.dmdirc.harness.TestWritableFrameContainer;
 import com.dmdirc.interfaces.ConnectionManager;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.messages.BackBufferFactory;
 
@@ -47,7 +48,7 @@ public class WritableFrameContainerTest {
     @Mock private AggregateConfigProvider acp;
     @Mock private ConfigBinder configBinder;
     @Mock private ConnectionManager connectionManager;
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private BackBufferFactory backBufferFactory;
     @Mock private Provider<GlobalWindow> globalWindowProvider;
     private CommandManager commands;

src/test/java/com/dmdirc/commandparser/aliases/AliasCommandHandlerTest.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.commandparser.aliases;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
@@ -30,6 +29,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.InputModel;
 import com.dmdirc.interfaces.WindowModel;
 
@@ -56,7 +56,7 @@ public class AliasCommandHandlerTest {
     @Mock private CommandParser commandParser;
     @Mock private CommandContext context;
     @Mock private CommandInfo commandInfo;
-    @Mock private DMDircMBassador eventbus;
+    @Mock private EventBus eventbus;
     @Captor private ArgumentCaptor<CommandErrorEvent> errorEventCaptor;
 
     @Before

src/test/java/com/dmdirc/commandparser/auto/AutoCommandManagerTest.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.commandparser.auto;
 
-import com.dmdirc.DMDircMBassador;
+import com.dmdirc.interfaces.EventBus;
 
 import java.util.Optional;
 
@@ -43,7 +43,7 @@ import static org.mockito.Mockito.when;
 @RunWith(MockitoJUnitRunner.class)
 public class AutoCommandManagerTest {
 
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private AutoCommandHandlerFactory factory;
     @Mock private AutoCommandHandler globalHandler;
     @Mock private AutoCommandHandler ircquakenetHandler;

src/test/java/com/dmdirc/commandparser/commands/channel/BanTest.java

@@ -23,12 +23,12 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.WindowModel;
@@ -55,7 +55,7 @@ public class BanTest {
     @Mock private Channel channel;
     @Mock private CommandController controller;
     @Mock private WindowModel container;
-    @Mock private DMDircMBassador eventbus;
+    @Mock private EventBus eventbus;
     private Ban command;
 
     @Before

src/test/java/com/dmdirc/commandparser/commands/channel/KickReasonTest.java

@@ -23,12 +23,12 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.WindowModel;
@@ -60,7 +60,7 @@ public class KickReasonTest {
     @Mock private Channel channel;
     @Mock private CommandController controller;
     @Mock private WindowModel container;
-    @Mock private DMDircMBassador eventbus;
+    @Mock private EventBus eventbus;
     @Mock private ChannelInfo channelInfo;
     @Mock private AggregateConfigProvider configProvider;
     @Captor private ArgumentCaptor<CommandErrorEvent> errorEventCaptor;

src/test/java/com/dmdirc/commandparser/commands/channel/ModeTest.java

@@ -23,13 +23,13 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.events.ChannelModesDiscoveredEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.parser.interfaces.Parser;
 
@@ -51,7 +51,7 @@ import static org.mockito.Mockito.when;
 public class ModeTest {
 
     @Mock private WindowModel origin;
-    @Mock private DMDircMBassador eventbus;
+    @Mock private EventBus eventbus;
     @Mock private CommandController controller;
     @Mock private Channel channel;
     @Mock private Connection connection;

src/test/java/com/dmdirc/commandparser/commands/channel/SetNickColourTest.java

@@ -22,13 +22,13 @@
 package com.dmdirc.commandparser.commands.channel;
 
 import com.dmdirc.Channel;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.WindowModel;
@@ -66,7 +66,7 @@ public class SetNickColourTest {
     @Mock private ColourManager colourManager;
     @Mock private CommandController controller;
     @Mock private WindowModel tiw;
-    @Mock private DMDircMBassador eventbus;
+    @Mock private EventBus eventbus;
     @Captor private ArgumentCaptor<CommandErrorEvent> errorEventCaptor;
     private SetNickColour command;
 

src/test/java/com/dmdirc/commandparser/commands/chat/MeTest.java

@@ -21,12 +21,12 @@
  */
 package com.dmdirc.commandparser.commands.chat;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.Chat;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 
 import org.junit.Before;
@@ -44,7 +44,7 @@ public class MeTest {
 
     @Mock private Chat chat;
     @Mock private WindowModel frameContainer;
-    @Mock private DMDircMBassador eventbus;
+    @Mock private EventBus eventbus;
     @Mock private CommandController controller;
     private Me command;
 

src/test/java/com/dmdirc/commandparser/commands/flags/CommandFlagHandlerTest.java

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.flags;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Arrays;
@@ -73,7 +74,7 @@ public class CommandFlagHandlerTest {
     @Test
     public void testParse() {
         final WindowModel container = mock(WindowModel.class);
-        final DMDircMBassador eventBus = mock(DMDircMBassador.class);
+        final EventBus eventBus = mock(DMDircMBassador.class);
         final CommandController controller = mock(CommandController.class);
         when(controller.getCommandChar()).thenReturn('/');
         when(controller.getSilenceChar()).thenReturn('.');

src/test/java/com/dmdirc/commandparser/commands/global/AliasCommandTest.java

@@ -21,13 +21,13 @@
  */
 package com.dmdirc.commandparser.commands.global;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.aliases.AliasFactory;
 import com.dmdirc.commandparser.aliases.AliasManager;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.TabCompleterUtils;
 
@@ -49,7 +49,7 @@ public class AliasCommandTest {
     @Mock private CommandController controller;
     @Mock private TabCompleterUtils tabCompleterUtils;
     @Mock private WindowModel tiw;
-    @Mock private DMDircMBassador eventbus;
+    @Mock private EventBus eventbus;
     private AliasCommand command;
 
     @Before

src/test/java/com/dmdirc/commandparser/commands/global/IfpluginTest.java

@@ -21,13 +21,13 @@
  */
 package com.dmdirc.commandparser.commands.global;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.GlobalWindow;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.TabCompleterUtils;
@@ -53,7 +53,7 @@ public class IfpluginTest {
     @Mock private CommandController controller;
     @Mock private PluginManager pluginManager;
     @Mock private WindowModel tiw;
-    @Mock private DMDircMBassador eventbus;
+    @Mock private EventBus eventbus;
     private Ifplugin command;
 
     @Before

src/test/java/com/dmdirc/commandparser/commands/global/NewServerTest.java

@@ -21,7 +21,6 @@
  */
 package com.dmdirc.commandparser.commands.global;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.config.profiles.Profile;
@@ -30,6 +29,7 @@ import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionFactory;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.util.URIParser;
@@ -45,8 +45,6 @@ import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyChar;
-import static org.mockito.Matchers.anyString;
 import static org.mockito.Matchers.eq;
 import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.verify;
@@ -55,7 +53,7 @@ import static org.mockito.Mockito.when;
 @RunWith(MockitoJUnitRunner.class)
 public class NewServerTest {
 
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private CommandController controller;
     @Mock private ProfileManager profileManager;
     @Mock private Profile identity;

src/test/java/com/dmdirc/commandparser/commands/server/ChangeServerTest.java

@@ -21,13 +21,13 @@
  */
 package com.dmdirc.commandparser.commands.server;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.util.URIParser;
@@ -50,7 +50,7 @@ import static org.mockito.Mockito.when;
 @RunWith(MockitoJUnitRunner.class)
 public class ChangeServerTest {
 
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private ErrorManager errorManager;
     @Mock private CommandController controller;
     @Mock private WindowModel tiw;

src/test/java/com/dmdirc/commandparser/parsers/CommandParserTest.java

@@ -23,12 +23,12 @@
 package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.Channel;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.harness.TestCommandParser;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.GroupChatManager;
 import com.dmdirc.interfaces.InputModel;
 import com.dmdirc.interfaces.WindowModel;
@@ -63,7 +63,7 @@ public class CommandParserTest {
     @Mock private Channel channel;
     @Mock private Connection connection;
     @Mock private GroupChatManager groupChatManager;
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     private TestCommandParser commandParser;
     private TestCommandParser channelCommandParser;
 

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.config.prefs;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ClientPrefsClosedEvent;
 import com.dmdirc.events.ClientPrefsOpenedEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.Service;
 import com.dmdirc.plugins.ServiceManager;
@@ -50,7 +50,7 @@ import static org.mockito.Mockito.when;
 @RunWith(MockitoJUnitRunner.class)
 public class PreferencesDialogModelTest {
 
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private ServiceManager serviceManager;
 
     @Before

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

@@ -22,9 +22,9 @@
 
 package com.dmdirc.config.prefs;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ConnectionPrefsRequestedEvent;
 import com.dmdirc.events.GroupChatPrefsRequestedEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import org.junit.Test;
@@ -38,7 +38,7 @@ import static org.mockito.Mockito.verify;
 @RunWith(MockitoJUnitRunner.class)
 public class PreferencesManagerTest {
 
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private AggregateConfigProvider configManager;
 
     @Test

src/test/java/com/dmdirc/config/profiles/ProfileManagerTest.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.config.profiles;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ProfileAddedEvent;
 import com.dmdirc.events.ProfileDeletedEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.util.SystemInfo;
 
 import com.google.common.collect.Lists;
@@ -48,7 +48,7 @@ import static org.mockito.Mockito.when;
 @RunWith(MockitoJUnitRunner.class)
 public class ProfileManagerTest {
 
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private Profile profile1;
     @Mock private Profile profile2;
     @Mock private SystemInfo systemInfo;

src/test/java/com/dmdirc/harness/TestCommandParser.java

@@ -22,13 +22,13 @@
 
 package com.dmdirc.harness;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
@@ -49,7 +49,7 @@ public class TestCommandParser extends CommandParser {
     public String invalidCommand;
 
     public TestCommandParser(final AggregateConfigProvider configManager,
-            final CommandController commandManager, final DMDircMBassador eventBus) {
+            final CommandController commandManager, final EventBus eventBus) {
         super(configManager, commandManager, eventBus);
     }
 

src/test/java/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -22,12 +22,12 @@
 
 package com.dmdirc.harness;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.DefaultInputModel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.messages.BackBufferFactory;
@@ -39,7 +39,7 @@ public class TestWritableFrameContainer extends FrameContainer {
 
     public TestWritableFrameContainer(final int lineLength,
             final AggregateConfigProvider cm, final CommandManager commandManager,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final BackBufferFactory backBufferFactory) {
         super("raw", "Raw", "(Raw)", cm, backBufferFactory,
                 eventBus,

src/test/java/com/dmdirc/logger/DiskLoggingErrorManagerTest.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.logger;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.ConfigBinder;
 import com.dmdirc.events.ProgramErrorEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.tests.JimFsRule;
 
@@ -50,7 +50,7 @@ public class DiskLoggingErrorManagerTest {
 
     @Rule public final JimFsRule jimFsRule = new JimFsRule();
 
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private AggregateConfigProvider config;
     @Mock private ConfigBinder configBinder;
     @Mock private ProgramErrorEvent error;

src/test/java/com/dmdirc/logger/ProgramErrorTest.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.logger;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ProgramErrorStatusEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.util.ClientInfo;
 
 import java.time.LocalDateTime;
@@ -45,7 +45,7 @@ import static org.mockito.Mockito.verify;
 public class ProgramErrorTest {
 
     @Mock private ErrorManager errorManager;
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private ClientInfo clientInfo;
     @Captor private ArgumentCaptor<ProgramErrorStatusEvent> event;
 

src/test/java/com/dmdirc/logger/SentryLoggingErrorManagerTest.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.logger;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.ConfigBinder;
 import com.dmdirc.events.ProgramErrorAddedEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import com.google.common.util.concurrent.MoreExecutors;
@@ -48,7 +48,7 @@ import static org.mockito.Mockito.when;
 @RunWith(MockitoJUnitRunner.class)
 public class SentryLoggingErrorManagerTest {
 
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private AggregateConfigProvider config;
     @Mock private ConfigBinder configBinder;
     @Mock private SentryErrorReporter sentryErrorReporter;

src/test/java/com/dmdirc/ui/WindowManagerTest.java

@@ -22,7 +22,7 @@
 package com.dmdirc.ui;
 
 import com.dmdirc.CustomWindow;
-import com.dmdirc.DMDircMBassador;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.ui.FrameListener;
 
@@ -59,7 +59,7 @@ public class WindowManagerTest {
     @Mock private WindowModel container;
     @Mock private WindowModel child;
     @Mock private WindowModel grandchild;
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Captor private ArgumentCaptor<String> idCaptor;
     private WindowManager manager;
 

src/test/java/com/dmdirc/ui/core/about/CoreAboutDialogModelTest.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.ui.core.about;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandline.CommandLineParser;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.PluginMetaData;
@@ -52,7 +52,7 @@ public class CoreAboutDialogModelTest {
 
     @Mock private ClientInfo clientInfo;
     @Mock private Path path;
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private PluginManager pluginManager;
     @Mock private PluginMetaData pluginMetaData1;
     @Mock private PluginMetaData pluginMetaData2;

src/test/java/com/dmdirc/ui/core/feedback/FeedbackSenderTest.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.ui.core.feedback;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.StatusBarMessageEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.io.Downloader;
 
@@ -60,7 +60,7 @@ public class FeedbackSenderTest {
 
     @Mock private AggregateConfigProvider config;
     @Mock private Downloader downloader;
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Captor private ArgumentCaptor<StatusBarMessageEvent> messageEvent;
 
     private FeedbackSender feedbackSender;

src/test/java/com/dmdirc/ui/core/newserver/CoreNewServerDialogModelTest.java

@@ -22,12 +22,12 @@
 
 package com.dmdirc.ui.core.newserver;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.config.profiles.ProfileManager;
 import com.dmdirc.events.ProfileAddedEvent;
 import com.dmdirc.events.ProfileDeletedEvent;
 import com.dmdirc.interfaces.ConnectionManager;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.ui.NewServerDialogModelListener;
@@ -59,7 +59,7 @@ public class CoreNewServerDialogModelTest {
     @Mock private ConfigProvider userConfig;
     @Mock private ProfileManager profileManager;
     @Mock private ConnectionManager connectionManager;
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private Profile profile1;
     @Mock private Profile profile2;
     @Mock private NewServerDialogModelListener listener;

src/test/java/com/dmdirc/ui/messages/ColourManagerTest.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.DMDircMBassador;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorManager;
@@ -52,7 +52,7 @@ public class ColourManagerTest {
     @Mock private ErrorManager errorManager;
     @Mock private AggregateConfigProvider configManager;
     @Captor private ArgumentCaptor<ConfigChangeListener> configListener;
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     private ColourManager manager;
 
     @Before

src/test/java/com/dmdirc/ui/messages/EventPropertyManagerTest.java

@@ -23,8 +23,8 @@
 package com.dmdirc.ui.messages;
 
 import com.dmdirc.Channel;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ChannelMessageEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.GroupChatUser;
 
 import org.junit.Before;
@@ -42,7 +42,7 @@ public class EventPropertyManagerTest {
 
     private EventPropertyManager manager;
 
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private Channel channel;
     @Mock private GroupChatUser client;
 

src/test/java/com/dmdirc/ui/messages/HighlightManagerTest.java

@@ -23,13 +23,13 @@
 package com.dmdirc.ui.messages;
 
 import com.dmdirc.Channel;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.events.ChannelHighlightEvent;
 import com.dmdirc.events.ChannelMessageEvent;
 import com.dmdirc.events.ServerConnectedEvent;
 import com.dmdirc.events.ServerNickChangeEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.WindowModel;
@@ -63,7 +63,7 @@ public class HighlightManagerTest {
 
     @Mock private Channel channel;
     @Mock private GroupChatUser channelUser;
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
 
     private HighlightManager manager;
 

src/test/java/com/dmdirc/ui/messages/IntelligentLinkingTest.java

@@ -21,8 +21,8 @@
  */
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.GroupChatManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
@@ -41,7 +41,7 @@ import static org.mockito.Mockito.when;
 @RunWith(Parameterized.class)
 public class IntelligentLinkingTest {
 
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     private final String input, expected;
     private final Styliser styliser;
 

src/test/java/com/dmdirc/ui/messages/StyliserStylesTest.java

@@ -23,6 +23,7 @@
 package com.dmdirc.ui.messages;
 
 import com.dmdirc.DMDircMBassador;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import java.awt.Color;
@@ -47,7 +48,7 @@ import static org.mockito.Mockito.mock;
 @Ignore("Doesn't work in a headless environment (initialises an IRCDocument)")
 public class StyliserStylesTest {
 
-    private DMDircMBassador eventBus;
+    private EventBus eventBus;
     protected String input, output;
 
     public StyliserStylesTest(final String input, final String output) {
@@ -61,7 +62,7 @@ public class StyliserStylesTest {
         assertEquals(output, style(input, eventBus));
     }
 
-    protected static String style(final String input, final DMDircMBassador eventBus)
+    protected static String style(final String input, final EventBus eventBus)
             throws BadLocationException{
         final DefaultStyledDocument doc = new DefaultStyledDocument();
         final StringBuilder builder = new StringBuilder();

src/test/java/com/dmdirc/ui/messages/StyliserTest.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.ui.messages;
 
-import com.dmdirc.DMDircMBassador;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import org.junit.Ignore;
@@ -37,7 +37,7 @@ import static org.mockito.Mockito.mock;
 @RunWith(MockitoJUnitRunner.class)
 public class StyliserTest {
 
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
 
     @Test
     public void testStripControlCodes1() {

src/test/java/com/dmdirc/util/URLBuilderTest.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.util;
 
-import com.dmdirc.DMDircMBassador;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.PluginMetaData;
@@ -56,7 +56,7 @@ public class URLBuilderTest {
     @Mock private ThemeManager themeManager;
     @Mock private PluginInfo pluginInfo;
     @Mock private PluginMetaData pluginMetaData;
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
 
     @Before
     public void setup() throws MalformedURLException {