Use EventBus interface.

This is just an IntelliJ refactor, using EventBus in place of
DMDircMBassador whenever possible.

awaycolours/src/main/java/com/dmdirc/addons/awaycolours/AwayColoursManager.java

@@ -23,12 +23,12 @@
 package com.dmdirc.addons.awaycolours;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.ConfigBinder;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.ChannelUserAwayEvent;
 import com.dmdirc.events.ChannelUserBackEvent;
 import com.dmdirc.events.DisplayProperty;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.messages.ColourManager;
@@ -43,13 +43,13 @@ import net.engio.mbassy.listener.Handler;
  */
 public class AwayColoursManager {
 
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final ConfigBinder binder;
     private final ColourManager colourManager;
     private Colour colour = Colour.BLACK;
 
     @Inject
-    public AwayColoursManager(final DMDircMBassador eventBus,
+    public AwayColoursManager(final EventBus eventBus,
             @GlobalConfig final AggregateConfigProvider config,
             @PluginDomain(AwayColoursPlugin.class) final String domain,
             @GlobalConfig final ColourManager colourManager) {

awaycolours/src/test/java/com/dmdirc/addons/awaycolours/AwayColoursManagerTest.java

@@ -23,11 +23,11 @@
 package com.dmdirc.addons.awaycolours;
 
 import com.dmdirc.Channel;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.ConfigBinder;
 import com.dmdirc.events.ChannelUserAwayEvent;
 import com.dmdirc.events.ChannelUserBackEvent;
 import com.dmdirc.events.DisplayProperty;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.messages.ColourManager;
@@ -46,7 +46,7 @@ import static org.mockito.Mockito.when;
 @RunWith(MockitoJUnitRunner.class)
 public class AwayColoursManagerTest {
 
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private AggregateConfigProvider config;
     @Mock private ConfigBinder binder;
     @Mock private ChannelUserAwayEvent awayEvent;

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.channelwho;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
@@ -32,6 +31,7 @@ import com.dmdirc.events.ServerConnectingEvent;
 import com.dmdirc.events.ServerDisconnectedEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionManager;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.util.validators.NumericalValidator;
 
@@ -52,7 +52,7 @@ public class ChannelWhoManager {
     private final String domain;
     private final ConnectionHandlerFactory connectionHandlerFactory;
     private final ConnectionManager connectionManager;
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final Map<Connection, ConnectionHandler> connectionHandlers;
 
     @Inject
@@ -60,7 +60,7 @@ public class ChannelWhoManager {
             @PluginDomain(ChannelWhoPlugin.class) final String domain,
             final ConnectionHandlerFactory connectionHandlerFactory,
             final ConnectionManager connectionManager,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         this.domain = domain;
         this.connectionHandlerFactory = connectionHandlerFactory;
         this.connectionManager = connectionManager;

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.EventBus;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -51,7 +51,7 @@ import net.engio.mbassy.listener.Handler;
 public class ConnectionHandler {
 
     private final Multimap<String, GroupChatUser> users;
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final Connection connection;
     private final String domain;
     private final ScheduledExecutorService executorService;
@@ -61,7 +61,7 @@ public class ConnectionHandler {
     public ConnectionHandler(
             final AggregateConfigProvider config,
             final ScheduledExecutorService executorService,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final String domain,
             final Connection connection) {
         this.eventBus = eventBus;

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.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 
@@ -40,13 +40,13 @@ public class ConnectionHandlerFactory {
 
     private final AggregateConfigProvider config;
     private final ScheduledExecutorService executorService;
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final String domain;
 
     @Inject
     public ConnectionHandlerFactory(@GlobalConfig final AggregateConfigProvider config,
             @Named("channelwho") final ScheduledExecutorService executorService,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             @PluginDomain(ChannelWhoPlugin.class) final String domain) {
         this.config = config;
         this.executorService = executorService;

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

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.channelwho;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ServerConnectingEvent;
 import com.dmdirc.events.ServerDisconnectedEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionManager;
+import com.dmdirc.interfaces.EventBus;
 
 import com.google.common.collect.Lists;
 
@@ -50,7 +50,7 @@ public class ChannelWhoManagerTest {
     @Mock private ConnectionManager connectionManager;
     @Mock private Connection connection;
     @Mock private Connection connection2;
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
 
     private ChannelWhoManager instance;
 

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

@@ -22,13 +22,13 @@
 
 package com.dmdirc.addons.channelwho;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.ConfigBinder;
 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.EventBus;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatManager;
 import com.dmdirc.interfaces.GroupChatUser;
@@ -66,7 +66,7 @@ public class ConnectionHandlerTest {
     @Mock private AggregateConfigProvider config;
     @Mock private ConfigBinder configBinder;
     @Mock private WindowModel windowModel;
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private ScheduledExecutorService scheduledExecutorService;
     @Mock private ScheduledFuture<?> scheduledFuture;
     @Mock private ConnectionManager connectionManager;

conditional_execute/src/test/java/com/dmdirc/addons/conditional_execute/ConditionalExecuteCommandTest.java

@@ -22,12 +22,12 @@
 
 package com.dmdirc.addons.conditional_execute;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 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;
 
@@ -57,7 +57,7 @@ public class ConditionalExecuteCommandTest {
     @Mock private WindowModel container;
     @Mock private InputModel inputModel;
     @Mock private CommandContext context;
-    @Mock private DMDircMBassador eventbus;
+    @Mock private EventBus eventbus;
     @Captor private ArgumentCaptor<CommandErrorEvent> errorEventCaptor;
     private ConditionalExecuteCommand command;
 

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.contactlist;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -32,6 +31,7 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 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.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
@@ -48,7 +48,7 @@ public class ContactListCommand extends Command implements IntelligentCommand {
             "contactlist - show a contact list for the current channel",
             CommandType.TYPE_CHANNEL);
 
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of this command.
@@ -58,7 +58,7 @@ public class ContactListCommand extends Command implements IntelligentCommand {
     @Inject
     public ContactListCommand(
             final CommandController controller,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         super(controller);
         this.eventBus = eventBus;
     }

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

@@ -22,12 +22,12 @@
 
 package com.dmdirc.addons.contactlist;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ChannelUserAwayEvent;
 import com.dmdirc.events.ChannelUserBackEvent;
 import com.dmdirc.events.FrameClosingEvent;
 import com.dmdirc.events.NickListClientAddedEvent;
 import com.dmdirc.events.NickListClientsChangedEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.PrivateChat;
@@ -42,14 +42,14 @@ public class ContactListListener {
     /** The group chat this listener is for. */
     private final GroupChat groupChat;
     /** Event bus to register listeners with. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     /**
      * Creates a new ContactListListener for the specified group chat.
      *
      * @param groupChat The group chat to show a contact list for
      */
-    public ContactListListener(final GroupChat groupChat, final DMDircMBassador eventBus) {
+    public ContactListListener(final GroupChat groupChat, final EventBus eventBus) {
         this.groupChat = groupChat;
         this.eventBus = eventBus;
     }

dcc/src/main/java/com/dmdirc/addons/dcc/ChatContainer.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.dcc;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.DefaultInputModel;
 import com.dmdirc.addons.dcc.events.DccChatMessageEvent;
 import com.dmdirc.addons.dcc.events.DccChatSelfMessageEvent;
@@ -31,6 +30,7 @@ import com.dmdirc.addons.dcc.events.DccChatSocketOpenedEvent;
 import com.dmdirc.addons.dcc.io.DCCChat;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
@@ -50,7 +50,7 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
     /** Other Nickname. */
     private final String otherNickname;
     /** Event bus to post events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of DCCChatWindow with a given DCCChat object.
@@ -73,7 +73,7 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
             final String nick,
             final String targetNick,
             final TabCompleterFactory tabCompleterFactory,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         super(title, "dcc-chat-inactive", configManager, backBufferFactory,
                 eventBus,
                 Arrays.asList(

dcc/src/main/java/com/dmdirc/addons/dcc/DCCCommand.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.dcc;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.dcc.events.DccChatRequestSentEvent;
 import com.dmdirc.addons.dcc.events.DccChatStartingEvent;
 import com.dmdirc.addons.dcc.events.DccSendRequestEvent;
@@ -42,6 +41,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.parser.interfaces.Parser;
@@ -77,7 +77,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
     /** The factory to use for tab completers. */
     private final TabCompleterFactory tabCompleterFactory;
     /** The bus to dispatch events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final BackBufferFactory backBufferFactory;
 
     /**
@@ -90,7 +90,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
             final DCCManager plugin,
             final WindowManager windowManager,
             final TabCompleterFactory tabCompleterFactory,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final BackBufferFactory backBufferFactory) {
         super(controller);
         this.mainWindow = mainWindow;

dcc/src/main/java/com/dmdirc/addons/dcc/DCCCommandParser.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.dcc;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
@@ -46,7 +46,7 @@ public class DCCCommandParser extends GlobalCommandParser {
     public DCCCommandParser(
             final AggregateConfigProvider configManager,
             final CommandController commandController,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         super(configManager, commandController, eventBus);
     }
 

dcc/src/main/java/com/dmdirc/addons/dcc/DCCFrameContainer.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.dcc;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.messages.BackBufferFactory;
 
@@ -53,7 +53,7 @@ public abstract class DCCFrameContainer extends FrameContainer {
             final String icon,
             final AggregateConfigProvider configManager,
             final BackBufferFactory backBufferFactory,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final Collection<String> components) {
         super(icon, title, title, configManager, backBufferFactory,
                 eventBus,

dcc/src/main/java/com/dmdirc/addons/dcc/DCCManager.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.dcc;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.dcc.events.DccChatRequestEvent;
 import com.dmdirc.addons.dcc.events.DccChatStartingEvent;
 import com.dmdirc.addons.dcc.events.DccSendRequestEvent;
@@ -51,6 +50,7 @@ import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.ServerCtcpEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -111,7 +111,7 @@ public class DCCManager {
     /** The configuration domain to use. */
     private final String domain;
     /** The bus to dispatch events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** Plugin info. */
     private final PluginInfo pluginInfo;
 
@@ -129,7 +129,7 @@ public class DCCManager {
             final TabCompleterFactory tabCompleterFactory,
             final SwingWindowFactory windowFactory,
             final ComponentFrameFactory componentFrameFactory,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final GlobalCommandParser commandParser,
             @Directory(DirectoryType.BASE) final String baseDirectory,
             final BackBufferFactory backBufferFactory) {

dcc/src/main/java/com/dmdirc/addons/dcc/PlaceholderContainer.java

@@ -22,10 +22,10 @@
 
 package com.dmdirc.addons.dcc;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 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;
@@ -61,7 +61,7 @@ public class PlaceholderContainer extends FrameContainer {
             final BackBufferFactory backBufferFactory,
             final Window parentWindow,
             final WindowManager windowManager,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         super("dcc", "DCCs", "DCCs", config, backBufferFactory, eventBus,
                 Collections.singletonList("com.dmdirc.addons.dcc.ui.PlaceholderPanel"));
         this.plugin = plugin;

dcc/src/main/java/com/dmdirc/addons/dcc/TransferContainer.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.dcc;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.dcc.events.DccSendDatatransferedEvent;
@@ -31,6 +30,7 @@ import com.dmdirc.addons.dcc.events.DccSendSocketopenedEvent;
 import com.dmdirc.addons.dcc.io.DCC;
 import com.dmdirc.addons.dcc.io.DCCTransfer;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.parser.events.SocketCloseEvent;
 import com.dmdirc.parser.interfaces.Parser;
@@ -78,7 +78,7 @@ public class TransferContainer extends FrameContainer implements
     private final boolean showOpen = Desktop.isDesktopSupported()
             && Desktop.getDesktop().isSupported(Desktop.Action.OPEN);
     /** Event bus to post events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of DCCTransferWindow with a given DCCTransfer object.
@@ -87,7 +87,7 @@ public class TransferContainer extends FrameContainer implements
             final AggregateConfigProvider config,
             final BackBufferFactory backBufferFactory, final String title,
             final String targetNick, @Nullable final Connection connection,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         super(dcc.getType() == DCCTransfer.TransferType.SEND
                 ? "dcc-send-inactive" : "dcc-receive-inactive",
                 title, title, config, backBufferFactory, eventBus,

dcc/src/main/java/com/dmdirc/addons/dcc/ui/TransferPanel.java

@@ -22,13 +22,13 @@
 
 package com.dmdirc.addons.dcc.ui;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.dcc.DCCTransferHandler;
 import com.dmdirc.addons.dcc.TransferContainer;
 import com.dmdirc.addons.dcc.io.DCCTransfer;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.SwingFrameComponent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.parser.events.SocketCloseEvent;
 import com.dmdirc.parser.interfaces.Parser;
@@ -84,7 +84,7 @@ public class TransferPanel extends JPanel implements ActionListener,
     /** The transfer that this window is showing. */
     private final DCCTransfer dcc;
     /** The event bus to post errors. */
-    private final DMDircMBassador errorBus;
+    private final EventBus errorBus;
 
     /**
      * Creates a new transfer window for the specified UI controller and owner.
@@ -92,7 +92,7 @@ public class TransferPanel extends JPanel implements ActionListener,
      * @param owner    The frame container that owns this frame
      * @param errorBus The event bus to post errors to
      */
-    public TransferPanel(final WindowModel owner, final DMDircMBassador errorBus) {
+    public TransferPanel(final WindowModel owner, final EventBus errorBus) {
         this.transferContainer = (TransferContainer) owner;
         this.errorBus = errorBus;
         dcc = transferContainer.getDCC();

debug/src/main/java/com/dmdirc/addons/debug/commands/EventBusViewer.java

@@ -24,7 +24,6 @@ package com.dmdirc.addons.debug.commands;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.CustomWindow;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
@@ -34,6 +33,7 @@ import com.dmdirc.events.CommandOutputEvent;
 import com.dmdirc.events.DMDircEvent;
 import com.dmdirc.events.DisplayableEvent;
 import com.dmdirc.events.FrameClosingEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.WindowManager;
@@ -57,7 +57,7 @@ public class EventBusViewer extends DebugCommand {
 
     private final AggregateConfigProvider globalConfig;
     private final WindowManager windowManager;
-    private final DMDircMBassador globalEventBus;
+    private final EventBus globalEventBus;
     private final BackBufferFactory backBufferFactory;
 
     /**
@@ -68,7 +68,7 @@ public class EventBusViewer extends DebugCommand {
             final Provider<Debug> commandProvider,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final WindowManager windowManager,
-            final DMDircMBassador globalEventBus,
+            final EventBus globalEventBus,
             final BackBufferFactory backBufferFactory) {
         super(commandProvider);
         this.globalConfig = globalConfig;
@@ -103,7 +103,7 @@ public class EventBusViewer extends DebugCommand {
             windowManager.addWindow(origin, window);
         }
 
-        final DMDircMBassador eventBus = isGlobal ? globalEventBus : origin.getEventBus();
+        final EventBus eventBus = isGlobal ? globalEventBus : origin.getEventBus();
         final WindowUpdater updater = new WindowUpdater(eventBus, window);
         eventBus.subscribe(updater);
     }
@@ -114,10 +114,10 @@ public class EventBusViewer extends DebugCommand {
     @Listener(references = References.Strong)
     private static class WindowUpdater {
 
-        private final DMDircMBassador eventBus;
+        private final EventBus eventBus;
         private final WindowModel target;
 
-        WindowUpdater(final DMDircMBassador eventBus, final WindowModel target) {
+        WindowUpdater(final EventBus eventBus, final WindowModel target) {
             this.eventBus = eventBus;
             this.target = target;
         }

debug/src/main/java/com/dmdirc/addons/debug/commands/FirstRun.java

@@ -22,12 +22,12 @@
 
 package com.dmdirc.addons.debug.commands;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.events.FirstRunEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;
@@ -40,7 +40,7 @@ import javax.inject.Provider;
 public class FirstRun extends DebugCommand {
 
     /** Event bus to trigger first run event on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of the command.
@@ -49,7 +49,7 @@ public class FirstRun extends DebugCommand {
      * @param eventBus        Event bus to trigger first run event on.
      */
     @Inject
-    public FirstRun(final Provider<Debug> commandProvider, final DMDircMBassador eventBus) {
+    public FirstRun(final Provider<Debug> commandProvider, final EventBus eventBus) {
         super(commandProvider);
 
         this.eventBus = eventBus;

debug/src/main/java/com/dmdirc/addons/debug/commands/ForceUpdate.java

@@ -23,11 +23,11 @@
 package com.dmdirc.addons.debug.commands;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
@@ -51,7 +51,7 @@ public class ForceUpdate extends DebugCommand {
     /** The update manager to use when forcing an update. */
     private final CachingUpdateManager updateManager;
     /** The event bus to post errors to. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of the command.
@@ -68,7 +68,7 @@ public class ForceUpdate extends DebugCommand {
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final IdentityController identityController,
             final CachingUpdateManager updateManager,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         super(commandProvider);
 
         this.globalConfig = globalConfig;

debug/src/main/java/com/dmdirc/addons/debug/commands/StatusbarMessage.java

@@ -23,12 +23,12 @@
 package com.dmdirc.addons.debug.commands;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.events.StatusBarMessageEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.StatusMessage;
@@ -43,7 +43,7 @@ import javax.inject.Provider;
 public class StatusbarMessage extends DebugCommand {
 
     /** The event bus to post messages on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** The global configuration. */
     private final AggregateConfigProvider globalConfig;
 
@@ -57,7 +57,7 @@ public class StatusbarMessage extends DebugCommand {
     @Inject
     public StatusbarMessage(
             final Provider<Debug> commandProvider,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             @GlobalConfig final AggregateConfigProvider globalConfig) {
         super(commandProvider);
 

debug/src/test/java/com/dmdirc/addons/debug/DebugTest.java

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.debug;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 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.google.common.collect.Sets;
@@ -55,7 +55,7 @@ public class DebugTest {
     @Mock private CommandController controller;
     @Mock private DebugCommand debugCommand;
     @Mock private CommandContext commandContext;
-    @Mock private DMDircMBassador eventbus;
+    @Mock private EventBus eventbus;
     private Debug debug;
 
     @Before

identd/src/main/java/com/dmdirc/addons/identd/IdentdManager.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.identd;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
@@ -34,6 +33,7 @@ import com.dmdirc.events.ServerConnectErrorEvent;
 import com.dmdirc.events.ServerConnectedEvent;
 import com.dmdirc.events.ServerConnectingEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
@@ -57,14 +57,14 @@ public class IdentdManager {
     /** Ident server. */
     private final IdentdServer server;
     /** Event bus to subscribe to events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final PluginInfo pluginInfo;
 
     @Inject
     public IdentdManager(@GlobalConfig final AggregateConfigProvider config,
             @PluginDomain(IdentdPlugin.class) final String domain,
             @PluginDomain(IdentdPlugin.class) final PluginInfo pluginInfo,
-            final IdentdServer server, final DMDircMBassador eventBus) {
+            final IdentdServer server, final EventBus eventBus) {
         this.pluginInfo = pluginInfo;
         connections = new ArrayList<>();
         this.config = config;

jpq/src/main/java/com/dmdirc/addons/jpq/JPQManager.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.jpq;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.events.ChannelSelfJoinEvent;
@@ -32,6 +31,7 @@ import com.dmdirc.events.ServerConnectedEvent;
 import com.dmdirc.events.ServerDisconnectedEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionManager;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.plugins.PluginDomain;
 
@@ -52,7 +52,7 @@ public class JPQManager {
     private final String domain;
     private final ConnectionManager connectionManager;
     private final GroupChatHandlerFactory groupChatHandlerFactory;
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final Map<GroupChat, GroupChatHandler> groupChatHandlers;
 
     @Inject
@@ -60,7 +60,7 @@ public class JPQManager {
             @PluginDomain(JPQPlugin.class) final String domain,
             final ConnectionManager connectionManager,
             final GroupChatHandlerFactory groupChatHandlerFactory,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         this.domain = domain;
         this.connectionManager = connectionManager;
         this.groupChatHandlerFactory = groupChatHandlerFactory;

jpq/src/test/java/com/dmdirc/addons/jpq/GroupChatHandlerTest.java

@@ -22,12 +22,12 @@
 
 package com.dmdirc.addons.jpq;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.ConfigBinder;
 import com.dmdirc.events.ChannelJoinEvent;
 import com.dmdirc.events.ChannelPartEvent;
 import com.dmdirc.events.ChannelQuitEvent;
 import com.dmdirc.events.DisplayProperty;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -49,7 +49,7 @@ public class GroupChatHandlerTest {
     @Mock private WindowModel windowModel;
     @Mock private AggregateConfigProvider configProvider;
     @Mock private ConfigBinder configBinder;
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private ChannelJoinEvent channelJoinEvent;
     @Mock private ChannelPartEvent channelPartEvent;
     @Mock private ChannelQuitEvent channelQuitEvent;

jpq/src/test/java/com/dmdirc/addons/jpq/JPQManagerTest.java

@@ -1,6 +1,5 @@
 package com.dmdirc.addons.jpq;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
@@ -11,6 +10,7 @@ import com.dmdirc.events.ServerConnectedEvent;
 import com.dmdirc.events.ServerDisconnectedEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionManager;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -33,7 +33,7 @@ import static org.mockito.Mockito.when;
 @RunWith(MockitoJUnitRunner.class)
 public class JPQManagerTest {
 
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private ConnectionManager connectionManager;
     @Mock private GroupChatHandlerFactory groupChatHandlerFactory;
     @Mock private ServerConnectedEvent serverConnectedEvent;

lagdisplay/src/main/java/com/dmdirc/addons/lagdisplay/LagDisplayManager.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.lagdisplay;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
@@ -45,6 +44,7 @@ import com.dmdirc.events.ServerPingSentEvent;
 import com.dmdirc.events.StatusBarComponentAddedEvent;
 import com.dmdirc.events.StatusBarComponentRemovedEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
@@ -71,7 +71,7 @@ import net.engio.mbassy.listener.Handler;
 public class LagDisplayManager implements ConfigChangeListener {
 
     /** Event bus to receive events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** Swing event bus to receive events from. */
     private final SwingEventBus swingEventBus;
     /** Active frame manager. */
@@ -96,7 +96,7 @@ public class LagDisplayManager implements ConfigChangeListener {
     private LagDisplayPanel panel;
 
     @Inject
-    public LagDisplayManager(final DMDircMBassador eventBus,
+    public LagDisplayManager(final EventBus eventBus,
             final SwingEventBus swingEventBus,
             final ActiveFrameManager activeFrameManager,
             final Provider<LagDisplayPanel> panelProvider,

logging/src/main/java/com/dmdirc/addons/logging/HistoryWindow.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.logging;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.messages.BackBufferFactory;
@@ -60,7 +60,7 @@ public class HistoryWindow extends FrameContainer {
             final String title,
             final Path logFile,
             final WindowModel parent,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final BackBufferFactory backBufferFactory,
             final int numLines) {
         super("raw", title, title, parent.getConfigManager(), backBufferFactory,

logging/src/main/java/com/dmdirc/addons/logging/LoggingManager.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.logging;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Query;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
@@ -48,6 +47,7 @@ import com.dmdirc.events.ChannelTopicChangeEvent;
 import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.QueryClosedEvent;
 import com.dmdirc.events.QueryOpenedEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.PrivateChat;
@@ -117,7 +117,7 @@ public class LoggingManager implements ConfigChangeListener {
     private final WindowManager windowManager;
     /** Map of open files. */
     private final Map<String, OpenFile> openFiles = Collections.synchronizedMap(new HashMap<>());
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final Provider<String> directoryProvider;
     private final BackBufferFactory backBufferFactory;
     private final LogFileLocator locator;
@@ -137,7 +137,7 @@ public class LoggingManager implements ConfigChangeListener {
     public LoggingManager(@PluginDomain(LoggingPlugin.class) final String domain,
             @PluginDomain(LoggingPlugin.class) final PluginInfo pluginInfo,
             @GlobalConfig final AggregateConfigProvider globalConfig,
-            final WindowManager windowManager, final DMDircMBassador eventBus,
+            final WindowManager windowManager, final EventBus eventBus,
             @Directory(LoggingModule.LOGS_DIRECTORY) final Provider<String> directoryProvider,
             final BackBufferFactory backBufferFactory,
             final LogFileLocator locator) {

logging/src/test/java/com/dmdirc/addons/logging/HistoryWindowTest.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.logging;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.ConfigBinder;
 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.messages.BackBuffer;
@@ -55,7 +55,7 @@ public class HistoryWindowTest {
     @Mock private ConfigBinder configBinder;
     @Mock private Connection connection;
     @Mock private WindowModel frameContainer;
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private BackBufferFactory backBufferFactory;
     @Captor private ArgumentCaptor<HistoricalLineRestoredEvent> eventCaptor;
     private HistoryWindow instance;

nickcolours/src/main/java/com/dmdirc/addons/nickcolours/NickColourManager.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.nickcolours;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.EDTInvocation;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.IconManager;
@@ -40,6 +39,7 @@ import com.dmdirc.events.ChannelGotNamesEvent;
 import com.dmdirc.events.ChannelJoinEvent;
 import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.DisplayProperty;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -72,7 +72,7 @@ public class NickColourManager {
     private final ConfigBinder configBinder;
     private final IconManager iconManager;
     private final Provider<Window> mainWindowProvider;
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final NickColourYamlStore nickColourYamlStore;
     private final Path path;
     private final PluginInfo pluginInfo;
@@ -91,7 +91,7 @@ public class NickColourManager {
             final IconManager iconManager,
             @MainWindow final Provider<Window> mainWindowProvider,
             @PluginDomain(NickColourPlugin.class) final PluginInfo pluginInfo,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final NickColourYamlStore nickColourYamlStore,
             @Directory(DirectoryType.BASE) final Path path) {
         this.colourManager = colourManager;

nickkeep/src/main/java/com/dmdirc/addons/nickkeep/NickKeepManager.java

@@ -22,10 +22,10 @@
 
 package com.dmdirc.addons.nickkeep;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.events.ChannelNickChangeEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 
 import java.util.Optional;
 
@@ -38,10 +38,10 @@ import net.engio.mbassy.listener.Handler;
  */
 public class NickKeepManager {
 
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     @Inject
-    public NickKeepManager(final DMDircMBassador eventBus) {
+    public NickKeepManager(final EventBus eventBus) {
         this.eventBus = eventBus;
     }
 

nickkeep/src/test/java/com/dmdirc/addons/nickkeep/NickKeepManagerTest.java

@@ -23,10 +23,10 @@
 package com.dmdirc.addons.nickkeep;
 
 import com.dmdirc.Channel;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.events.ChannelNickChangeEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 
 import com.google.common.collect.Lists;
 
@@ -46,7 +46,7 @@ import static org.mockito.Mockito.when;
 @RunWith(MockitoJUnitRunner.class)
 public class NickKeepManagerTest {
 
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private ChannelNickChangeEvent event;
     @Mock private Channel channel;
     @Mock private Connection connection;

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.notifications;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
@@ -31,6 +30,7 @@ import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.PluginLoadedEvent;
 import com.dmdirc.events.PluginUnloadedEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
@@ -60,12 +60,12 @@ public class NotificationsManager {
     /** Plugin manager. */
     private final PluginManager pluginManager;
     /** Event bus to listen for events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     @Inject
     public NotificationsManager(@PluginDomain(NotificationsPlugin.class) final String domain,
             @PluginDomain(NotificationsPlugin.class) final PluginInfo pluginInfo,
-            @GlobalConfig final AggregateConfigProvider globalConfig, final DMDircMBassador eventBus,
+            @GlobalConfig final AggregateConfigProvider globalConfig, final EventBus eventBus,
             final PluginManager pluginManager) {
         this.domain = domain;
         this.pluginInfo = pluginInfo;

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.nowplaying;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
@@ -31,6 +30,7 @@ import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.PluginLoadedEvent;
 import com.dmdirc.events.PluginUnloadedEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.Plugin;
 import com.dmdirc.plugins.PluginDomain;
@@ -53,7 +53,7 @@ public class NowPlayingManager {
     /** Global configuration to read settings from. */
     private final AggregateConfigProvider globalConfig;
     /** Event bus to subscribe to events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final PluginInfo pluginInfo;
     /** This plugin's settings domain. */
     private final String domain;
@@ -65,7 +65,7 @@ public class NowPlayingManager {
     private List<String> order;
 
     @Inject
-    public NowPlayingManager(final PluginManager pluginManager, final DMDircMBassador eventBus,
+    public NowPlayingManager(final PluginManager pluginManager, final EventBus eventBus,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             @PluginDomain(NowPlayingPlugin.class) final String domain,
             @PluginDomain(NowPlayingPlugin.class) final PluginInfo pluginInfo) {

osd/src/main/java/com/dmdirc/addons/osd/OsdManager.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.osd;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.config.prefs.CategoryChangeListener;
@@ -34,6 +33,7 @@ import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.config.prefs.SettingChangeListener;
 import com.dmdirc.events.ClientPrefsOpenedEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
@@ -83,7 +83,7 @@ public class OsdManager implements CategoryChangeListener, PreferencesInterface,
     private PreferencesSetting maxWindowsSetting;
     /** This plugin's plugin info. */
     private final PluginInfo pluginInfo;
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** The controller to read/write settings with. */
     private final IdentityController identityController;
     /** The manager to use to parse colours. */
@@ -92,7 +92,7 @@ public class OsdManager implements CategoryChangeListener, PreferencesInterface,
     @Inject
     public OsdManager(
             @MainWindow final Window mainFrame,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final IdentityController identityController,
             final ColourManagerFactory colourManagerFactory,
             @PluginDomain(OsdPlugin.class) final PluginInfo pluginInfo) {

parserdebug/src/main/java/com/dmdirc/addons/parserdebug/DebugWindow.java

@@ -22,10 +22,10 @@
 
 package com.dmdirc.addons.parserdebug;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.events.CommandOutputEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.messages.BackBufferFactory;
@@ -54,7 +54,7 @@ public class DebugWindow extends FrameContainer {
             final String title,
             final Parser parser,
             final Connection connection,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final BackBufferFactory backBufferFactory) {
         super("raw", "Parser Debug", title,
                 connection.getWindowModel().getConfigManager(), backBufferFactory,

parserdebug/src/main/java/com/dmdirc/addons/parserdebug/ParserDebugManager.java

@@ -22,10 +22,10 @@
 
 package com.dmdirc.addons.parserdebug;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.CommandOutputEvent;
 import com.dmdirc.events.ServerDisconnectedEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.parser.events.DebugInfoEvent;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.ui.WindowManager;
@@ -41,7 +41,7 @@ import net.engio.mbassy.listener.Handler;
 public class ParserDebugManager {
 
     /** Event bus to subscribe to events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** Map of parsers registered. */
     protected final Map<Parser, DebugWindow> registeredParsers;
     /** Window manager. */
@@ -51,7 +51,7 @@ public class ParserDebugManager {
     @Inject
     public ParserDebugManager(
             final WindowManager windowManager,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final BackBufferFactory backBufferFactory) {
         this.windowManager = windowManager;
         this.eventBus = eventBus;

qauth/src/main/java/com/dmdirc/addons/qauth/QAuthManager.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.qauth;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Invite;
 import com.dmdirc.config.ConfigBinder;
 import com.dmdirc.config.ConfigBinding;
@@ -37,6 +36,7 @@ import com.dmdirc.events.ServerInviteReceivedEvent;
 import com.dmdirc.events.ServerNoticeEvent;
 import com.dmdirc.events.UserInfoResponseEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.parser.events.UserInfoEvent;
@@ -57,7 +57,7 @@ public class QAuthManager {
 
     private final String domain;
     private final PluginInfo pluginInfo;
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final ConfigBinder configBinder;
     private String username;
     private String password;
@@ -71,7 +71,7 @@ public class QAuthManager {
             @PluginDomain(QAuthPlugin.class) final String domain,
             @PluginDomain(QAuthPlugin.class) final PluginInfo pluginInfo,
             @GlobalConfig final AggregateConfigProvider config,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         this.domain = domain;
         this.pluginInfo = pluginInfo;
         this.eventBus = eventBus;

qauth/src/test/java/com/dmdirc/addons/qauth/QAuthManagerTest.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.qauth;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Invite;
 import com.dmdirc.Query;
 import com.dmdirc.config.ConfigBinder;
@@ -35,6 +34,7 @@ import com.dmdirc.events.ServerInviteReceivedEvent;
 import com.dmdirc.events.ServerNoticeEvent;
 import com.dmdirc.events.UserInfoResponseEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
@@ -66,7 +66,7 @@ public class QAuthManagerTest {
     @Mock private AggregateConfigProvider aggregateConfigProvider;
     @Mock private ConfigProvider configProvider;
     @Mock private PreferencesDialogModel preferencesDialogModel;
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private PluginInfo pluginInfo;
     @Mock private PluginMetaData pluginMetaData;
     @Mock private AggregateConfigProvider config;

redirect/src/main/java/com/dmdirc/addons/redirect/FakeWriteableFrameContainer.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.redirect;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.messages.BackBufferFactory;
 
@@ -44,7 +44,7 @@ public class FakeWriteableFrameContainer extends FrameContainer {
      */
     public FakeWriteableFrameContainer(
             final WindowModel target,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final BackBufferFactory backBufferFactory) {
         super(target.getIcon(), target.getName(), target.getTitle(),
                 target.getConfigManager(), backBufferFactory,

redirect/src/main/java/com/dmdirc/addons/redirect/RedirectCommand.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.redirect;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandType;
@@ -32,6 +31,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.InputModel;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
@@ -53,7 +53,7 @@ public class RedirectCommand extends Command implements IntelligentCommand {
             + "channel or query window",
             CommandType.TYPE_CHAT);
     /** The bus to dispatch events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final BackBufferFactory backBufferFactory;
     /** Tab-completer utilities. */
     private final TabCompleterUtils tabCompleterUtils;
@@ -64,7 +64,7 @@ public class RedirectCommand extends Command implements IntelligentCommand {
     @Inject
     public RedirectCommand(
             final CommandController controller,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final BackBufferFactory backBufferFactory,
             final TabCompleterUtils tabCompleterUtils) {
         super(controller);

scriptplugin/src/main/java/com/dmdirc/addons/scriptplugin/ScriptPluginManager.java

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.scriptplugin;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.events.DMDircEvent;
 import com.dmdirc.events.PluginLoadedEvent;
 import com.dmdirc.events.PluginUnloadedEvent;
+import com.dmdirc.interfaces.EventBus;
 
 import java.io.File;
 import java.io.FileInputStream;
@@ -49,13 +49,13 @@ import static com.dmdirc.util.LogUtils.USER_ERROR;
 public class ScriptPluginManager {
 
     private static final Logger LOG = LoggerFactory.getLogger(ScriptPluginManager.class);
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final String scriptDir;
     private final ScriptManager scriptManager;
     private final TypedProperties globalVariables;
 
     @Inject
-    public ScriptPluginManager(final DMDircMBassador eventBus,
+    public ScriptPluginManager(final EventBus eventBus,
             @Directory(ScriptModule.SCRIPTS) final String scriptDir,
             final ScriptManager scriptManager,
             final ScriptEngineManager scriptEngineManager) {

systray/src/main/java/com/dmdirc/addons/systray/SystrayManager.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.systray;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
@@ -33,6 +32,7 @@ import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.addons.ui_swing.events.ClientMinimisedEvent;
 import com.dmdirc.events.ClientPrefsOpenedEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.addons.ui_swing.components.IconManager;
@@ -66,7 +66,7 @@ public class SystrayManager implements ActionListener, MouseListener {
     /** Icon manager to get images from. */
     private final IconManager iconManager;
     /** The event bus to listen to events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** The tray icon we're currently using. */
     private TrayIcon icon;
 
@@ -77,7 +77,7 @@ public class SystrayManager implements ActionListener, MouseListener {
             @PluginDomain(SystrayPlugin.class) final PluginInfo pluginInfo,
             final MainFrame mainFrame,
             final IconManager iconManager,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         this.globalConfig = globalConfig;
         this.domain = domain;
         this.pluginInfo = pluginInfo;

time/src/test/java/com/dmdirc/addons/time/TimerCommandTest.java

@@ -22,13 +22,13 @@
 
 package com.dmdirc.addons.time;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.IntelligentCommand.IntelligentCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.events.CommandOutputEvent;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
@@ -57,7 +57,7 @@ public class TimerCommandTest {
     @Mock private TimerManager timerManager;
     @Mock private CommandController commandController;
     @Mock private WindowModel frameContainer;
-    @Mock private DMDircMBassador eventbus;
+    @Mock private EventBus eventbus;
     @Mock private CommandContext commandContext;
     @Mock private IntelligentCommandContext intelligentCommandContext;
     @Mock private CommandArguments commandArguments;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/Apple.java

@@ -23,10 +23,10 @@
 package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
 import com.dmdirc.events.ClientOpenedEvent;
 import com.dmdirc.interfaces.ConnectionManager;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.InvalidURIException;
 import com.dmdirc.util.URIParser;
@@ -80,7 +80,7 @@ public class Apple implements InvocationHandler {
     /** The server manager to use to connect to URLs. */
     private final ConnectionManager connectionManager;
     /** Event bus. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of {@link Apple}.
@@ -96,7 +96,7 @@ public class Apple implements InvocationHandler {
     public Apple(
             @GlobalConfig final AggregateConfigProvider configManager,
             final ConnectionManager connectionManager,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         this.configManager = configManager;
         this.connectionManager = connectionManager;
         this.eventBus = eventBus;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/DMDircEventQueue.java

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.ui_swing;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.actions.CopyAction;
 import com.dmdirc.addons.ui_swing.actions.CutAction;
 import com.dmdirc.addons.ui_swing.events.SwingWindowEvent;
 import com.dmdirc.addons.ui_swing.events.ClientKeyPressedEvent;
+import com.dmdirc.interfaces.EventBus;
 
 import java.awt.AWTEvent;
 import java.awt.Component;
@@ -52,12 +52,12 @@ import javax.swing.text.JTextComponent;
 public class DMDircEventQueue extends EventQueue {
 
     /** Event bus to dispatch events to. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** Clipboard to copy and paste from. */
     private final Clipboard clipboard;
 
     @Inject
-    public DMDircEventQueue(final DMDircMBassador eventBus, final Clipboard clipboard) {
+    public DMDircEventQueue(final EventBus eventBus, final Clipboard clipboard) {
         this.eventBus = eventBus;
         this.clipboard = clipboard;
     }

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/EventTriggeringFocusListener.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.ui_swing;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.events.ClientFocusGainedEvent;
 import com.dmdirc.addons.ui_swing.events.ClientFocusLostEvent;
+import com.dmdirc.interfaces.EventBus;
 
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowFocusListener;
@@ -34,9 +34,9 @@ import java.awt.event.WindowFocusListener;
 */
 class EventTriggeringFocusListener implements WindowFocusListener {
 
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
-    public EventTriggeringFocusListener(final DMDircMBassador eventBus) {
+    public EventTriggeringFocusListener(final EventBus eventBus) {
         this.eventBus = eventBus;
     }
 

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/MainFrame.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.addons.ui_swing.components.SplitPane;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
@@ -41,6 +40,7 @@ import com.dmdirc.addons.ui_swing.framemanager.FramemanagerPosition;
 import com.dmdirc.addons.ui_swing.framemanager.ctrltab.CtrlTabWindowManager;
 import com.dmdirc.events.FrameTitleChangedEvent;
 import com.dmdirc.events.UnreadStatusChangedEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
@@ -98,7 +98,7 @@ public class MainFrame extends JFrame implements WindowListener, ConfigChangeLis
     /** Provider of frame managers. */
     private final Provider<FrameManager> frameManagerProvider;
     /** The bus to despatch events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** Swing event bus to post events to. */
     private final SwingEventBus swingEventBus;
     /** The main application icon. */
@@ -145,7 +145,7 @@ public class MainFrame extends JFrame implements WindowListener, ConfigChangeLis
             final Provider<QuitWorker> quitWorker,
             final IconManager iconManager,
             final Provider<FrameManager> frameManagerProvider,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final SwingEventBus swingEventBus) {
         checkOnEDT();
         this.apple = apple;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/PrefsComponentFactory.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.components.FileBrowser;
 import com.dmdirc.addons.ui_swing.components.FontPicker;
 import com.dmdirc.addons.ui_swing.components.IconManager;
@@ -35,6 +34,7 @@ import com.dmdirc.addons.ui_swing.components.renderers.MapEntryRenderer;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.components.validating.ValidatingJTextField;
 import com.dmdirc.config.prefs.PreferencesSetting;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.util.validators.NumericalValidator;
 import com.dmdirc.util.validators.OptionalValidator;
@@ -76,7 +76,7 @@ public final class PrefsComponentFactory {
     /** The colour manager to use for colour preferences. */
     private final ColourManager colourManager;
     /** The global event bus. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of PrefsComponentFactory.
@@ -87,7 +87,7 @@ public final class PrefsComponentFactory {
      */
     @Inject
     public PrefsComponentFactory(
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final IconManager iconManager,
             @GlobalConfig final ColourManager colourManager) {
         this.iconManager = iconManager;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/QuitWorker.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.ui_swing;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ClientClosingEvent;
 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.config.IdentityController;
@@ -46,7 +46,7 @@ public class QuitWorker extends SwingWorker<Void, Void> {
     /** The main frame to interact with. */
     private final MainFrame mainFrame;
     /** Bus to dispatch events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     /**
      * Creates a new {@link QuitWorker}.
@@ -61,7 +61,7 @@ public class QuitWorker extends SwingWorker<Void, Void> {
             final IdentityController identityController,
             final ConnectionManager connectionManager,
             final MainFrame mainFrame,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         this.globalIdentity = identityController.getUserSettings();
         this.globalConfig = identityController.getGlobalConfiguration();
         this.connectionManager = connectionManager;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/SwingManager.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
 import com.dmdirc.addons.ui_swing.components.statusbar.FeedbackNag;
 import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
@@ -36,6 +35,7 @@ import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.FeedbackNagEvent;
 import com.dmdirc.events.FirstRunEvent;
 import com.dmdirc.events.UnknownURLEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.ui.WindowManager;
@@ -75,7 +75,7 @@ public class SwingManager {
     /** Link handler for swing links. */
     private final SwingLinkHandler linkHandler;
     /** Bus to listen on for events. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** The event bus for this plugin. */
     private final SwingEventBus swingEventBus;
     /** The provider to use to create tree-based frame managers. */
@@ -122,7 +122,7 @@ public class SwingManager {
             final Provider<FeedbackNag> feedbackNagProvider,
             final URLDialogFactory urlDialogFactory,
             final SwingLinkHandler linkHandler,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final SwingEventBus swingEventBus,
             final TreeFrameManagerProvider treeProvider,
             final Provider<SwingWindowManager> swingWindowManager,

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/SwingWindowManager.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.addons.ui_swing;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.events.SwingWindowEvent;
+import com.dmdirc.interfaces.EventBus;
 
 import java.awt.Window;
 import java.awt.event.WindowEvent;
@@ -45,7 +45,7 @@ public class SwingWindowManager {
     private final List<Window> windows;
 
     @Inject
-    public SwingWindowManager(final DMDircMBassador eventBus) {
+    public SwingWindowManager(final EventBus eventBus) {
         windows = new ArrayList<>();
         eventBus.subscribe(this);
     }

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/FontPicker.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.renderers.FontListCellRenderer;
+import com.dmdirc.interfaces.EventBus;
 
 import com.google.common.collect.Lists;
 
@@ -55,7 +55,7 @@ public class FontPicker extends JComboBox<Object> {
      * @param eventBus   The event bus to post errors to
      * @param fontFamily Font family
      */
-    public FontPicker(final DMDircMBassador eventBus, final String fontFamily) {
+    public FontPicker(final EventBus eventBus, final String fontFamily) {
         super(new DefaultComboBoxModel<>());
         this.fontFamily = fontFamily;
 

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/addonpanel/AddonPanel.java

@@ -22,12 +22,12 @@
 
 package com.dmdirc.addons.ui_swing.components.addonpanel;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.addonbrowser.BrowserWindow;
 import com.dmdirc.addons.ui_swing.components.addonbrowser.DataLoaderWorkerFactory;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.prefs.PreferencesInterface;
+import com.dmdirc.interfaces.EventBus;
 
 import java.awt.Window;
 
@@ -61,7 +61,7 @@ public abstract class AddonPanel extends JPanel implements AddonToggleListener,
     /** The factory to use to produce data loader workers. */
     private final DataLoaderWorkerFactory workerFactory;
     /** The event bus to post errors to. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** Addon list scroll pane. */
     private JScrollPane scrollPane;
     /** Blurb label. */
@@ -81,7 +81,7 @@ public abstract class AddonPanel extends JPanel implements AddonToggleListener,
      * @param eventBus      The event bus to post errors to.
      */
     public AddonPanel(final Window parentWindow, final DataLoaderWorkerFactory workerFactory,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         this.parentWindow = parentWindow;
         this.workerFactory = workerFactory;
         this.eventBus = eventBus;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/addonpanel/PluginPanel.java

@@ -23,11 +23,11 @@
 package com.dmdirc.addons.ui_swing.components.addonpanel;
 
 import com.dmdirc.ClientModule.UserConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.addonbrowser.DataLoaderWorkerFactory;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.events.PluginRefreshEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
@@ -80,7 +80,7 @@ public class PluginPanel extends AddonPanel {
      */
     @Inject
     public PluginPanel(
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             @MainWindow final Window parentWindow,
             final PluginManager pluginManager,
             final DataLoaderWorkerFactory workerFactory,

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/addonpanel/ThemePanel.java

@@ -23,10 +23,10 @@
 package com.dmdirc.addons.ui_swing.components.addonpanel;
 
 import com.dmdirc.ClientModule.UserConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.addonbrowser.DataLoaderWorkerFactory;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.addons.ui_swing.components.IconManager;
 import com.dmdirc.ui.themes.Theme;
@@ -77,7 +77,7 @@ public class ThemePanel extends AddonPanel {
             final IconManager iconManager,
             final CachingUpdateManager updateManager,
             @UserConfig final ConfigProvider userConfig,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         super(parentWindow, workerFactory, eventBus);
         this.themeManager = themeManager;
         this.iconManager = iconManager;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/frames/ChannelFrame.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.EDTInvocation;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
@@ -38,6 +37,7 @@ import com.dmdirc.config.ConfigBinder;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.ClientClosingEvent;
 import com.dmdirc.events.FrameClosingEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
@@ -74,7 +74,7 @@ public final class ChannelFrame extends InputTextFrame {
     /** Topic bar. */
     private TopicBar topicBar;
     /** Event bus to dispatch events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** Config to read settings from. */
     private final AggregateConfigProvider globalConfig;
     /** Channel settings dialog provider. */

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/frames/ChannelFrameFactory.java

@@ -22,13 +22,13 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.components.TopicBarFactory;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
 import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.IdentityFactory;
@@ -58,11 +58,11 @@ public class ChannelFrameFactory implements SwingWindowFactory.WindowProvider {
     private final InputTextFramePasteActionFactory inputTextFramePasteActionFactory;
     private final Provider<KeyedDialogProvider<GroupChat, ChannelSettingsDialog>> dialogProvider;
     private final TopicBarFactory topicBarFactory;
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     @Inject
     public ChannelFrameFactory(
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             @PluginDomain(SwingController.class) final String domain,
             final Provider<TextFrameDependencies> dependencies,
             final Provider<SwingInputField> inputFieldProvider,

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/frames/ComponentFrameFactory.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandparser.parsers.CommandParser;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 
 import java.util.function.Supplier;
@@ -40,12 +40,12 @@ import static com.dmdirc.addons.ui_swing.components.frames.TextFrame.TextFrameDe
 @Singleton
 public class ComponentFrameFactory {
 
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final TextFrameDependencies dependencies;
 
     @Inject
     public ComponentFrameFactory(
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final TextFrameDependencies dependencies) {
         this.eventBus = eventBus;
         this.dependencies = dependencies;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/frames/CustomInputFrameFactory.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.core.components.WindowComponent;
 
@@ -46,12 +46,12 @@ public class CustomInputFrameFactory implements SwingWindowFactory.WindowProvide
 
     private final Provider<TextFrameDependencies> dependencies;
     private final Provider<SwingInputField> inputFieldProvider;
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final InputTextFramePasteActionFactory inputTextFramePasteActionFactory;
 
     @Inject
     public CustomInputFrameFactory(
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final InputTextFramePasteActionFactory inputTextFramePasteActionFactory,
             final Provider<TextFrameDependencies> dependencies,
             final Provider<SwingInputField> inputFieldProvider) {

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/frames/InputTextFrame.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.EDTInvocation;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.CopyAction;
@@ -34,6 +33,7 @@ import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.input.InputHandler;
@@ -81,7 +81,7 @@ public abstract class InputTextFrame extends TextFrame implements MouseListener
     /** The controller to use to retrieve command information. */
     private final CommandController commandController;
     /** The bus to dispatch input events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of InputFrame.

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/frames/InputTextFramePasteAction.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.addons.ui_swing.dialogs.paste.PasteDialogFactory;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 
 import java.awt.Toolkit;
@@ -55,7 +55,7 @@ public final class InputTextFramePasteAction extends AbstractAction {
     /** Text component to be acted upon. */
     private final InputTextFrame inputFrame;
     /** Event bus to post events to. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** Swing input field. */
     private final SwingInputField inputField;
     /** Frame container. */
@@ -75,7 +75,7 @@ public final class InputTextFramePasteAction extends AbstractAction {
             final SwingInputField inputField,
             final WindowModel container,
             final Clipboard clipboard,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final PasteDialogFactory pasteDialogFactory,
             final Window window) {
         super("Paste");

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/frames/InputTextFramePasteActionFactory.java

@@ -22,10 +22,10 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.addons.ui_swing.dialogs.paste.PasteDialogFactory;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 
 import java.awt.Window;
@@ -39,14 +39,14 @@ import javax.inject.Inject;
 public class InputTextFramePasteActionFactory {
 
     private final Clipboard clipboard;
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final PasteDialogFactory pasteDialogFactory;
     private final Window window;
 
     @Inject
     public InputTextFramePasteActionFactory(
             final Clipboard clipboard,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final PasteDialogFactory pasteDialogFactory,
             @MainWindow final Window window) {
         this.clipboard = clipboard;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/frames/ServerFrameFactory.java

@@ -22,13 +22,13 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.sslcertificate.SSLCertificateDialogFactory;
 import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.core.components.WindowComponent;
 
@@ -51,13 +51,13 @@ public class ServerFrameFactory implements SwingWindowFactory.WindowProvider {
     private final Provider<TextFrameDependencies> dependencies;
     private final Provider<SwingInputField> inputFieldProvider;
     private final Provider<KeyedDialogProvider<Connection, ServerSettingsDialog>> dialogProvider;
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final InputTextFramePasteActionFactory inputTextFramePasteActionFactory;
     private final SSLCertificateDialogFactory sslCertificateDialogFactory;
 
     @Inject
     public ServerFrameFactory(
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final Provider<TextFrameDependencies> dependencies,
             final Provider<SwingInputField> inputFieldProvider,
             final InputTextFramePasteActionFactory inputTextFramePasteActionFactory,

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -58,6 +57,7 @@ import com.dmdirc.events.LinkChannelClickedEvent;
 import com.dmdirc.events.LinkNicknameClickedEvent;
 import com.dmdirc.events.LinkUrlClickedEvent;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.ServiceManager;
@@ -108,7 +108,7 @@ public abstract class TextFrame extends JPanel implements TextPaneListener {
     /** Manager to use for building popups. */
     private final PopupManager popupManager;
     /** Bus to despatch events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** Clipboard to copy and paste from. */
     private final Clipboard clipboard;
     private final IconManager iconManager;
@@ -514,7 +514,7 @@ public abstract class TextFrame extends JPanel implements TextPaneListener {
         final TextPaneFactory textPaneFactory;
         final SwingController controller;
         final PopupManager popupManager;
-        final DMDircMBassador eventBus;
+        final EventBus eventBus;
         final AggregateConfigProvider globalConfig;
         final PasteDialogFactory pasteDialog;
         final ServiceManager serviceManager;
@@ -532,7 +532,7 @@ public abstract class TextFrame extends JPanel implements TextPaneListener {
                 final TextPaneFactory textPaneFactory,
                 final SwingController controller,
                 final PopupManager popupManager,
-                final DMDircMBassador eventBus,
+                final EventBus eventBus,
                 final PasteDialogFactory pasteDialog,
                 final ServiceManager serviceManager,
                 @GlobalConfig final AggregateConfigProvider globalConfig,

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputHandler.java

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.ui_swing.components.inputfields;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 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.ui.InputField;
 import com.dmdirc.plugins.ServiceManager;
@@ -66,7 +66,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
             final CommandParser commandParser,
             final WindowModel parentWindow,
             final TabCompleterUtils tabCompleterUtils,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         super(serviceManager, target, commandController, commandParser, parentWindow,
                 tabCompleterUtils, eventBus);
     }

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/statusbar/FeedbackNag.java

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.dialogs.feedback.FeedbackDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.events.StatusBarComponentAddedEvent;
 import com.dmdirc.events.StatusBarComponentRemovedEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
 import com.dmdirc.addons.ui_swing.components.IconManager;
 
@@ -56,7 +56,7 @@ public class FeedbackNag extends JLabel implements StatusBarComponent,
     /** Provider of feedback dialogs. */
     private final DialogProvider<FeedbackDialog> feedbackDialogProvider;
     /** The event bus to post events to. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     /**
      * Creates a new feedback nag.
@@ -69,7 +69,7 @@ public class FeedbackNag extends JLabel implements StatusBarComponent,
     public FeedbackNag(
             final IconManager iconManager,
             final DialogProvider<FeedbackDialog> feedbackDialogProvider,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         this.feedbackDialogProvider = feedbackDialogProvider;
         this.eventBus = eventBus;
 

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/statusbar/InviteLabel.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.events.SwingEventBus;
@@ -30,6 +29,7 @@ import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
 import com.dmdirc.events.ServerInviteExpiredEvent;
 import com.dmdirc.events.ServerInviteReceivedEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.InviteManager;
 import com.dmdirc.addons.ui_swing.components.IconManager;
 
@@ -63,14 +63,14 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> {
     /** Parent window that will own popup windows. */
     private final Window parentWindow;
     /** The client event bus to use for invite events. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** The swing event bus to use for selection events. */
     private final SwingEventBus swingEventBus;
     /** Active connection. */
     private Optional<Connection> activeConnection;
 
     @Inject
-    public InviteLabel(final DMDircMBassador eventBus, final IconManager iconManager,
+    public InviteLabel(final EventBus eventBus, final IconManager iconManager,
             final MainFrame mainFrame, final SwingEventBus swingEventBus) {
         super(new JLabel());
 

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/statusbar/MessageLabel.java

@@ -23,11 +23,11 @@
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
 import com.dmdirc.events.StatusBarMessageClearEvent;
 import com.dmdirc.events.StatusBarMessageEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
 import com.dmdirc.addons.ui_swing.components.IconManager;
@@ -78,7 +78,7 @@ public class MessageLabel extends JPanel implements StatusBarComponent,
     /** Icon manager to retrieve icons from. */
     private final IconManager iconManager;
     /** The event bus to post status messages on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     /**
      * Instantiates a new message label.
@@ -93,7 +93,7 @@ public class MessageLabel extends JPanel implements StatusBarComponent,
             @GlobalConfig final AggregateConfigProvider config,
             final IconManager iconManager,
             @MainWindow final Window parentWindow,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         super(new MigLayout("fill, ins 0, gap 0  0"));
         this.iconManager = iconManager;
         this.eventBus = eventBus;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/statusbar/MessageTimerTask.java

@@ -22,8 +22,8 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.StatusBarMessageClearEvent;
+import com.dmdirc.interfaces.EventBus;
 
 import java.util.TimerTask;
 
@@ -33,14 +33,14 @@ import java.util.TimerTask;
 public class MessageTimerTask extends TimerTask {
 
     /** Event bus to post clear message on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     /**
      * Creates a new message timer task that clears a message label on completion.
      *
      * @param eventBus Event bus to post clear message on.
      */
-    public MessageTimerTask(final DMDircMBassador eventBus) {
+    public MessageTimerTask(final EventBus eventBus) {
         this.eventBus = eventBus;
     }
 

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/components/text/WrapEditorKit.java

@@ -7,10 +7,10 @@
 
 package com.dmdirc.addons.ui_swing.components.text;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.LinkChannelClickedEvent;
 import com.dmdirc.events.LinkNicknameClickedEvent;
 import com.dmdirc.events.LinkUrlClickedEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.messages.IRCTextAttribute;
 
@@ -45,7 +45,7 @@ public class WrapEditorKit extends StyledEditorKit implements MouseListener, Mou
     /** Associated Component. */
     private JEditorPane editorPane;
     /** Event bus to fire link click events on. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** The window this editor kit is used in. */
     private final WindowModel window;
 
@@ -56,7 +56,7 @@ public class WrapEditorKit extends StyledEditorKit implements MouseListener, Mou
      * @param eventBus Event bus to raise hyperlink events on
      * @param window   Window as source for hyperlink events
      */
-    public WrapEditorKit(final boolean wrapping, final DMDircMBassador eventBus, final WindowModel window) {
+    public WrapEditorKit(final boolean wrapping, final EventBus eventBus, final WindowModel window) {
         this.window = window;
         this.eventBus = eventBus;
         wrap = wrapping;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialog.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.paste;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
 import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputHandler;
@@ -30,6 +29,7 @@ import com.dmdirc.addons.ui_swing.components.inputfields.TextAreaInputField;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.addons.ui_swing.components.IconManager;
@@ -98,7 +98,7 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
             final AggregateConfigProvider config,
             final ServiceManager serviceManager,
             final CommandController commandController,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final InputTextFrame newParent,
             final String text,
             final Window parentWindow,
@@ -129,7 +129,7 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
      *
      * @param text text to show in the dialog
      */
-    private void initComponents(final DMDircMBassador eventBus, final String text,
+    private void initComponents(final EventBus eventBus, final String text,
             final ColourManagerFactory colourManagerFactory,
             final TabCompleterUtils tabCompleterUtils) {
         scrollPane = new JScrollPane();

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialogFactory.java

@@ -23,9 +23,9 @@
 package com.dmdirc.addons.ui_swing.dialogs.paste;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
 import com.dmdirc.interfaces.CommandController;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.addons.ui_swing.components.IconManager;
@@ -47,7 +47,7 @@ public class PasteDialogFactory {
     private final AggregateConfigProvider config;
     private final ServiceManager serviceManager;
     private final CommandController commandController;
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final ColourManagerFactory colourManagerFactory;
     private final TabCompleterUtils tabCompleterUtils;
 
@@ -57,7 +57,7 @@ public class PasteDialogFactory {
             @GlobalConfig final AggregateConfigProvider config,
             final ServiceManager serviceManager,
             final CommandController commandController,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final ColourManagerFactory colourManagerFactory,
             final TabCompleterUtils tabCompleterUtils) {
         this.iconManager = iconManager;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/dialogs/updater/SwingUpdaterDialog.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.updater;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
@@ -30,6 +29,7 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogModule.ForUpdates;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.manager.CachingUpdateManager;
 import com.dmdirc.updater.manager.UpdateManager;
@@ -78,7 +78,7 @@ public class SwingUpdaterDialog extends StandardDialog implements
     /** Provider of restart dialogs. */
     private final DialogProvider<SwingRestartDialog> restartDialogProvider;
     /** The event bus to post errors to. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     /**
      * Creates a new instance of the updater dialog.
@@ -93,7 +93,7 @@ public class SwingUpdaterDialog extends StandardDialog implements
             final CachingUpdateManager updateManager,
             @MainWindow final Window parentWindow,
             @ForUpdates final DialogProvider<SwingRestartDialog> restartDialogProvider,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         super(parentWindow, ModalityType.MODELESS);
 
         this.updateManager = updateManager;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.framemanager.tree;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
@@ -39,6 +38,7 @@ import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.events.FrameIconChangedEvent;
 import com.dmdirc.events.UnreadStatusChangedEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
@@ -94,7 +94,7 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
     /** Active frame manager. */
     private final ActiveFrameManager activeFrameManager;
     /** The event bus to post errors to. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** Swing event bus. */
     private final SwingEventBus swingEventBus;
     /** Icon manager. */
@@ -113,7 +113,7 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
             final ActiveFrameManager activeFrameManager,
             final SwingWindowFactory windowFactory,
             @PluginDomain(SwingController.class) final String domain,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final SwingEventBus swingEventBus,
             final IconManager iconManager) {
         this.windowFactory = windowFactory;

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/injection/DialogModule.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.injection;
 
 import com.dmdirc.ClientModule.UserConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
@@ -45,6 +44,7 @@ import com.dmdirc.commandparser.auto.AutoCommandManager;
 import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.config.ConfigProvider;
@@ -213,7 +213,7 @@ public class DialogModule {
             @MainWindow final Window parentWindow,
             final Clipboard clipboard,
             final CommandController commandController,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final ColourManagerFactory colourManagerFactory,
             final TabCompleterUtils tabCompleterUtils,
             final IconManager iconManager) {

ui_swing/src/main/java/com/dmdirc/addons/ui_swing/injection/SwingModule.java

@@ -25,7 +25,6 @@ package com.dmdirc.addons.ui_swing.injection;
 import com.dmdirc.ClientModule;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.NoopClipboard;
@@ -55,6 +54,7 @@ import com.dmdirc.addons.ui_swing.framemanager.tree.TreeFrameManagerProvider;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 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.ConfigProvider;
@@ -134,7 +134,7 @@ public class SwingModule {
             final Provider<QuitWorker> quitWorker,
             final URLBuilder urlBuilder,
             final Provider<FrameManager> frameManagerProvider,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final SwingEventBus swingEventBus) {
         return UIUtilities.invokeAndWait(() -> new MainFrame(
                 apple,
@@ -169,7 +169,7 @@ public class SwingModule {
             final ErrorPanel errorLabel,
             final UpdaterLabel updaterLabel,
             final MessageLabel messageLabel,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         final SwingStatusBar sb = UIUtilities.invokeAndWait(
                 () -> new SwingStatusBar(inviteLabel, updaterLabel, errorLabel, messageLabel));
         eventBus.subscribe(messageLabel);
@@ -180,7 +180,7 @@ public class SwingModule {
     @Provides
     @Singleton
     public URLHandler getURLHandler(
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final ConnectionManager connectionManager) {
         return new URLHandler(eventBus, globalConfig, connectionManager);
@@ -195,7 +195,7 @@ public class SwingModule {
             @GlobalConfig final AggregateConfigProvider configManager,
             @UserConfig final ConfigProvider identity,
             final ServiceManager serviceManager,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         return new PreferencesDialogModel(pluginPanel, themePanel, updatePanel, urlPanel,
                 configManager, identity, serviceManager, eventBus);
     }

ui_swing/src/test/java/com/dmdirc/addons/ui_swing/EventTriggeringFocusListenerTest.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.ui_swing;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.events.ClientFocusGainedEvent;
 import com.dmdirc.addons.ui_swing.events.ClientFocusLostEvent;
+import com.dmdirc.interfaces.EventBus;
 
 import java.awt.event.WindowEvent;
 
@@ -40,7 +40,7 @@ import static org.mockito.Mockito.verify;
 @RunWith(MockitoJUnitRunner.class)
 public class EventTriggeringFocusListenerTest {
 
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private WindowEvent windowEvent;
     private EventTriggeringFocusListener instance;
 

ui_web2/src/main/java/com/dmdirc/addons/ui_web2/WebSocketController.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_web2;
 
-import com.dmdirc.DMDircMBassador;
+import com.dmdirc.interfaces.EventBus;
 
 import java.io.IOException;
 import java.util.Collection;
@@ -46,11 +46,11 @@ public class WebSocketController {
     private final Collection<Session> sessions = new CopyOnWriteArrayList<>();
     private final Object sessionLock = new Object();
     private final AtomicBoolean subscribed = new AtomicBoolean(false);
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     private final InitialStateProducer initialStateProducer;
 
     @Inject
-    public WebSocketController(final DMDircMBassador eventBus, final InitialStateProducer initialStateProducer) {
+    public WebSocketController(final EventBus eventBus, final InitialStateProducer initialStateProducer) {
         this.eventBus = eventBus;
         this.initialStateProducer = initialStateProducer;
     }

whoisonquery/src/main/java/com/dmdirc/addons/whoisonquery/WhoisOnQueryManager.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.whoisonquery;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesSetting;
@@ -30,6 +29,7 @@ import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.ConnectionPrefsRequestedEvent;
 import com.dmdirc.events.QueryOpenedEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
@@ -48,12 +48,12 @@ public class WhoisOnQueryManager {
 
     private final String domain;
     private final PluginInfo pluginInfo;
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
 
     @Inject
     public WhoisOnQueryManager(@PluginDomain(WhoisOnQueryPlugin.class) final String domain,
             @PluginDomain(WhoisOnQueryPlugin.class) final PluginInfo pluginInfo,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         this.domain = domain;
         this.pluginInfo = pluginInfo;
         this.eventBus = eventBus;

whoisonquery/src/test/java/com/dmdirc/addons/whoisonquery/WhoisOnQueryManagerTest.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.whoisonquery;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Query;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
@@ -31,6 +30,7 @@ import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.ConnectionPrefsRequestedEvent;
 import com.dmdirc.events.QueryOpenedEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -56,7 +56,7 @@ import static org.mockito.Mockito.when;
 @RunWith(MockitoJUnitRunner.class)
 public class WhoisOnQueryManagerTest {
 
-    @Mock private DMDircMBassador eventBus;
+    @Mock private EventBus eventBus;
     @Mock private PluginInfo pluginInfo;
     @Mock private PluginMetaData pluginMetaData;
     @Mock private QueryOpenedEvent queryOpenedEvent;

windowflashing/src/main/java/com/dmdirc/addons/windowflashing/WindowFlashingManager.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.windowflashing;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.config.ConfigBinder;
 import com.dmdirc.config.ConfigBinding;
@@ -34,6 +33,7 @@ import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.addons.ui_swing.events.ClientFocusGainedEvent;
 import com.dmdirc.events.ClientPrefsOpenedEvent;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
@@ -56,7 +56,7 @@ public class WindowFlashingManager {
     /** Swing main frame. */
     private final MainFrame mainFrame;
     /** Event bus. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** Config binder. */
     private final ConfigBinder binder;
     /** Cached blink rate setting. */
@@ -81,7 +81,7 @@ public class WindowFlashingManager {
             @GlobalConfig final AggregateConfigProvider config,
             @PluginDomain(WindowFlashing.class) final PluginInfo pluginInfo,
             final MainFrame mainFrame,
-            final DMDircMBassador eventBus) {
+            final EventBus eventBus) {
         this.pluginInfo = pluginInfo;
         this.mainFrame = mainFrame;
         this.eventBus = eventBus;

windowstatus/src/main/java/com/dmdirc/addons/windowstatus/WindowStatusManager.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.windowstatus;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.EDTInvocation;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -42,6 +41,7 @@ import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.events.StatusBarComponentAddedEvent;
 import com.dmdirc.events.StatusBarComponentRemovedEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.EventBus;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.WindowModel;
@@ -64,7 +64,7 @@ public class WindowStatusManager {
     /** Config to read settings from. */
     private final ConfigBinder configBinder;
     /** The event bus to post events to. */
-    private final DMDircMBassador eventBus;
+    private final EventBus eventBus;
     /** The swing event bus to register for events on. */
     private final SwingEventBus swingEventBus;
     /** The panel we use in the status bar. */
@@ -80,7 +80,7 @@ public class WindowStatusManager {
     public WindowStatusManager(final ActiveFrameManager activeFrameManager,
             @GlobalConfig final AggregateConfigProvider config,
             @PluginDomain(WindowStatusPlugin.class) final String domain,
-            final DMDircMBassador eventBus,
+            final EventBus eventBus,
             final SwingEventBus swingEventBus,
             @PluginDomain(WindowStatusPlugin.class) final PluginInfo pluginInfo) {
         this.activeFrameManager = activeFrameManager;