Generify MBassador.

Change-Id: I4e9a1bff765c0bd62caf284a028932cd8461632c
Reviewed-on: http://gerrit.dmdirc.com/3772
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.contactlist;
 
 import com.dmdirc.Channel;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.events.ChannelUserAwayEvent;
@@ -35,7 +36,6 @@ import java.util.Collection;
 
 import javax.inject.Inject;
 
-import net.engio.mbassy.bus.MBassador;
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -46,7 +46,7 @@ public class ContactListListener implements NicklistListener, FrameCloseListener
     /** The channel this listener is for. */
     private final Channel channel;
     /** Event bus to register listeners with. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new ContactListListener for the specified channel.

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

@@ -22,13 +22,13 @@
 
 package com.dmdirc.addons.dcc;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.dcc.events.DccChatMessageEvent;
 import com.dmdirc.addons.dcc.events.DccChatSelfmessageEvent;
 import com.dmdirc.addons.dcc.events.DccChatSocketclosedEvent;
 import com.dmdirc.addons.dcc.events.DccChatSocketopenedEvent;
 import com.dmdirc.addons.dcc.io.DCCChat;
-import com.dmdirc.events.DisplayableEvent;
 import com.dmdirc.events.EventUtils;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -37,8 +37,6 @@ import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.util.URLBuilder;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.util.Arrays;
 
 import javax.annotation.Nullable;
@@ -55,7 +53,7 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
     /** Other Nickname. */
     private final String otherNickname;
     /** Event bus to post events on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of DCCChatWindow with a given DCCChat object.
@@ -83,7 +81,7 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
             final TabCompleterFactory tabCompleterFactory,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         super(parent, title, "dcc-chat-inactive", configManager,
                 new DCCCommandParser(configManager, commandController, eventBus),
                 messageSinkManager,
@@ -112,7 +110,7 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
     @Override
     public void sendLine(final String line) {
         if (dccChat.isWriteable()) {
-            final DisplayableEvent event = new DccChatSelfmessageEvent(this, line);
+            final DccChatSelfmessageEvent event = new DccChatSelfmessageEvent(this, line);
             final String format = EventUtils.postDisplayable(eventBus, event, "DCCChatSelfMessage");
             addLine(format, nickname, line);
             dccChat.sendLine(line);
@@ -123,14 +121,14 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
 
     @Override
     public void handleChatMessage(final DCCChat dcc, final String message) {
-        final DisplayableEvent event = new DccChatMessageEvent(this, otherNickname, message);
+        final DccChatMessageEvent event = new DccChatMessageEvent(this, otherNickname, message);
         final String format = EventUtils.postDisplayable(eventBus, event, "DCCChatMessage");
         addLine(format, otherNickname, message);
     }
 
     @Override
     public void socketClosed(final DCCChat dcc) {
-        final DisplayableEvent event = new DccChatSocketclosedEvent(this);
+        final DccChatSocketclosedEvent event = new DccChatSocketclosedEvent(this);
         final String format = EventUtils.postDisplayable(eventBus, event, "DCCChatInfo");
         addLine(format, "Socket closed");
         if (!isWindowClosing()) {
@@ -140,7 +138,7 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
 
     @Override
     public void socketOpened(final DCCChat dcc) {
-        final DisplayableEvent event = new DccChatSocketopenedEvent(this);
+        final DccChatSocketopenedEvent event = new DccChatSocketopenedEvent(this);
         final String format = EventUtils.postDisplayable(eventBus, event, "DCCChatInfo");
         addLine(format, "Socket opened");
         setIcon("dcc-chat-active");

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.dcc;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.dcc.events.DccChatRequestSentEvent;
 import com.dmdirc.addons.dcc.events.DccSendRequestEvent;
@@ -57,8 +58,6 @@ import javax.inject.Inject;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * This command allows starting dcc chats/file transfers.
  */
@@ -81,7 +80,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
     /** The URL builder to use when finding icons. */
     private final URLBuilder urlBuilder;
     /** The bus to dispatch events on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of DCCCommand.
@@ -104,7 +103,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
             final WindowManager windowManager,
             final TabCompleterFactory tabCompleterFactory,
             final URLBuilder urlBuilder,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         super(controller);
         this.mainWindow = mainWindow;
         myPlugin = plugin;

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

@@ -22,13 +22,12 @@
 
 package com.dmdirc.addons.dcc;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * DCC CommandParser.
  */
@@ -47,7 +46,7 @@ public class DCCCommandParser extends GlobalCommandParser {
     public DCCCommandParser(
             final AggregateConfigProvider configManager,
             final CommandController commandController,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         super(configManager, commandController, eventBus);
     }
 

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

@@ -30,7 +30,7 @@ import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.util.URLBuilder;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import java.util.Collection;
 
@@ -67,7 +67,7 @@ public abstract class DCCFrameContainer extends FrameContainer {
             final MessageSinkManager messageSinkManager,
             final TabCompleterFactory tabCompleterFactory,
             final URLBuilder urlBuilder,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final Collection<String> components) {
         super(parent, icon, title, title, configManager, urlBuilder, parser,
                 tabCompleterFactory.getTabCompleter(configManager),

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

@@ -67,7 +67,7 @@ import javax.inject.Singleton;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -95,7 +95,7 @@ public class DCCManager {
     /** The URL builder to use when finding icons. */
     private final URLBuilder urlBuilder;
     /** The bus to dispatch events on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of this plugin.
@@ -128,7 +128,7 @@ public class DCCManager {
             final SwingWindowFactory windowFactory,
             final ComponentFrameFactory componentFrameFactory,
             final URLBuilder urlBuilder,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final GlobalCommandParser commandParser,
             @Directory(DirectoryType.BASE) final String baseDirectory) {
         this.mainWindow = mainWindow;

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

@@ -22,14 +22,13 @@
 
 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.config.AggregateConfigProvider;
 import com.dmdirc.util.URLBuilder;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.awt.Dialog.ModalityType;
 import java.awt.Window;
 import java.util.Arrays;
@@ -58,7 +57,7 @@ public class PlaceholderContainer extends FrameContainer {
             final AggregateConfigProvider config,
             final Window parentWindow,
             final URLBuilder urlBuilder,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         super(null, "dcc", "DCCs", "DCCs", config, urlBuilder, eventBus,
                 Arrays.asList("com.dmdirc.addons.dcc.ui.PlaceholderPanel"));
         this.plugin = plugin;

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

@@ -42,7 +42,7 @@ import java.util.Date;
 
 import javax.swing.JOptionPane;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 /**
  * This class links DCC Send objects to a window.
@@ -74,7 +74,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 MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of DCCTransferWindow with a given DCCTransfer object.
@@ -91,7 +91,7 @@ public class TransferContainer extends FrameContainer implements
     public TransferContainer(final DCCManager plugin, final DCCTransfer dcc,
             final AggregateConfigProvider config, final String title,
             final String targetNick, final Connection connection,
-            final URLBuilder urlBuilder, final MBassador eventBus) {
+            final URLBuilder urlBuilder, final DMDircMBassador eventBus) {
         super(plugin.getContainer(), dcc.getType() == DCCTransfer.TransferType.SEND
                 ? "dcc-send-inactive" : "dcc-receive-inactive",
                 title, title, config, urlBuilder, eventBus,

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.dcc.ui;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.dcc.DCCTransferHandler;
 import com.dmdirc.addons.dcc.TransferContainer;
@@ -47,8 +48,6 @@ import javax.swing.JProgressBar;
 
 import net.miginfocom.swing.MigLayout;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * A panel for displaying the progress of DCC transfers.
  *
@@ -78,7 +77,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 MBassador errorBus;
+    private final DMDircMBassador errorBus;
 
     /**
      * Creates a new transfer window for the specified UI controller and owner.
@@ -86,7 +85,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 FrameContainer owner, final MBassador errorBus) {
+    public TransferPanel(final FrameContainer owner, final DMDircMBassador errorBus) {
         this.transferContainer = (TransferContainer) owner;
         this.errorBus = errorBus;
         dcc = transferContainer.getDCC();

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

@@ -24,6 +24,7 @@ package com.dmdirc.addons.debug.commands;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.CustomWindow;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
@@ -42,7 +43,6 @@ import java.lang.reflect.Method;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
-import net.engio.mbassy.bus.MBassador;
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -53,7 +53,7 @@ public class EventBusViewer extends DebugCommand {
     private final URLBuilder urlBuilder;
     private final AggregateConfigProvider globalConfig;
     private final WindowManager windowManager;
-    private final MBassador globalEventBus;
+    private final DMDircMBassador globalEventBus;
 
     /**
      * Creates a new instance of the command.
@@ -70,7 +70,7 @@ public class EventBusViewer extends DebugCommand {
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final URLBuilder urlBuilder,
             final WindowManager windowManager,
-            final MBassador globalEventBus) {
+            final DMDircMBassador globalEventBus) {
         super(commandProvider);
         this.globalConfig = globalConfig;
         this.urlBuilder = urlBuilder;
@@ -105,7 +105,7 @@ public class EventBusViewer extends DebugCommand {
             windowManager.addWindow(origin, window);
         }
 
-        final MBassador eventBus = isGlobal ? globalEventBus : origin.getEventBus();
+        final DMDircMBassador eventBus = isGlobal ? globalEventBus : origin.getEventBus();
         final WindowUpdater updater = new WindowUpdater(eventBus, window);
         eventBus.subscribe(updater);
         window.addCloseListener(updater);
@@ -116,10 +116,10 @@ public class EventBusViewer extends DebugCommand {
      */
     private static class WindowUpdater implements FrameCloseListener {
 
-        private final MBassador eventBus;
+        private final DMDircMBassador eventBus;
         private final FrameContainer target;
 
-        WindowUpdater(final MBassador eventBus, final FrameContainer target) {
+        WindowUpdater(final DMDircMBassador eventBus, final FrameContainer target) {
             this.eventBus = eventBus;
             this.target = target;
         }

src/com/dmdirc/addons/debug/commands/FakeError.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.debug.commands;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
@@ -36,15 +37,13 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * Creates DMDirc errors with the specified parameters.
  */
 public class FakeError extends DebugCommand implements IntelligentCommand {
 
     /** The event bus to post errors on . */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of the command.
@@ -53,7 +52,7 @@ public class FakeError extends DebugCommand implements IntelligentCommand {
      * @param eventBus        The event bus to post errors on
      */
     @Inject
-    public FakeError(final Provider<Debug> commandProvider, final MBassador eventBus) {
+    public FakeError(final Provider<Debug> commandProvider, final DMDircMBassador eventBus) {
         super(commandProvider);
         this.eventBus = eventBus;
     }

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

@@ -32,7 +32,7 @@ import com.dmdirc.events.FirstRunEvent;
 import javax.inject.Inject;
 import javax.inject.Provider;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 /**
  * Opens the DMDirc first run wizard.
@@ -40,7 +40,7 @@ import net.engio.mbassy.bus.MBassador;
 public class FirstRun extends DebugCommand {
 
     /** Event bus to trigger first run event on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador 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 MBassador eventBus) {
+    public FirstRun(final Provider<Debug> commandProvider, final DMDircMBassador eventBus) {
         super(commandProvider);
 
         this.eventBus = eventBus;

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

@@ -34,7 +34,7 @@ import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.manager.CachingUpdateManager;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import javax.inject.Inject;
 import javax.inject.Provider;
@@ -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 MBassador eventBus;
+    private final DMDircMBassador 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 MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         super(commandProvider);
 
         this.globalConfig = globalConfig;

src/com/dmdirc/addons/exec/ExecCommand.java

@@ -41,7 +41,7 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 /**
  * A command which allows users execute scripts.
@@ -53,7 +53,7 @@ public class ExecCommand extends Command {
             "exec <command> [<parameters>] - executes an external program "
             + "and displays the output", CommandType.TYPE_GLOBAL);
     /** Event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of this command.
@@ -62,7 +62,7 @@ public class ExecCommand extends Command {
      * @param eventBus   The event bus to post errors to
      */
     @Inject
-    public ExecCommand(final CommandController controller, final MBassador eventBus) {
+    public ExecCommand(final CommandController controller, final DMDircMBassador eventBus) {
         super(controller);
         this.eventBus = eventBus;
     }

src/com/dmdirc/addons/freedesktop_notifications/FDManager.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.freedesktop_notifications;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
@@ -42,8 +43,6 @@ import java.io.IOException;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import net.engio.mbassy.bus.MBassador;
-
 @Singleton
 public class FDManager implements ConfigChangeListener {
 
@@ -56,7 +55,7 @@ public class FDManager implements ConfigChangeListener {
     /** Plugin files helper. */
     private final PluginFilesHelper filesHelper;
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** notification timeout. */
     private int timeout;
     /** notification icon. */
@@ -72,7 +71,7 @@ public class FDManager implements ConfigChangeListener {
             @UserConfig final ConfigProvider userConfig,
             @PluginDomain(FreeDesktopNotificationsPlugin.class) final String domain,
             final PluginFilesHelper filesHelper,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.domain = domain;
         this.config = config;
         this.userConfig = userConfig;

src/com/dmdirc/addons/identd/IdentClient.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.identd;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.ServerManager;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.Connection;
@@ -35,15 +36,13 @@ import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.net.Socket;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * The IdentClient responds to an ident request.
  */
 public class IdentClient implements Runnable {
 
     /** The event bus to post errors on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** The IdentdServer that owns this Client. */
     private final IdentdServer server;
     /** The Socket that we are in charge of. */
@@ -67,7 +66,7 @@ public class IdentClient implements Runnable {
      * @param config        Global config to read settings from
      * @param domain        This plugin's settings domain
      */
-    public IdentClient(final MBassador eventBus, final IdentdServer server, final Socket socket,
+    public IdentClient(final DMDircMBassador eventBus, final IdentdServer server, final Socket socket,
             final ServerManager serverManager, final AggregateConfigProvider config,
             final String domain) {
         this.eventBus = eventBus;

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

@@ -35,7 +35,7 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 import net.engio.mbassy.listener.Handler;
 
 public class IdentdManager {
@@ -49,12 +49,12 @@ public class IdentdManager {
     /** Ident server. */
     private final IdentdServer server;
     /** Event bus to subscribe to events on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     @Inject
     public IdentdManager(@GlobalConfig final AggregateConfigProvider config,
             @PluginDomain(IdentdPlugin.class) final String domain,
-            final IdentdServer server, final MBassador eventBus) {
+            final IdentdServer server, final DMDircMBassador eventBus) {
         connections = new ArrayList<>();
         this.config = config;
         this.domain = domain;

src/com/dmdirc/addons/identd/IdentdServer.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.identd;
 
 import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.ServerManager;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -37,15 +38,13 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * The IdentdServer watches over the ident port when required
  */
 public final class IdentdServer implements Runnable {
 
     /** The event bus to post errors on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** The Thread in use for this server */
     private volatile Thread myThread = null;
     /** The current socket in use for this server */
@@ -70,7 +69,7 @@ public final class IdentdServer implements Runnable {
      * @param domain        This plugin's setting domain
      */
     @Inject
-    public IdentdServer(final MBassador eventBus,
+    public IdentdServer(final DMDircMBassador eventBus,
             final ServerManager serverManager,
             @GlobalConfig final AggregateConfigProvider config,
             @PluginDomain(IdentdPlugin.class) final String domain) {

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.lagdisplay;
 
 import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
@@ -50,7 +51,6 @@ import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 
-import net.engio.mbassy.bus.MBassador;
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -60,7 +60,7 @@ import net.engio.mbassy.listener.Handler;
 public class LagDisplayManager implements ConfigChangeListener, SelectionListener {
 
     /** Event bus to receive events on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** Active frame manager. */
     private final ActiveFrameManager activeFrameManager;
     /** Status bar to add panels to. */
@@ -85,7 +85,7 @@ public class LagDisplayManager implements ConfigChangeListener, SelectionListene
 
     @Inject
     public LagDisplayManager(
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final ActiveFrameManager activeFrameManager,
             final SwingStatusBar statusBar,
             final Provider<LagDisplayPanel> panelProvider,

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

@@ -29,7 +29,7 @@ import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.io.ReverseFileReader;
 
 import com.google.common.base.Optional;
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import java.util.Arrays;
 
@@ -53,7 +53,7 @@ public class HistoryWindow extends FrameContainer {
             final ReverseFileReader reader,
             final FrameContainer parent,
             final URLBuilder urlBuilder,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final int numLines) {
         super(parent, "raw", title, title, parent.getConfigManager(), urlBuilder, eventBus,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));

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

@@ -83,7 +83,7 @@ import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -105,7 +105,7 @@ public class LoggingManager implements ConfigChangeListener {
     private final Map<String, OpenFile> openFiles = Collections.synchronizedMap(
             new HashMap<String, OpenFile>());
     private final URLBuilder urlBuilder;
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     private final Provider<String> directoryProvider;
     /** Timer used to close idle files. */
     private Timer idleFileTimer;
@@ -129,7 +129,7 @@ public class LoggingManager implements ConfigChangeListener {
     @Inject
     public LoggingManager(@PluginDomain(LoggingPlugin.class) final String domain,
             @GlobalConfig final AggregateConfigProvider globalConfig,
-            final WindowManager windowManager, final URLBuilder urlBuilder, final MBassador eventBus,
+            final WindowManager windowManager, final URLBuilder urlBuilder, final DMDircMBassador eventBus,
             @Directory(LoggingModule.LOGS_DIRECTORY) final Provider<String> directoryProvider) {
         this.domain = domain;
         this.config = globalConfig;

src/com/dmdirc/addons/mediasource_dbus/DBusMediaSourceManager.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.mediasource_dbus;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.nowplaying.MediaSource;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
@@ -37,8 +38,6 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * Provides a media source for DBUS players.
  */
@@ -47,14 +46,14 @@ public class DBusMediaSourceManager {
     /** A map of discovered mpris sources. */
     private final Map<String, MediaSource> mprisSources;
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** The sources used by this media source. */
     private final List<MediaSource> sources;
     /** The path to qdbus. */
     private String qdbus;
 
     @Inject
-    public DBusMediaSourceManager(final MBassador eventBus) {
+    public DBusMediaSourceManager(final DMDircMBassador eventBus) {
         this.eventBus = eventBus;
         sources = new ArrayList<>();
         mprisSources = new HashMap<>();

src/com/dmdirc/addons/mediasource_linux_title/TitleMediaSource.java

@@ -31,7 +31,7 @@ import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 /**
  * Provides a media source for Linux players using the `xwininfo` command.
@@ -39,7 +39,7 @@ import net.engio.mbassy.bus.MBassador;
 public class TitleMediaSource implements MediaSource {
 
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** The command to use to get the title. */
     private final String command;
     /** The name of the player we're retrieving. */
@@ -52,7 +52,7 @@ public class TitleMediaSource implements MediaSource {
      * @param command  The command to be executed
      * @param name     The name of the media source
      */
-    public TitleMediaSource(final MBassador eventBus, final String command, final String name) {
+    public TitleMediaSource(final DMDircMBassador eventBus, final String command, final String name) {
         this.eventBus = eventBus;
         this.command = command;
         this.name = name;

src/com/dmdirc/addons/mediasource_linux_title/TitleMediaSourceManager.java

@@ -22,10 +22,9 @@
 
 package com.dmdirc.addons.mediasource_linux_title;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.nowplaying.MediaSource;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -40,10 +39,10 @@ public class TitleMediaSourceManager {
     /** The sources to be returned. */
     private List<MediaSource> sources = null;
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     @Inject
-    public TitleMediaSourceManager(final MBassador eventBus) {
+    public TitleMediaSourceManager(final DMDircMBassador eventBus) {
         this.eventBus = eventBus;
     }
 

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

@@ -42,7 +42,7 @@ import java.util.Map;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -58,7 +58,7 @@ public class NickColourManager implements ConfigChangeListener {
     /** Plugin's setting domain. */
     private final String domain;
     /** Event bus to subscribe to events on . */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** "Random" colours to use to colour nicknames. */
     private String[] randColours = new String[]{
         "E90E7F", "8E55E9", "B30E0E", "18B33C", "58ADB3", "9E54B3", "B39875", "3176B3",};
@@ -71,7 +71,7 @@ public class NickColourManager implements ConfigChangeListener {
     @Inject
     public NickColourManager(final ColourManager colourManager,
             @PluginDomain(NickColourPlugin.class) final String domain,
-            @GlobalConfig final AggregateConfigProvider globalConfig, final MBassador eventBus) {
+            @GlobalConfig final AggregateConfigProvider globalConfig, final DMDircMBassador eventBus) {
         this.domain = domain;
         this.globalConfig = globalConfig;
         this.colourManager = colourManager;

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

@@ -35,7 +35,7 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 import net.engio.mbassy.listener.Handler;
 
 public class NotificationsManager {
@@ -51,11 +51,11 @@ public class NotificationsManager {
     /** Plugin manager. */
     private final PluginManager pluginManager;
     /** Event bus to listen for events on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     @Inject
     public NotificationsManager(@PluginDomain(NotificationsPlugin.class) final String domain,
-            @GlobalConfig final AggregateConfigProvider globalConfig, final MBassador eventBus,
+            @GlobalConfig final AggregateConfigProvider globalConfig, final DMDircMBassador eventBus,
             final PluginManager pluginManager) {
         this.domain = domain;
         this.globalConfig = globalConfig;

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

@@ -37,7 +37,7 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 import net.engio.mbassy.listener.Handler;
 
 public class NowPlayingManager {
@@ -47,7 +47,7 @@ public class NowPlayingManager {
     /** Global configuration to read settings from. */
     private final AggregateConfigProvider globalConfig;
     /** Event bus to subscribe to events on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** This plugin's settings domain. */
     private final String domain;
     /** The sources that we know of. */
@@ -58,7 +58,7 @@ public class NowPlayingManager {
     private List<String> order;
 
     @Inject
-    public NowPlayingManager(final PluginManager pluginManager, final MBassador eventBus,
+    public NowPlayingManager(final PluginManager pluginManager, final DMDircMBassador eventBus,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             @PluginDomain(NowPlayingPlugin.class) final String domain) {
         this.pluginManager = pluginManager;

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.parserdebug;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.interfaces.Parser;
@@ -29,8 +30,6 @@ import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.util.URLBuilder;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.util.Arrays;
 
 /**
@@ -61,7 +60,7 @@ public class DebugWindow extends FrameContainer {
             final Parser parser,
             final Connection connection,
             final URLBuilder urlBuilder,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         super(connection.getWindowModel(), "raw", "Parser Debug", title,
                 connection.getWindowModel().getConfigManager(),
                 urlBuilder, eventBus, Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.parserdebug;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ServerDisconnectedEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.common.CallbackNotFoundException;
@@ -36,13 +37,12 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
-import net.engio.mbassy.bus.MBassador;
 import net.engio.mbassy.listener.Handler;
 
 public class ParserDebugManager implements DebugInfoListener {
 
     /** Event bus to subscribe to events on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** Map of parsers registered. */
     protected final Map<Parser, DebugWindow> registeredParsers;
     /** URL Builder. */
@@ -54,7 +54,7 @@ public class ParserDebugManager implements DebugInfoListener {
     public ParserDebugManager(
             final URLBuilder urlBuilder,
             final WindowManager windowManager,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.urlBuilder = urlBuilder;
         this.windowManager = windowManager;
         this.eventBus = eventBus;

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

@@ -28,7 +28,7 @@ import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.messages.Formatter;
 import com.dmdirc.util.URLBuilder;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import java.util.Collections;
 import java.util.Date;
@@ -52,7 +52,7 @@ public class FakeWriteableFrameContainer extends FrameContainer {
     public FakeWriteableFrameContainer(
             final FrameContainer target,
             final MessageSinkManager messageSinkManager,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final URLBuilder urlBuilder) {
         super(target, target.getIcon(), target.getName(), target.getTitle(),
                 target.getConfigManager(), urlBuilder, target.getCommandParser(),

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.redirect;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
@@ -36,8 +37,6 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.util.URLBuilder;
 
-import net.engio.mbassy.bus.MBassador;
-
 import javax.inject.Inject;
 
 /**
@@ -56,7 +55,7 @@ public class RedirectCommand extends Command implements IntelligentCommand {
     /** The URL builder to use when finding icons. */
     private final URLBuilder urlBuilder;
     /** The bus to dispatch events on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of this command.
@@ -71,7 +70,7 @@ public class RedirectCommand extends Command implements IntelligentCommand {
             final CommandController controller,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         super(controller);
         this.messageSinkManager = messageSinkManager;
         this.urlBuilder = urlBuilder;

src/com/dmdirc/addons/scriptplugin/ScriptCommand.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.scriptplugin;
 
 import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandparser.BaseCommandInfo;
@@ -37,8 +38,6 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.FileWriter;
@@ -69,7 +68,7 @@ public class ScriptCommand extends Command implements IntelligentCommand {
     /** Script manager to handle scripts. */
     private final ScriptManager scriptManager;
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of this command.
@@ -84,7 +83,7 @@ public class ScriptCommand extends Command implements IntelligentCommand {
      */
     @Inject
     public ScriptCommand(final ScriptManager scriptManager,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             @Directory(ScriptModule.SCRIPTS) final String scriptDirectory,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final CommandController commandController,

src/com/dmdirc/addons/scriptplugin/ScriptEngineWrapper.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.scriptplugin;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 
@@ -37,15 +38,13 @@ import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * Class to create script engines!
  */
 public class ScriptEngineWrapper {
 
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** The Script Engine this wrapper wraps */
     private ScriptEngine engine;
     /** The File this script is from */
@@ -66,7 +65,7 @@ public class ScriptEngineWrapper {
      * @throws javax.script.ScriptException  If there was an error during creation
      */
     protected ScriptEngineWrapper(final ScriptEngineManager scriptEngineManager,
-            final MBassador eventBus, final String filename)
+            final DMDircMBassador eventBus, final String filename)
             throws FileNotFoundException, ScriptException {
         Preconditions.checkNotNull(filename, "File cannot be null");
         this.eventBus = eventBus;

src/com/dmdirc/addons/scriptplugin/ScriptManager.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.scriptplugin;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
@@ -38,8 +39,6 @@ import javax.inject.Inject;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 
-import net.engio.mbassy.bus.MBassador;
-
 public class ScriptManager {
 
     /** Script engine manager. */
@@ -49,12 +48,12 @@ public class ScriptManager {
     /** Store Script State Name,Engine */
     private final Map<String, ScriptEngineWrapper> scripts = new HashMap<>();
     /** The event bus to post events to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     @Inject
     public ScriptManager(final ScriptEngineManager scriptEngineManager,
             @Directory(ScriptModule.SCRIPTS) final String scriptDirectory,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.scriptEngineManager = scriptEngineManager;
         this.scriptDirectory = scriptDirectory;
         this.eventBus = eventBus;

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

@@ -40,18 +40,18 @@ import java.util.List;
 import javax.inject.Inject;
 import javax.script.ScriptEngineManager;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 import net.engio.mbassy.listener.Handler;
 
 public class ScriptPluginManager {
 
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     private final String scriptDir;
     private final ScriptManager scriptManager;
     private final TypedProperties globalVariables;
 
     @Inject
-    public ScriptPluginManager(final MBassador eventBus,
+    public ScriptPluginManager(final DMDircMBassador eventBus,
             @Directory(ScriptModule.SCRIPTS) final String scriptDir,
             final ScriptManager scriptManager,
             final ScriptEngineManager scriptEngineManager) {

src/com/dmdirc/addons/serverlists/ServerList.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.serverlists;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Precondition;
 import com.dmdirc.ServerManager;
 import com.dmdirc.addons.serverlists.io.ServerGroupReader;
@@ -33,8 +34,6 @@ import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.plugins.PluginManager;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -74,7 +73,7 @@ public class ServerList implements ConfigProviderListener {
             final ServerManager serverManager,
             final IdentityController identityController,
             final IdentityFactory identityFactory,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.serverManager = serverManager;
         this.identityController = identityController;
         this.identityFactory = identityFactory;

src/com/dmdirc/addons/serverlists/service/ServerListServiceProvider.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.serverlists.service;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.ParserFactory;
 import com.dmdirc.addons.serverlists.ServerGroup;
 import com.dmdirc.addons.serverlists.ServerGroupItem;
@@ -33,8 +34,6 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.Service;
 import com.dmdirc.plugins.ServiceProvider;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.net.URI;
 import java.util.Arrays;
 import java.util.List;
@@ -54,7 +53,7 @@ public class ServerListServiceProvider implements ServiceProvider {
     /** Plugin Manager */
     private final PluginManager pluginManager;
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new server list service provider.
@@ -64,7 +63,7 @@ public class ServerListServiceProvider implements ServiceProvider {
      * @param eventBus      The event bus to post errors to
      */
     public ServerListServiceProvider(final PluginManager pluginManager, final ServerList serverList,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.serverList = serverList;
         this.pluginManager = pluginManager;
         this.eventBus = eventBus;

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.systray;
 
 import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.events.ClientMinimisedEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -43,7 +44,6 @@ import java.awt.event.MouseListener;
 
 import javax.inject.Inject;
 
-import net.engio.mbassy.bus.MBassador;
 import net.engio.mbassy.listener.Handler;
 
 public class SystrayManager implements ActionListener, MouseListener {
@@ -57,7 +57,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 MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** The tray icon we're currently using. */
     private TrayIcon icon;
 
@@ -67,7 +67,7 @@ public class SystrayManager implements ActionListener, MouseListener {
             @PluginDomain(SystrayPlugin.class) final String domain,
             final MainFrame mainFrame,
             @GlobalConfig final IconManager iconManager,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.globalConfig = globalConfig;
         this.domain = domain;
         this.mainFrame = mainFrame;

src/com/dmdirc/addons/time/TimedCommand.java

@@ -22,13 +22,12 @@
 
 package com.dmdirc.addons.time;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.interfaces.CommandController;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -52,7 +51,7 @@ public class TimedCommand extends TimerTask {
     /** The command controller to use when executing global commands. */
     private final CommandController commandController;
     /** Event bus to post events on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of TimedCommand.
@@ -74,7 +73,7 @@ public class TimedCommand extends TimerTask {
             final int delay,
             final String command,
             final FrameContainer origin,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.commandController = commandController;
         this.timerKey = timerKey;
         this.repetitions = repetitions;

src/com/dmdirc/addons/time/TimerManager.java

@@ -22,12 +22,11 @@
 
 package com.dmdirc.addons.time;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.CommandController;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.util.Calendar;
 import java.util.HashMap;
 import java.util.Map;
@@ -50,7 +49,7 @@ public class TimerManager {
     /** Action controller. */
     private final ActionController actionController;
     /** Event bus to post events on . */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** Have we registered our types already? */
     private static boolean registered;
     /** The timer to use for scheduling. */
@@ -59,7 +58,7 @@ public class TimerManager {
     @Inject
     public TimerManager(final CommandController commandController,
             final ActionController actionController,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.commandController = commandController;
         this.actionController = actionController;
         this.eventBus = eventBus;

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
 import com.dmdirc.events.ClientOpenedEvent;
@@ -51,7 +52,6 @@ import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
 import javax.swing.UIManager;
 
-import net.engio.mbassy.bus.MBassador;
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -75,7 +75,7 @@ public class Apple implements InvocationHandler {
     /** The server manager to use to connect to URLs. */
     private final ServerManager serverManager;
     /** Event bus. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of {@link Apple}.
@@ -91,7 +91,7 @@ public class Apple implements InvocationHandler {
     public Apple(
             @GlobalConfig final AggregateConfigProvider configManager,
             final ServerManager serverManager,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.configManager = configManager;
         this.serverManager = serverManager;
         this.eventBus = eventBus;

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

@@ -45,7 +45,7 @@ import javax.swing.MenuSelectionManager;
 import javax.swing.SwingUtilities;
 import javax.swing.text.JTextComponent;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 /**
  * Custom event queue to add common functionality to certain components.
@@ -54,12 +54,12 @@ import net.engio.mbassy.bus.MBassador;
 public class DMDircEventQueue extends EventQueue {
 
     /** Event bus to dispatch events to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** Clipboard to copy and paste from. */
     private final Clipboard clipboard;
 
     @Inject
-    public DMDircEventQueue(final MBassador eventBus, final Clipboard clipboard) {
+    public DMDircEventQueue(final DMDircMBassador eventBus, final Clipboard clipboard) {
         this.eventBus = eventBus;
         this.clipboard = clipboard;
     }

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.components.SplitPane;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
@@ -65,7 +66,6 @@ import javax.swing.WindowConstants;
 
 import net.miginfocom.swing.MigLayout;
 
-import net.engio.mbassy.bus.MBassador;
 import net.engio.mbassy.listener.Handler;
 
 import static com.dmdirc.addons.ui_swing.SwingPreconditions.checkOnEDT;
@@ -99,7 +99,7 @@ public class MainFrame extends JFrame implements WindowListener,
     /** Provider of frame managers. */
     private final Provider<FrameManager> frameManagerProvider;
     /** The bus to despatch events on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** The main application icon. */
     private ImageIcon imageIcon;
     /** The frame manager that's being used. */
@@ -143,7 +143,7 @@ public class MainFrame extends JFrame implements WindowListener,
             final Provider<QuitWorker> quitWorker,
             final IconManager iconManager,
             final Provider<FrameManager> frameManagerProvider,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         checkOnEDT();
         this.apple = apple;
         this.lifecycleController = lifecycleController;

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

@@ -23,6 +23,7 @@
 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.OptionalJSpinner;
@@ -39,8 +40,6 @@ import com.dmdirc.util.validators.NumericalValidator;
 import com.dmdirc.util.validators.OptionalValidator;
 import com.dmdirc.util.validators.Validator;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.awt.Dimension;
 import java.awt.Font;
 import java.awt.event.ActionEvent;
@@ -78,7 +77,7 @@ public final class PrefsComponentFactory {
     /** The colour manager to use for colour preferences. */
     private final ColourManager colourManager;
     /** The global event bus. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of PrefsComponentFactory.
@@ -89,7 +88,7 @@ public final class PrefsComponentFactory {
      */
     @Inject
     public PrefsComponentFactory(
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             @GlobalConfig final IconManager iconManager,
             final ColourManager colourManager) {
         this.iconManager = iconManager;

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

@@ -31,7 +31,7 @@ import com.dmdirc.interfaces.config.IdentityController;
 import javax.inject.Inject;
 import javax.swing.SwingWorker;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 /**
  * Worker which handles quitting the application on behalf of a {@link MainFrame}.
@@ -47,7 +47,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 MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new {@link QuitWorker}.
@@ -62,7 +62,7 @@ public class QuitWorker extends SwingWorker<Void, Void> {
             final IdentityController identityController,
             final ServerManager serverManager,
             final MainFrame mainFrame,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.globalIdentity = identityController.getUserSettings();
         this.globalConfig = identityController.getGlobalConfiguration();
         this.serverManager = serverManager;

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

@@ -22,6 +22,7 @@
 
 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;
@@ -48,7 +49,6 @@ import javax.inject.Provider;
 import javax.inject.Singleton;
 import javax.swing.SwingUtilities;
 
-import net.engio.mbassy.bus.MBassador;
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -76,9 +76,9 @@ public class SwingManager {
     /** Link handler for swing links. */
     private final SwingLinkHandler linkHandler;
     /** Bus to listen on for events. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** The event bus for this plugin. */
-    private final MBassador swingEventBus;
+    private final DMDircMBassador swingEventBus;
     /** The provider to use to create tree-based frame managers. */
     private final TreeFrameManagerProvider treeProvider;
     /** The provider to use to create button-based frame managers. */
@@ -128,8 +128,8 @@ public class SwingManager {
             final Provider<FeedbackNag> feedbackNagProvider,
             final URLDialogFactory urlDialogFactory,
             final SwingLinkHandler linkHandler,
-            final MBassador eventBus,
-            @SwingEventBus final MBassador swingEventBus,
+            final DMDircMBassador eventBus,
+            @SwingEventBus final DMDircMBassador swingEventBus,
             final TreeFrameManagerProvider treeProvider,
             final ButtonBarProvider buttonProvider,
             final Provider<SwingWindowManager> swingWindowManager,

src/com/dmdirc/addons/ui_swing/SwingUIInitialiser.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.ClientModule.AddonConfig;
 import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.dialogs.DialogKeyListener;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -40,8 +41,6 @@ import javax.swing.UnsupportedLookAndFeelException;
 
 import net.miginfocom.layout.PlatformDefaults;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * Initialises swing and system UI settings.
  */
@@ -52,10 +51,10 @@ public class SwingUIInitialiser {
     private final ConfigProvider addonConfig;
     private final DialogKeyListener dialogKeyListener;
     private final DMDircEventQueue eventQueue;
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     @Inject
-    public SwingUIInitialiser(final MBassador eventBus, final Apple apple,
+    public SwingUIInitialiser(final DMDircMBassador eventBus, final Apple apple,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             @AddonConfig final ConfigProvider addonConfig,
             final DialogKeyListener dialogKeyListener,

src/com/dmdirc/addons/ui_swing/SwingWindowFactory.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.components.frames.ChannelFrameFactory;
 import com.dmdirc.addons.ui_swing.components.frames.CustomFrameFactory;
@@ -48,8 +49,6 @@ import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * Handles creation of windows in the Swing UI.
  *
@@ -65,9 +64,9 @@ public class SwingWindowFactory implements FrameListener {
     /** Active window manager. */
     private final Provider<ActiveFrameManager> activeFrameManager;
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** The swing event bus. */
-    private final MBassador swingEventBus;
+    private final DMDircMBassador swingEventBus;
 
     /**
      * Creates a new window factory for the specified controller.
@@ -87,8 +86,8 @@ public class SwingWindowFactory implements FrameListener {
             final CustomInputFrameFactory customInputFrameFactory,
             final ServerFrameFactory serverFrameFactory,
             final ChannelFrameFactory channelFrameFactory,
-            final MBassador eventBus,
-            @SwingEventBus final MBassador swingEventBus) {
+            final DMDircMBassador eventBus,
+            @SwingEventBus final DMDircMBassador swingEventBus) {
         this.activeFrameManager = activeFrameManager;
         this.eventBus = eventBus;
         this.swingEventBus = swingEventBus;

src/com/dmdirc/addons/ui_swing/UIUtilities.java

@@ -22,13 +22,12 @@
 
 package com.dmdirc.addons.ui_swing;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.actions.RedoAction;
 import com.dmdirc.addons.ui_swing.actions.UndoAction;
 import com.dmdirc.addons.ui_swing.components.DMDircUndoableEditListener;
 import com.dmdirc.ui.Colour;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.awt.Color;
 import java.awt.Font;
 import java.awt.FontMetrics;
@@ -91,7 +90,7 @@ public final class UIUtilities {
      * @param eventBus  The event bus to post errors to
      * @param component The text component to add an undo manager to
      */
-    public static void addUndoManager(final MBassador eventBus, final JTextComponent component) {
+    public static void addUndoManager(final DMDircMBassador eventBus, final JTextComponent component) {
         final UndoManager undoManager = new UndoManager();
 
         // Listen for undo and redo events

src/com/dmdirc/addons/ui_swing/actions/RedoAction.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.actions;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 
@@ -31,8 +32,6 @@ import javax.swing.AbstractAction;
 import javax.swing.undo.CannotUndoException;
 import javax.swing.undo.UndoManager;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * Handles redo's on text components.
  */
@@ -43,7 +42,7 @@ public final class RedoAction extends AbstractAction {
     /** Undo manager. */
     private final UndoManager undoManager;
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of RedoAction.
@@ -51,7 +50,7 @@ public final class RedoAction extends AbstractAction {
      * @param eventBus    The event bus to post errors to
      * @param undoManager UndoManager to use for this redo action
      */
-    public RedoAction(final MBassador eventBus, final UndoManager undoManager) {
+    public RedoAction(final DMDircMBassador eventBus, final UndoManager undoManager) {
         super("Undo");
 
         this.undoManager = undoManager;

src/com/dmdirc/addons/ui_swing/actions/ReplacePasteAction.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.actions;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 
@@ -34,8 +35,6 @@ import java.io.IOException;
 import javax.swing.AbstractAction;
 import javax.swing.text.JTextComponent;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * Paste action that replaces matching regexes.
  */
@@ -50,7 +49,7 @@ public final class ReplacePasteAction extends AbstractAction {
     /** Replacement string. */
     private final String replacementString;
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of regex replacement paste action.
@@ -60,7 +59,7 @@ public final class ReplacePasteAction extends AbstractAction {
      * @param replacementRegex  Regex to match for replacement
      * @param replacementString Replacement string
      */
-    public ReplacePasteAction(final MBassador eventBus, final Clipboard clipboard,
+    public ReplacePasteAction(final DMDircMBassador eventBus, final Clipboard clipboard,
             final String replacementRegex, final String replacementString) {
         super("NoSpacesPasteAction");
 

src/com/dmdirc/addons/ui_swing/actions/UndoAction.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.actions;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 
@@ -31,8 +32,6 @@ import javax.swing.AbstractAction;
 import javax.swing.undo.CannotUndoException;
 import javax.swing.undo.UndoManager;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * Handles undo's on text components.
  */
@@ -43,7 +42,7 @@ public final class UndoAction extends AbstractAction {
     /** Undo manager. */
     private final UndoManager undoManager;
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of UndoAction.
@@ -51,7 +50,7 @@ public final class UndoAction extends AbstractAction {
      * @param eventBus    The event bus to post errors to
      * @param undoManager UndoManager to use for this redo action
      */
-    public UndoAction(final MBassador eventBus, final UndoManager undoManager) {
+    public UndoAction(final DMDircMBassador eventBus, final UndoManager undoManager) {
         super("Undo");
 
         this.undoManager = undoManager;

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.components.renderers.FontListCellRenderer;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
@@ -34,8 +35,6 @@ import javax.swing.DefaultComboBoxModel;
 import javax.swing.JComboBox;
 import javax.swing.SwingUtilities;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * System font picking component.
  */
@@ -52,7 +51,7 @@ public class FontPicker extends JComboBox<Object> {
      * @param eventBus   The event bus to post errors to
      * @param fontFamily Font family
      */
-    public FontPicker(final MBassador eventBus, final String fontFamily) {
+    public FontPicker(final DMDircMBassador eventBus, final String fontFamily) {
         super(new DefaultComboBoxModel<>());
         this.fontFamily = fontFamily;
 

src/com/dmdirc/addons/ui_swing/components/LoggingSwingWorker.java

@@ -29,7 +29,7 @@ import java.util.concurrent.ExecutionException;
 
 import javax.swing.SwingWorker;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 /**
  * Logging swing worker.
@@ -39,14 +39,14 @@ import net.engio.mbassy.bus.MBassador;
  */
 public abstract class LoggingSwingWorker<T, V> extends SwingWorker<T, V> {
 
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new logging swing worker.
      *
      * @param eventBus Event bus to post errors to.
      */
-    public LoggingSwingWorker(final MBassador eventBus) {
+    public LoggingSwingWorker(final DMDircMBassador eventBus) {
         this.eventBus = eventBus;
     }
 

src/com/dmdirc/addons/ui_swing/components/MDIBar.java

@@ -45,7 +45,7 @@ import javax.swing.SwingUtilities;
 
 import net.miginfocom.swing.MigLayout;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -84,7 +84,7 @@ public class MDIBar extends JPanel implements SelectionListener, ActionListener,
             @GlobalConfig final IconManager iconManager,
             @PluginDomain(SwingController.class) final String domain,
             final ActiveFrameManager activeFrameManager,
-            @SwingEventBus final MBassador eventBus) {
+            @SwingEventBus final DMDircMBassador eventBus) {
         this.activeFrameManager = activeFrameManager;
         config = globalConfig;
         configDomain = domain;

src/com/dmdirc/addons/ui_swing/components/TopicBar.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.Channel;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Topic;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.ReplacePasteAction;
@@ -40,7 +41,6 @@ import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.Styliser;
 
 import com.google.common.base.Optional;
-import net.engio.mbassy.bus.MBassador;
 
 import java.awt.Color;
 import java.awt.Window;
@@ -131,7 +131,7 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
             final Channel channel,
             final ChannelFrame window,
             final IconManager iconManager,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.channel = channel;
         this.domain = domain;
         this.colourManager = colourManager;

src/com/dmdirc/addons/ui_swing/components/TopicBarFactory.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.Channel;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.frames.ChannelFrame;
 import com.dmdirc.addons.ui_swing.injection.MainWindow;
@@ -33,8 +34,6 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.awt.Window;
 import java.awt.datatransfer.Clipboard;
 
@@ -57,7 +56,7 @@ public class TopicBarFactory {
     private final PluginManager pluginManager;
     private final Clipboard clipboard;
     private final CommandController commandController;
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     @Inject
     public TopicBarFactory(
@@ -68,7 +67,7 @@ public class TopicBarFactory {
             final PluginManager pluginManager,
             final Clipboard clipboard,
             final CommandController commandController,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.parentWindow = parentWindow;
         this.globalConfig = globalConfig;
         this.domain = domain;

src/com/dmdirc/addons/ui_swing/components/addonbrowser/DataLoaderWorker.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
 import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
@@ -54,8 +55,6 @@ import javax.swing.text.StyleConstants;
 
 import net.miginfocom.swing.MigLayout;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * Loads the addon data feed into the addon browser.
  */
@@ -86,7 +85,7 @@ public class DataLoaderWorker
     /** Downloader to download files. */
     private final Downloader downloader;
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new data loader worker.
@@ -110,7 +109,7 @@ public class DataLoaderWorker
             final InstallWorkerFactory workerFactory,
             final UpdateManager updateManager,
             @Directory(DirectoryType.TEMPORARY) final String tempDirectory,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final AddonTable table,
             final boolean download,
             final BrowserWindow browserWindow,

src/com/dmdirc/addons/ui_swing/components/addonbrowser/DataLoaderWorkerFactory.java

@@ -23,14 +23,13 @@
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
 import com.dmdirc.ClientModule;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandline.CommandLineOptionsModule;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.updater.manager.UpdateManager;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.io.Downloader;
 
-import net.engio.mbassy.bus.MBassador;
-
 import javax.inject.Inject;
 import javax.swing.JScrollPane;
 
@@ -45,7 +44,7 @@ public class DataLoaderWorkerFactory {
     private final InstallWorkerFactory workerFactory;
     private final UpdateManager updateManager;
     private final String tempDirectory;
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     @Inject
     public DataLoaderWorkerFactory(final Downloader downloader,
@@ -53,7 +52,7 @@ public class DataLoaderWorkerFactory {
             final URLBuilder urlBuilder,
             final InstallWorkerFactory workerFactory,
             final UpdateManager updateManager,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             @CommandLineOptionsModule.Directory(CommandLineOptionsModule.DirectoryType.TEMPORARY) final String tempDirectory) {
         this.downloader = downloader;
         this.globalConfig = globalConfig;

src/com/dmdirc/addons/ui_swing/components/addonbrowser/InstallWorker.java

@@ -29,7 +29,7 @@ import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.util.io.Downloader;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import java.io.File;
 import java.io.IOException;
@@ -61,7 +61,7 @@ public class InstallWorker extends LoggingSwingWorker<String, Void> {
             @Directory(DirectoryType.PLUGINS) final String pluginDirectory,
             @Directory(DirectoryType.THEMES) final String themeDirectory,
             final PluginManager pluginManager,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final AddonInfo info,
             final InstallerWindow window) {
         super(eventBus);

src/com/dmdirc/addons/ui_swing/components/addonbrowser/InstallWorkerFactory.java

@@ -22,12 +22,11 @@
 
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.commandline.CommandLineOptionsModule;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.util.io.Downloader;
 
-import net.engio.mbassy.bus.MBassador;
-
 import javax.inject.Inject;
 
 /**
@@ -40,14 +39,14 @@ public class InstallWorkerFactory {
     private final String pluginDirectory;
     private final String themeDirectory;
     private final PluginManager pluginManager;
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     @Inject
     public InstallWorkerFactory(final Downloader downloader,
             @CommandLineOptionsModule.Directory(CommandLineOptionsModule.DirectoryType.TEMPORARY) final String tempDirectory,
             @CommandLineOptionsModule.Directory(CommandLineOptionsModule.DirectoryType.PLUGINS) final String pluginDirectory,
             @CommandLineOptionsModule.Directory(CommandLineOptionsModule.DirectoryType.THEMES) final String themeDirectory,
-            final PluginManager pluginManager, final MBassador eventBus) {
+            final PluginManager pluginManager, final DMDircMBassador eventBus) {
         this.downloader = downloader;
         this.tempDirectory = tempDirectory;
         this.pluginDirectory = pluginDirectory;

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

@@ -30,7 +30,7 @@ import com.dmdirc.addons.ui_swing.components.renderers.AddonCellRenderer;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.prefs.PreferencesInterface;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import java.awt.Window;
 
@@ -63,7 +63,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 MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** Addon list scroll pane. */
     private JScrollPane scrollPane;
     /** Blurb label. */
@@ -83,7 +83,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 MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.parentWindow = parentWindow;
         this.workerFactory = workerFactory;
         this.eventBus = eventBus;

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

@@ -43,7 +43,7 @@ import javax.inject.Inject;
 import javax.swing.JTable;
 import javax.swing.table.DefaultTableModel;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -75,7 +75,7 @@ public class PluginPanel extends AddonPanel {
      */
     @Inject
     public PluginPanel(
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             @MainWindow final Window parentWindow,
             final PluginManager pluginManager,
             final DataLoaderWorkerFactory workerFactory,

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

@@ -33,7 +33,7 @@ import com.dmdirc.ui.themes.Theme;
 import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.updater.manager.CachingUpdateManager;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import java.awt.Window;
 import java.util.ArrayList;
@@ -79,7 +79,7 @@ public class ThemePanel extends AddonPanel {
             @GlobalConfig final IconManager iconManager,
             final CachingUpdateManager updateManager,
             @UserConfig final ConfigProvider userConfig,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         super(parentWindow, workerFactory, eventBus);
         this.themeManager = themeManager;
         this.iconManager = iconManager;

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

@@ -50,7 +50,7 @@ import javax.swing.JSplitPane;
 
 import net.miginfocom.swing.MigLayout;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -71,7 +71,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
     /** Topic bar. */
     private TopicBar topicBar;
     /** Event bus to dispatch events on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** Config to read settings from. */
     private final AggregateConfigProvider globalConfig;
     /** The domain to read settings from. */

src/com/dmdirc/addons/ui_swing/components/frames/ComponentCreator.java

@@ -37,7 +37,7 @@ import java.util.Set;
 
 import javax.swing.JComponent;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 /**
  * Utility class to create frame components.
@@ -64,7 +64,7 @@ public class ComponentCreator {
     public Set<JComponent> initFrameComponents(
             final Object frame,
             final SwingController controller,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final URLBuilder urlBuilder,
             final FrameContainer owner) {
         final SimpleInjector injector = new SimpleInjector();

src/com/dmdirc/addons/ui_swing/components/frames/ComponentFrame.java

@@ -22,14 +22,13 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.util.URLBuilder;
 
-import net.engio.mbassy.bus.MBassador;
-
 import javax.swing.JComponent;
 import javax.swing.JPopupMenu;
 
@@ -49,7 +48,7 @@ public class ComponentFrame extends TextFrame {
     /** Parent controller. */
     private final SwingController controller;
     /** The global event bus. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of CustomFrame.
@@ -61,7 +60,7 @@ public class ComponentFrame extends TextFrame {
      * @param commandParser The parser to use to process commands.
      */
     public ComponentFrame(
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final TextFrameDependencies deps,
             final URLBuilder urlBuilder,
             final FrameContainer owner,

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

@@ -22,12 +22,11 @@
 
 package com.dmdirc.addons.ui_swing.components.frames;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.util.URLBuilder;
 
-import net.engio.mbassy.bus.MBassador;
-
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
@@ -39,13 +38,13 @@ import static com.dmdirc.addons.ui_swing.components.frames.TextFrame.TextFrameDe
 @Singleton
 public class ComponentFrameFactory {
 
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     private final TextFrameDependencies dependencies;
     private final URLBuilder urlBuilder;
 
     @Inject
     public ComponentFrameFactory(
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final TextFrameDependencies dependencies,
             final URLBuilder urlBuilder) {
         this.eventBus = eventBus;

src/com/dmdirc/addons/ui_swing/components/frames/ComponentInputFrame.java

@@ -28,7 +28,7 @@ import com.dmdirc.addons.ui_swing.components.inputfields.SwingInputField;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.util.URLBuilder;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import javax.inject.Provider;
 import javax.swing.JComponent;
@@ -50,7 +50,7 @@ public class ComponentInputFrame extends InputTextFrame {
     /** Parent controller. */
     private final SwingController controller;
     /** The global event bus. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of CustomInputFrame.
@@ -62,7 +62,7 @@ public class ComponentInputFrame extends InputTextFrame {
      * @param owner              The frame container that owns this frame
      */
     public ComponentInputFrame(
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final TextFrameDependencies deps,
             final Provider<SwingInputField> inputFieldProvider,
             final URLBuilder urlBuilder,

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

@@ -61,7 +61,7 @@ import javax.swing.KeyStroke;
 
 import net.miginfocom.layout.PlatformDefaults;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 /**
  * Frame with an input field.
@@ -100,7 +100,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
     /** The controller to use to retrieve command information. */
     private final CommandController commandController;
     /** The bus to dispatch input events on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of InputFrame.

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.components.frames;
 
 import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -82,8 +83,6 @@ import javax.swing.SwingUtilities;
 
 import net.miginfocom.swing.MigLayout;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * Implements a generic (internal) frame.
  */
@@ -105,7 +104,7 @@ public abstract class TextFrame extends JPanel implements com.dmdirc.interfaces.
     /** Manager to use for building popups. */
     private final PopupManager popupManager;
     /** Bus to despatch events on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** Clipboard to copy and paste from. */
     private final Clipboard clipboard;
     /** Boolean to determine if this frame should be popped out of main client. */
@@ -546,7 +545,7 @@ public abstract class TextFrame extends JPanel implements com.dmdirc.interfaces.
         final SwingController controller;
         final Provider<Window> mainWindow;
         final PopupManager popupManager;
-        final MBassador eventBus;
+        final DMDircMBassador eventBus;
         final AggregateConfigProvider globalConfig;
         final PasteDialogFactory pasteDialog;
         final PluginManager pluginManager;
@@ -561,7 +560,7 @@ public abstract class TextFrame extends JPanel implements com.dmdirc.interfaces.
                 final SwingController controller,
                 @MainWindow final Provider<Window> mainWindow,
                 final PopupManager popupManager,
-                final MBassador eventBus,
+                final DMDircMBassador eventBus,
                 final PasteDialogFactory pasteDialog,
                 final PluginManager pluginManager,
                 @GlobalConfig final IconManager iconManager,

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

@@ -32,7 +32,7 @@ import com.dmdirc.interfaces.ui.InputField;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.input.InputHandler;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -49,7 +49,7 @@ import javax.swing.text.JTextComponent;
  */
 public class SwingInputHandler extends InputHandler implements KeyListener {
 
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of InputHandler. Adds listeners to the target that we need to operate.
@@ -67,7 +67,7 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
             final CommandController commandController,
             final CommandParser commandParser,
             final FrameContainer parentWindow,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         super(serviceManager, target, commandController, commandParser, parentWindow, eventBus);
         this.eventBus = eventBus;
     }

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

@@ -37,7 +37,7 @@ import com.dmdirc.interfaces.InviteListener;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
 import com.dmdirc.ui.IconManager;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 import net.engio.mbassy.listener.Handler;
 
 import java.awt.Window;
@@ -82,7 +82,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements StatusBa
      */
     @Inject
     public InviteLabel(
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             @GlobalConfig final IconManager iconManager,
             final ServerManager serverManager,
             final MainFrame mainFrame) {

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

@@ -7,6 +7,7 @@
 
 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;
@@ -25,8 +26,6 @@ import javax.swing.text.StyledDocument;
 import javax.swing.text.StyledEditorKit;
 import javax.swing.text.ViewFactory;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * @author Stanislav Lapitsky
  * @version 1.0
@@ -46,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 MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** The window this editor kit is used in. */
     private final Window window;
 
@@ -57,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 MBassador eventBus, final Window window) {
+    public WrapEditorKit(final boolean wrapping, final DMDircMBassador eventBus, final Window window) {
         this.window = window;
         this.eventBus = eventBus;
         wrap = wrapping;

src/com/dmdirc/addons/ui_swing/dialogs/about/LicenceLoader.java

@@ -27,7 +27,7 @@ import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.util.resourcemanager.ResourceManager;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -67,7 +67,7 @@ public class LicenceLoader extends LoggingSwingWorker<Void, Void> {
      * @param eventBus The event bus to post errors to
      */
     public LicenceLoader(final Collection<PluginInfo> plugins, final JTree tree,
-            final DefaultTreeModel model, final MBassador eventBus) {
+            final DefaultTreeModel model, final DMDircMBassador eventBus) {
         super(eventBus);
         this.plugins = plugins;
         this.tree = tree;

src/com/dmdirc/addons/ui_swing/dialogs/about/LicencesPanel.java

@@ -29,7 +29,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import java.awt.Font;
 import java.awt.Rectangle;
@@ -80,7 +80,7 @@ public class LicencesPanel extends JPanel implements TreeSelectionListener {
     @Inject
     public LicencesPanel(
             @GlobalConfig final AggregateConfigProvider globalConfig,
-            final PluginManager pluginManager, final MBassador eventBus) {
+            final PluginManager pluginManager, final DMDircMBassador eventBus) {
         config = globalConfig;
         initComponents();
         new LicenceLoader(pluginManager.getPluginInfos(), list, listModel, eventBus).execute();

src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsManagerDialog.java

@@ -66,7 +66,7 @@ import javax.swing.event.ListSelectionListener;
 
 import net.miginfocom.swing.MigLayout;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -86,7 +86,7 @@ public class ActionsManagerDialog extends StandardDialog implements
     /** Duplicate action group validator. */
     private final ValidatorChain<String> validator;
     /** Event bus to post events to and subscribe to events on. */
-    private final MBassador eventbus;
+    private final DMDircMBassador eventbus;
     /** Info label. */
     private TextLabel infoLabel;
     /** Group list. */
@@ -125,7 +125,7 @@ public class ActionsManagerDialog extends StandardDialog implements
      */
     @Inject
     public ActionsManagerDialog(
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final Apple apple,
             final MainFrame parentWindow,
             @UserConfig final ConfigProvider config,

src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasManagerDialog.java

@@ -33,7 +33,7 @@ import com.dmdirc.interfaces.ui.AliasDialogModel;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.validators.NotEmptyValidator;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import java.awt.Dimension;
 import java.awt.Window;
@@ -58,7 +58,7 @@ public class AliasManagerDialog extends StandardDialog {
 
     @Inject
     public AliasManagerDialog(@MainWindow final Window mainFrame, final AliasDialogModel model,
-            @GlobalConfig final IconManager iconManager, final MBassador eventBus) {
+            @GlobalConfig final IconManager iconManager, final DMDircMBassador eventBus) {
         super(mainFrame, ModalityType.DOCUMENT_MODAL);
         final AliasManagerLinker linker = new AliasManagerLinker(model, this, iconManager);
         setTitle("Alias Manager");

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java

@@ -36,7 +36,7 @@ import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.plugins.ServiceManager;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import java.awt.Window;
 import java.awt.datatransfer.Clipboard;
@@ -88,7 +88,7 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
     /** The controller to use to retrieve command information. */
     private final CommandController commandController;
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of ChannelSettingsDialog.
@@ -116,7 +116,7 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
             final Window parentWindow,
             final Clipboard clipboard,
             final CommandController commandController,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         super(parentWindow, ModalityType.MODELESS);
 
         this.userConfig = checkNotNull(userConfig);

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicDisplayPane.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
 
 import com.dmdirc.Channel;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Topic;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.ReplacePasteAction;
@@ -37,7 +38,6 @@ import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.IconManager;
 
 import com.google.common.base.Optional;
-import net.engio.mbassy.bus.MBassador;
 
 import java.awt.Color;
 import java.awt.datatransfer.Clipboard;
@@ -71,7 +71,7 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
     /** Clipboard to copy and paste from. */
     private final Clipboard clipboard;
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** label showing the number of characters left in a topic. */
     private JLabel topicLengthLabel;
     /** Topic text entry text area. */
@@ -95,7 +95,7 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
     public TopicDisplayPane(final Channel channel, final IconManager iconManager,
             final ServiceManager serviceManager, final ChannelSettingsDialog parent,
             final InputWindow channelWindow, final Clipboard clipboard,
-            final CommandController commandController, final MBassador eventBus) {
+            final CommandController commandController, final DMDircMBassador eventBus) {
         this.clipboard = clipboard;
         this.channel = channel;
         this.parent = parent;

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicPane.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
 
 import com.dmdirc.Channel;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ui.InputWindow;
@@ -30,7 +31,6 @@ import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.IconManager;
 
 import com.google.common.base.Optional;
-import net.engio.mbassy.bus.MBassador;
 
 import java.awt.datatransfer.Clipboard;
 import java.awt.event.ActionEvent;
@@ -74,7 +74,7 @@ public class TopicPane extends JPanel implements ActionListener {
             final CommandController commandController,
             final ServiceManager serviceManager, final ChannelSettingsDialog parent,
             final InputWindow channelWindow, final Clipboard clipboard,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         setOpaque(UIUtilities.getTabbedPaneOpaque());
         this.channel = channel;
         this.parent = parent;
@@ -96,7 +96,7 @@ public class TopicPane extends JPanel implements ActionListener {
             final IconManager iconManager,
             final ServiceManager serviceManager,
             final CommandController commandController,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         topicDisplayPane = new TopicDisplayPane(channel, iconManager, serviceManager, parent,
                 channelWindow, clipboard, commandController, eventBus);
         topicHistoryPane = new TopicHistoryPane(channel);

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

@@ -22,6 +22,7 @@
 
 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;
@@ -33,8 +34,6 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -97,7 +96,7 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
             final AggregateConfigProvider config,
             final PluginManager pluginManager,
             final CommandController commandController,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final InputTextFrame newParent,
             final String text,
             final Window parentWindow) {
@@ -126,7 +125,7 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
      *
      * @param text text to show in the dialog
      */
-    private void initComponents(final MBassador eventBus, final String text) {
+    private void initComponents(final DMDircMBassador eventBus, final String text) {
         scrollPane = new JScrollPane();
         textField = new TextAreaInputField(iconManager, config, text);
         editButton = new JButton("Edit");

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

@@ -23,14 +23,13 @@
 package com.dmdirc.addons.ui_swing.dialogs.paste;
 
 import com.dmdirc.ClientModule;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.components.frames.InputTextFrame;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.awt.Window;
 
 import javax.inject.Inject;
@@ -46,7 +45,7 @@ public class PasteDialogFactory {
     private final AggregateConfigProvider config;
     private final PluginManager pluginManager;
     private final CommandController commandController;
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     @Inject
     public PasteDialogFactory(
@@ -54,7 +53,7 @@ public class PasteDialogFactory {
             @ClientModule.GlobalConfig final AggregateConfigProvider config,
             final PluginManager pluginManager,
             final CommandController commandController,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.iconManager = iconManager;
         this.config = config;
         this.pluginManager = pluginManager;

src/com/dmdirc/addons/ui_swing/dialogs/prefs/CategoryLabel.java

@@ -22,11 +22,10 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.ui.IconManager;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.awt.Dimension;
 
 import javax.annotation.Nullable;
@@ -60,7 +59,7 @@ public class CategoryLabel extends JLabel {
      * @param index       Index of this label
      */
     public CategoryLabel(final IconManager iconManager,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             @Nullable final JList<? extends PreferencesCategory> parentList,
             final PreferencesCategory category, final int numCats,
             final int index) {

src/com/dmdirc/addons/ui_swing/dialogs/prefs/CategoryPanel.java

@@ -32,7 +32,7 @@ import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.ui.IconManager;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import java.awt.Component;
 import java.util.Collections;
@@ -76,7 +76,7 @@ public class CategoryPanel extends JPanel {
     /** Prefs component factory. */
     private final PrefsComponentFactory factory;
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Instantiates a new category panel.
@@ -87,7 +87,7 @@ public class CategoryPanel extends JPanel {
      */
     @Inject
     public CategoryPanel(
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final PrefsComponentFactory factory,
             @GlobalConfig final IconManager iconManager) {
         this(eventBus, factory, iconManager, null);
@@ -102,7 +102,7 @@ public class CategoryPanel extends JPanel {
      * @param category    Initial category
      */
     public CategoryPanel(
-            final MBassador eventBus, final PrefsComponentFactory factory,
+            final DMDircMBassador eventBus, final PrefsComponentFactory factory,
             final IconManager iconManager,
             final PreferencesCategory category) {
         super(new MigLayout("fillx, wrap, ins 0"));

src/com/dmdirc/addons/ui_swing/dialogs/prefs/IconLoader.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
@@ -31,8 +32,6 @@ import java.util.concurrent.ExecutionException;
 
 import javax.swing.Icon;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * Loads an icon in the background and uses it for a category label once it has been loaded.
  */
@@ -41,7 +40,7 @@ public class IconLoader extends LoggingSwingWorker<Icon, Void> {
     /** Category this icon will be used for. */
     private final CategoryLabel label;
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** Icon to load. */
     private final String icon;
     /** Icon manager. */
@@ -56,7 +55,7 @@ public class IconLoader extends LoggingSwingWorker<Icon, Void> {
      * @param label       Label to load category for
      * @param icon        Icon to load
      */
-    public IconLoader(final IconManager iconManager, final MBassador eventBus,
+    public IconLoader(final IconManager iconManager, final DMDircMBassador eventBus,
             final CategoryLabel label, final String icon) {
         super(eventBus);
         this.iconManager = iconManager;

src/com/dmdirc/addons/ui_swing/dialogs/prefs/PreferencesListCellRenderer.java

@@ -25,7 +25,7 @@ package com.dmdirc.addons.ui_swing.dialogs.prefs;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.ui.IconManager;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import java.awt.Component;
 import java.awt.Font;
@@ -51,7 +51,7 @@ public class PreferencesListCellRenderer extends JLabel implements
     /** Label map. */
     private final Map<PreferencesCategory, JLabel> labelMap;
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Instantiates a new prefs list cell renderer.
@@ -60,7 +60,7 @@ public class PreferencesListCellRenderer extends JLabel implements
      * @param eventBus    The event bus to post errors to
      * @param numCats     Number of categories in the list
      */
-    public PreferencesListCellRenderer(final IconManager iconManager, final MBassador eventBus,
+    public PreferencesListCellRenderer(final IconManager iconManager, final DMDircMBassador eventBus,
             final int numCats) {
         labelMap = new HashMap<>();
         this.numCats = numCats;

src/com/dmdirc/addons/ui_swing/dialogs/prefs/PrefsCategoryLoader.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -45,8 +46,6 @@ import javax.swing.UIManager;
 import net.miginfocom.layout.PlatformDefaults;
 import net.miginfocom.swing.MigLayout;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * Loads a preferences panel for a specified preferences category in the background.
  */
@@ -70,7 +69,7 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
     /** Prefs component factory instance. */
     private final PrefsComponentFactory factory;
     /** The event bus to post the errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Instantiates a new preferences category loader.
@@ -81,7 +80,7 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
      * @param category      Preferences Category to load
      */
     public PrefsCategoryLoader(final PrefsComponentFactory factory,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final CategoryPanel categoryPanel,
             final PreferencesCategory category) {
         super(eventBus);

src/com/dmdirc/addons/ui_swing/dialogs/prefs/SwingPreferencesDialog.java

@@ -58,7 +58,7 @@ import javax.swing.event.ListSelectionListener;
 
 import net.miginfocom.swing.MigLayout;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 /**
  * Allows the user to modify global client preferences.
@@ -85,7 +85,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
     /** Icon manager to retrieve icons from. */
     private final IconManager iconManager;
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of SwingPreferencesDialog.
@@ -104,7 +104,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
             @ForSettings final DialogProvider<SwingRestartDialog> restartDialogProvider,
             final Provider<PreferencesDialogModel> dialogModelProvider,
             final Provider<CategoryPanel> categoryPanelProvider,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         super(parentWindow, ModalityType.MODELESS);
 
         this.iconManager = iconManager;

src/com/dmdirc/addons/ui_swing/dialogs/prefs/UpdateConfigPanel.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.ClientModule.UserConfig;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.events.UserErrorEvent;
@@ -50,8 +51,6 @@ import javax.swing.JScrollPane;
 
 import net.miginfocom.swing.MigLayout;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * Updates configuration UI.
  */
@@ -79,7 +78,7 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
     /** Controller to pass to the update checker. */
     private final IdentityController identityController;
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Instantiates a new update config panel.
@@ -96,7 +95,7 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final CachingUpdateManager updateManager,
             final IdentityController identityController,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.userConfig = userConfig;
         this.globalConfig = globalConfig;
         this.updateManager = updateManager;

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

@@ -22,6 +22,7 @@
 
 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.LoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
@@ -39,8 +40,6 @@ import com.dmdirc.updater.manager.UpdateManagerListener;
 import com.dmdirc.updater.manager.UpdateManagerStatus;
 import com.dmdirc.updater.manager.UpdateStatus;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.awt.Dimension;
 import java.awt.Window;
 import java.awt.event.ActionEvent;
@@ -82,7 +81,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 MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of the updater dialog.
@@ -97,7 +96,7 @@ public class SwingUpdaterDialog extends StandardDialog implements
             final CachingUpdateManager updateManager,
             @MainWindow final Window parentWindow,
             @ForUpdates final DialogProvider<SwingRestartDialog> restartDialogProvider,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         super(parentWindow, ModalityType.MODELESS);
 
         this.updateManager = updateManager;

src/com/dmdirc/addons/ui_swing/events/SwingWindowAddedEvent.java

@@ -29,7 +29,7 @@ import com.google.common.base.Optional;
 /**
  * Event triggered when a swing window is added.
  */
-public class SwingWindowAddedEvent {
+public class SwingWindowAddedEvent extends SwingEvent {
 
     private final Optional<TextFrame> parentWindow;
     private final TextFrame childWindow;

src/com/dmdirc/addons/ui_swing/events/SwingWindowDeletedEvent.java

@@ -29,7 +29,7 @@ import com.google.common.base.Optional;
 /**
  * Event triggered when a swing window is deleted.
  */
-public class SwingWindowDeletedEvent {
+public class SwingWindowDeletedEvent extends SwingEvent {
 
     private final Optional<TextFrame> parentWindow;
     private final TextFrame childWindow;

src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/ButtonBar.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.framemanager.buttonbar;
 
 import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.FrameContainerComparator;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
@@ -72,7 +73,6 @@ import javax.swing.SwingUtilities;
 import net.miginfocom.layout.PlatformDefaults;
 import net.miginfocom.swing.MigLayout;
 
-import net.engio.mbassy.bus.MBassador;
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -131,7 +131,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final WindowManager windowManager,
             final ActiveFrameManager activeFrameManager,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.windowFactory = windowFactory;
         this.globalConfig = globalConfig;
         this.windowManager = windowManager;

src/com/dmdirc/addons/ui_swing/framemanager/ctrltab/CtrlTabWindowManager.java

@@ -54,7 +54,7 @@ import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -72,7 +72,7 @@ public class CtrlTabWindowManager implements SelectionListener {
     /** Selection model for the tree scroller. */
     private final TreeSelectionModel selectionModel;
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new ctrl tab window manager.
@@ -89,7 +89,7 @@ public class CtrlTabWindowManager implements SelectionListener {
             final SwingWindowFactory windowFactory,
             final ActiveFrameManager activeFrameManager,
             final MainFrame mainFrame,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.eventBus = eventBus;
         nodes = new HashMap<>();
         model = new TreeViewModel(globalConfig, new TreeViewNode(null, null));

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

@@ -65,7 +65,7 @@ import javax.swing.tree.TreePath;
 
 import net.miginfocom.swing.MigLayout;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -95,9 +95,9 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
     /** Active frame manager. */
     private final ActiveFrameManager activeFrameManager;
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** Swing event bus. */
-    private final MBassador swingEventBus;
+    private final DMDircMBassador swingEventBus;
 
     /**
      * Creates a new instance of the TreeFrameManager.
@@ -119,8 +119,8 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
             final ActiveFrameManager activeFrameManager,
             final SwingWindowFactory windowFactory,
             @PluginDomain(SwingController.class) final String domain,
-            final MBassador eventBus,
-            @SwingEventBus final MBassador swingEventBus) {
+            final DMDircMBassador eventBus,
+            @SwingEventBus final DMDircMBassador swingEventBus) {
         this.windowFactory = windowFactory;
         this.windowManager = windowManager;
         this.nodes = new HashMap<>();

src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/WindowMenuFrameManager.java

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.framemanager.windowmenu;
 
 import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.FrameContainerComparator;
 import com.dmdirc.addons.ui_swing.SelectionListener;
@@ -58,7 +59,6 @@ import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 import javax.swing.JSeparator;
 
-import net.engio.mbassy.bus.MBassador;
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -87,6 +87,8 @@ public class WindowMenuFrameManager extends JMenu implements ActionListener, Sel
     private final ActiveFrameManager activeFrameManager;
     private final AggregateConfigProvider globalConfig;
     private final String domain;
+    /** The client event bus to subscribe to events on. */
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of WindowMenuFrameManager.
@@ -103,10 +105,12 @@ public class WindowMenuFrameManager extends JMenu implements ActionListener, Sel
             @GlobalConfig final AggregateConfigProvider globalConfig,
             @PluginDomain(SwingController.class) final String domain,
             final ActiveFrameManager activeFrameManager,
-            @SwingEventBus final MBassador swingEventBus) {
+            @SwingEventBus final DMDircMBassador swingEventBus,
+            final DMDircMBassador eventBus) {
         this.globalConfig = globalConfig;
         this.domain = domain;
         this.activeFrameManager = activeFrameManager;
+        this.eventBus = eventBus;
         swingEventBus.subscribe(this);
 
         menus = Collections.synchronizedMap(

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

@@ -55,7 +55,7 @@ import com.dmdirc.ui.core.aliases.CoreAliasDialogModel;
 import com.dmdirc.ui.core.feedback.CoreFeedbackDialogModel;
 import com.dmdirc.ui.core.newserver.CoreNewServerDialogModel;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import java.awt.Window;
 import java.awt.datatransfer.Clipboard;
@@ -179,7 +179,7 @@ public class DialogModule {
             @MainWindow final Window parentWindow,
             final Clipboard clipboard,
             final CommandController commandController,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         return new KeyedDialogProvider<Channel, ChannelSettingsDialog>() {
             @Override
             protected ChannelSettingsDialog getInstance(final Channel key) {

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

@@ -25,6 +25,7 @@ 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.ServerManager;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.ui_swing.Apple;
@@ -75,7 +76,6 @@ import javax.inject.Singleton;
 
 import dagger.Module;
 import dagger.Provides;
-import net.engio.mbassy.bus.MBassador;
 import net.engio.mbassy.bus.config.BusConfiguration;
 
 /**
@@ -107,8 +107,8 @@ public class SwingModule {
     @Provides
     @Singleton
     @SwingEventBus
-    public MBassador getSwingEventBus() {
-        return new MBassador(BusConfiguration.Default());
+    public DMDircMBassador getSwingEventBus() {
+        return new DMDircMBassador(BusConfiguration.Default());
     }
 
     @Provides
@@ -141,7 +141,7 @@ public class SwingModule {
             final Provider<QuitWorker> quitWorker,
             final URLBuilder urlBuilder,
             final Provider<FrameManager> frameManagerProvider,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         return UIUtilities.invokeAndWait(new Callable<MainFrame>() {
 
             @Override
@@ -194,7 +194,7 @@ public class SwingModule {
     @Provides
     @Singleton
     public URLHandler getURLHandler(
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final ServerManager serverManager,
             final StatusBarManager statusBarManager) {
@@ -211,7 +211,7 @@ public class SwingModule {
             @UserConfig final ConfigProvider identity,
             final ActionManager actionManager,
             final PluginManager pluginManager,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         return new PreferencesDialogModel(pluginPanel, themePanel, updatePanel, urlPanel,
                 configManager, identity, pluginManager, eventBus);
     }