Generify MBassador.

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

src/com/dmdirc/Channel.java

@@ -28,7 +28,6 @@ import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.ChannelClosedEvent;
 import com.dmdirc.events.ChannelSelfActionEvent;
 import com.dmdirc.events.ChannelSelfMessageEvent;
-import com.dmdirc.events.DisplayableEvent;
 import com.dmdirc.events.EventUtils;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
@@ -61,8 +60,6 @@ import java.util.Map;
 
 import javax.annotation.Nonnull;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * The Channel class represents the client's view of the channel. It handles callbacks for channel
  * events from the parser, maintains the corresponding ChannelWindow, and handles user input for the
@@ -114,7 +111,7 @@ public class Channel extends MessageTarget implements GroupChat {
             final CommandController commandController,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         super(newServer, "channel-inactive", newChannelInfo.getName(),
                 Styliser.stipControlCodes(newChannelInfo.getName()),
                 configMigrator.getConfigProvider(),
@@ -177,7 +174,7 @@ public class Channel extends MessageTarget implements GroupChat {
 
         for (String part : splitLine(line)) {
             if (!part.isEmpty()) {
-                final DisplayableEvent event = new ChannelSelfMessageEvent(this,
+                final ChannelSelfMessageEvent event = new ChannelSelfMessageEvent(this,
                         channelInfo.getChannelClient(me), part);
                 final String format = EventUtils.postDisplayable(getEventBus(), event,
                         "channelSelfMessage");
@@ -210,7 +207,7 @@ public class Channel extends MessageTarget implements GroupChat {
                 <= action.length()) {
             addLine("actionTooLong", action.length());
         } else {
-            final DisplayableEvent event = new ChannelSelfActionEvent(this,
+            final ChannelSelfActionEvent event = new ChannelSelfActionEvent(this,
                     channelInfo.getChannelClient(me), action);
             final String format = EventUtils.postDisplayable(getEventBus(), event,
                     "channelSelfAction");

src/com/dmdirc/ChannelEventHandler.java

@@ -41,8 +41,8 @@ import com.dmdirc.events.ChannelQuitEvent;
 import com.dmdirc.events.ChannelTopicChangeEvent;
 import com.dmdirc.events.ChannelUserAwayEvent;
 import com.dmdirc.events.ChannelUserBackEvent;
+import com.dmdirc.events.ChannelUserEvent;
 import com.dmdirc.events.ChannelUsermodechangeEvent;
-import com.dmdirc.events.DisplayableEvent;
 import com.dmdirc.events.EventUtils;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.common.AwayState;
@@ -77,8 +77,6 @@ import java.util.Date;
 
 import javax.annotation.Nonnull;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * Handles events for channel objects.
  */
@@ -94,9 +92,9 @@ public class ChannelEventHandler extends EventHandler implements
     /** The channel that owns this event handler. */
     private final Channel owner;
     /** Event bus to send events on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
-    public ChannelEventHandler(final Channel owner, final MBassador eventBus) {
+    public ChannelEventHandler(final Channel owner, final DMDircMBassador eventBus) {
         this.owner = owner;
         this.eventBus = eventBus;
     }
@@ -135,7 +133,7 @@ public class ChannelEventHandler extends EventHandler implements
             final String message, final String host) {
         checkParser(parser);
 
-        final DisplayableEvent event = new ChannelMessageEvent(owner, client, message);
+        final ChannelMessageEvent event = new ChannelMessageEvent(owner, client, message);
         final String format = EventUtils.postDisplayable(eventBus, event,
                 isMyself(client) ? "channelSelfExternalMessage" : "channelMessage");
         owner.doNotification(date, format, client, message);
@@ -156,19 +154,19 @@ public class ChannelEventHandler extends EventHandler implements
 
         if (isJoinTopic) {
             if (Strings.isNullOrEmpty(channel.getTopic())) {
-                final DisplayableEvent event = new ChannelNotopicEvent(owner);
+                final ChannelNotopicEvent event = new ChannelNotopicEvent(owner);
                 final String format = EventUtils.postDisplayable(eventBus, event, "channelNoTopic");
                 owner.doNotification(date, format);
             } else {
                 final Topic newTopic = new Topic(channel.getTopic(), channel.getTopicSetter(),
                         channel.getTopicTime());
-                final DisplayableEvent event = new ChannelGottopicEvent(owner, newTopic);
+                final ChannelGottopicEvent event = new ChannelGottopicEvent(owner, newTopic);
                 final String format = EventUtils.postDisplayable(eventBus, event,
                         "channelTopicDiscovered");
                 owner.doNotification(date, format, newTopic);
             }
         } else {
-            final DisplayableEvent event = new ChannelTopicChangeEvent(owner,
+            final ChannelTopicChangeEvent event = new ChannelTopicChangeEvent(owner,
                     channel.getChannelClient(channel.getTopicSetter(), true),
                     channel.getTopic());
             final String format = EventUtils.postDisplayable(eventBus, event,
@@ -199,7 +197,7 @@ public class ChannelEventHandler extends EventHandler implements
             final ChannelClientInfo client) {
         checkParser(parser);
 
-        final DisplayableEvent event = new ChannelJoinEvent(owner, client);
+        final ChannelJoinEvent event = new ChannelJoinEvent(owner, client);
         final String format = EventUtils.postDisplayable(eventBus, event, "channelJoin");
         owner.doNotification(date, format, client);
         owner.addClient(client);
@@ -210,7 +208,7 @@ public class ChannelEventHandler extends EventHandler implements
             final ChannelClientInfo client, final String reason) {
         checkParser(parser);
 
-        final DisplayableEvent event = new ChannelPartEvent(owner, client, reason);
+        final ChannelPartEvent event = new ChannelPartEvent(owner, client, reason);
         final String format = EventUtils.postDisplayable(eventBus, event,
                 "channel"
                 + (isMyself(client) ? "Self" : "") + "Part"
@@ -225,7 +223,7 @@ public class ChannelEventHandler extends EventHandler implements
             final String reason, final String host) {
         checkParser(parser);
 
-        final DisplayableEvent event = new ChannelKickEvent(owner, client, kickedClient, reason);
+        final ChannelKickEvent event = new ChannelKickEvent(owner, client, kickedClient, reason);
         final String format = EventUtils.postDisplayable(eventBus, event,
                 "channelKick" + (reason.isEmpty() ? "" : "Reason"));
         owner.doNotification(date, format, client, kickedClient, reason);
@@ -237,7 +235,7 @@ public class ChannelEventHandler extends EventHandler implements
             final ChannelClientInfo client, final String reason) {
         checkParser(parser);
 
-        final DisplayableEvent event = new ChannelQuitEvent(owner, client, reason);
+        final ChannelQuitEvent event = new ChannelQuitEvent(owner, client, reason);
         final String format = EventUtils.postDisplayable(eventBus, event,
                 "channelQuit" + (reason.isEmpty() ? "" : "Reason"));
         owner.doNotification(date, format, client, reason);
@@ -250,7 +248,7 @@ public class ChannelEventHandler extends EventHandler implements
             final String host) {
         checkParser(parser);
 
-        final DisplayableEvent event = new ChannelActionEvent(owner, client, message);
+        final ChannelActionEvent event = new ChannelActionEvent(owner, client, message);
         final String format = EventUtils.postDisplayable(eventBus, event,
                 isMyself(client) ? "channelSelfExternalAction" : "channelAction");
         owner.doNotification(date, format, client, message);
@@ -261,7 +259,7 @@ public class ChannelEventHandler extends EventHandler implements
             final ChannelInfo channel, final ChannelClientInfo client, final String oldNick) {
         checkParser(parser);
 
-        final DisplayableEvent event = new ChannelNickchangeEvent(owner, client, oldNick);
+        final ChannelNickchangeEvent event = new ChannelNickchangeEvent(owner, client, oldNick);
         final String format = EventUtils.postDisplayable(eventBus, event,
                 isMyself(client) ? "channelSelfNickChange" : "channelNickChange");
         owner.doNotification(date, format, client, oldNick);
@@ -277,13 +275,13 @@ public class ChannelEventHandler extends EventHandler implements
         if (!owner.getConfigManager().getOptionBool("channel", "splitusermodes")
                 || !owner.getConfigManager().getOptionBool("channel", "hideduplicatemodes")) {
             if (host.isEmpty()) {
-                final DisplayableEvent event = new ChannelModesdiscoveredEvent(owner,
+                final ChannelModesdiscoveredEvent event = new ChannelModesdiscoveredEvent(owner,
                         modes.length() <= 1 ? "" : modes);
                 final String format = EventUtils.postDisplayable(eventBus, event,
                         modes.length() <= 1 ? "channelNoModes" : "channelModeDiscovered");
                 owner.doNotification(date, format, modes.length() <= 1 ? "" : modes);
             } else {
-                final DisplayableEvent event = new ChannelModechangeEvent(owner, client, modes);
+                final ChannelModechangeEvent event = new ChannelModechangeEvent(owner, client, modes);
                 final String format = EventUtils.postDisplayable(eventBus, event,
                         isMyself(client) ? "channelSelfModeChanged" : "channelModeChanged");
                 owner.doNotification(date, format, client, modes);
@@ -306,7 +304,7 @@ public class ChannelEventHandler extends EventHandler implements
                 format = "channelSplitUserMode_default";
             }
 
-            final DisplayableEvent event = new ChannelUsermodechangeEvent(owner, client,
+            final ChannelUsermodechangeEvent event = new ChannelUsermodechangeEvent(owner, client,
                     targetClient, mode);
             final String result = EventUtils.postDisplayable(eventBus, event, format);
             owner.doNotification(date, result, client, targetClient, mode);
@@ -338,7 +336,7 @@ public class ChannelEventHandler extends EventHandler implements
             final boolean away = state == AwayState.AWAY;
             final boolean discovered = oldState == AwayState.UNKNOWN;
 
-            final DisplayableEvent event = away
+            final ChannelUserEvent event = away
                     ? new ChannelUserAwayEvent(date.getTime(), owner, channelClient)
                     : new ChannelUserBackEvent(date.getTime(), owner, channelClient);
             final String format = EventUtils.postDisplayable(eventBus, event,
@@ -355,7 +353,7 @@ public class ChannelEventHandler extends EventHandler implements
             final String message, final String host) {
         checkParser(parser);
 
-        final DisplayableEvent event = new ChannelNoticeEvent(owner, client, message);
+        final ChannelNoticeEvent event = new ChannelNoticeEvent(owner, client, message);
         final String format = EventUtils.postDisplayable(eventBus, event, "channelNotice");
         owner.doNotification(date, format, client, message);
     }
@@ -369,13 +367,13 @@ public class ChannelEventHandler extends EventHandler implements
         if (owner.getConfigManager().getOptionBool("channel", "splitusermodes")
                 && owner.getConfigManager().getOptionBool("channel", "hideduplicatemodes")) {
             if (host.isEmpty()) {
-                final DisplayableEvent event = new ChannelModesdiscoveredEvent(owner,
+                final ChannelModesdiscoveredEvent event = new ChannelModesdiscoveredEvent(owner,
                         modes.length() <= 1 ? "" : modes);
                 final String format = EventUtils.postDisplayable(eventBus, event,
                         modes.length() <= 1 ? "channelNoModes" : "channelModeDiscovered");
                 owner.doNotification(date, format, modes.length() <= 1 ? "" : modes);
             } else {
-                final DisplayableEvent event = new ChannelModechangeEvent(owner, client, modes);
+                final ChannelModechangeEvent event = new ChannelModechangeEvent(owner, client, modes);
                 final String format = EventUtils.postDisplayable(eventBus, event,
                         isMyself(client) ? "channelSelfModeChanged" : "channelModeChanged");
                 owner.doNotification(date, format, client, modes);
@@ -392,7 +390,7 @@ public class ChannelEventHandler extends EventHandler implements
             final String host) {
         checkParser(parser);
 
-        final DisplayableEvent event = new ChannelModeNoticeEvent(owner, client,
+        final ChannelModeNoticeEvent event = new ChannelModeNoticeEvent(owner, client,
                 String.valueOf(prefix), message);
         final String format = EventUtils.postDisplayable(eventBus, event, "channelModeNotice");
         owner.doNotification(date, format, client, String.valueOf(prefix), message);
@@ -403,7 +401,7 @@ public class ChannelEventHandler extends EventHandler implements
             final ChannelInfo channel, final char mode) {
         checkParser(parser);
 
-        final DisplayableEvent event = new ChannelListmodesretrievedEvent(owner, mode);
+        final ChannelListmodesretrievedEvent event = new ChannelListmodesretrievedEvent(owner, mode);
         final String format = EventUtils.postDisplayable(eventBus, event,
                 "channelListModeRetrieved");
         owner.doNotification(date, format, mode);

src/com/dmdirc/ChannelFactory.java

@@ -29,8 +29,6 @@ import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.util.URLBuilder;
 
-import net.engio.mbassy.bus.MBassador;
-
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
@@ -44,12 +42,12 @@ public class ChannelFactory {
     private final CommandController commandController;
     private final MessageSinkManager messageSinkManager;
     private final URLBuilder urlBuilder;
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     @Inject
     public ChannelFactory(final TabCompleterFactory tabCompleterFactory,
             final CommandController commandController, final MessageSinkManager messageSinkManager,
-            final URLBuilder urlBuilder, final MBassador eventBus) {
+            final URLBuilder urlBuilder, final DMDircMBassador eventBus) {
         this.tabCompleterFactory = tabCompleterFactory;
         this.commandController = commandController;
         this.messageSinkManager = messageSinkManager;

src/com/dmdirc/ClientModule.java

@@ -77,7 +77,6 @@ import javax.inject.Singleton;
 import dagger.Module;
 import dagger.ObjectGraph;
 import dagger.Provides;
-import net.engio.mbassy.bus.MBassador;
 import net.engio.mbassy.bus.config.BusConfiguration;
 
 /**
@@ -116,8 +115,8 @@ public class ClientModule {
 
     @Provides
     @Singleton
-    public MBassador getMBassador() {
-        return new MBassador(BusConfiguration.Default());
+    public DMDircMBassador getMBassador() {
+        return new DMDircMBassador(BusConfiguration.Default());
     }
 
     @Provides
@@ -127,7 +126,7 @@ public class ClientModule {
             @Directory(DirectoryType.IDENTITIES) final String identitiesDirectory,
             @Directory(DirectoryType.ERRORS) final String errorsDirectory,
             final CommandLineParser commandLineParser,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         final IdentityManager identityManager = new IdentityManager(baseDirectory,
                 identitiesDirectory, eventBus);
         ErrorManager.getErrorManager()
@@ -186,7 +185,7 @@ public class ClientModule {
             final ActionFactory actionFactory,
             final Provider<Set<ActionGroup>> actionWrappersProvider,
             final Provider<UpdateManager> updateManagerProvider,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             @Directory(DirectoryType.ACTIONS) final String directory) {
         final ActionManager actionManager = new ActionManager(identityController,
                 actionFactory, actionWrappersProvider, updateManagerProvider, eventBus, directory);
@@ -222,7 +221,7 @@ public class ClientModule {
     @Provides
     @Singleton
     public PluginManager getPluginManager(
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final IdentityController identityController,
             final UpdateManager updateManager,
             final Provider<PluginInjectorInitialiser> initialiserProvider,
@@ -255,7 +254,7 @@ public class ClientModule {
     @Provides
     @Singleton
     public ThemeManager getThemeManager(
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final IdentityController controller,
             @Directory(DirectoryType.THEMES) final String directory) {
         final ThemeManager manager = new ThemeManager(eventBus, controller, directory);

src/com/dmdirc/CustomWindow.java

@@ -28,7 +28,6 @@ import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.util.URLBuilder;
 
 import com.google.common.base.Optional;
-import net.engio.mbassy.bus.MBassador;
 
 import java.util.Arrays;
 
@@ -69,7 +68,7 @@ public class CustomWindow extends FrameContainer {
             final String title,
             final AggregateConfigProvider configProvider,
             final URLBuilder urlBuilder,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         super(null, "custom", name, title, configProvider, urlBuilder, eventBus,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
     }

src/com/dmdirc/DMDircMBassador.java

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc;
+
+import com.dmdirc.events.DMDircEvent;
+
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.bus.config.BusConfiguration;
+
+/**
+ * Generified MBassador.
+ */
+public class DMDircMBassador extends MBassador<DMDircEvent> {
+
+    public DMDircMBassador() {
+        super(BusConfiguration.Default());
+    }
+
+    public DMDircMBassador(final BusConfiguration configuration) {
+        super(configuration);
+    }
+}

src/com/dmdirc/FrameContainer.java

@@ -66,8 +66,6 @@ import java.util.concurrent.CopyOnWriteArrayList;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import net.engio.mbassy.bus.MBassador;
-
 import static com.google.common.base.Preconditions.checkState;
 
 /**
@@ -107,7 +105,7 @@ public abstract class FrameContainer {
     /** The manager to use to manage our event bus. */
     private final ChildEventBusManager eventBusManager;
     /** Event bus to dispatch events to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** The icon manager to use for this container. */
     private final IconManager iconManager;
     /** Whether or not this container is writable. */
@@ -152,7 +150,7 @@ public abstract class FrameContainer {
             final String title,
             final AggregateConfigProvider config,
             final URLBuilder urlBuilder,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final Collection<String> components) {
         this.parent = Optional.fromNullable(parent);
         this.configManager = config;
@@ -199,7 +197,7 @@ public abstract class FrameContainer {
             final CommandParser commandParser,
             final TabCompleter tabCompleter,
             final MessageSinkManager messageSinkManager,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final Collection<String> components) {
         this.parent = Optional.fromNullable(parent);
         this.configManager = config;
@@ -244,7 +242,7 @@ public abstract class FrameContainer {
         return configManager;
     }
 
-    public MBassador getEventBus() {
+    public DMDircMBassador getEventBus() {
         return eventBus;
     }
 

src/com/dmdirc/GlobalWindow.java

@@ -35,8 +35,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.inject.Inject;
@@ -66,7 +64,7 @@ public class GlobalWindow extends FrameContainer {
             final TabCompleterFactory tabCompleterFactory,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         super(null, "icon", "Global", "(Global)", config, urlBuilder, parser,
                 tabCompleterFactory.getTabCompleter(config, CommandType.TYPE_GLOBAL),
                 messageSinkManager, eventBus,

src/com/dmdirc/Main.java

@@ -57,7 +57,6 @@ import java.util.TimerTask;
 import javax.inject.Inject;
 
 import dagger.ObjectGraph;
-import net.engio.mbassy.bus.MBassador;
 
 /**
  * Main class, handles initialisation.
@@ -91,7 +90,7 @@ public class Main {
     /** The set of migrators to execute on startup. */
     private final Set<Migrator> migrators;
     /** The event bus to dispatch events on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** The commands to load into the command manager. */
     private final Set<CommandDetails> commands;
 
@@ -125,7 +124,7 @@ public class Main {
             final ColourActionComparison colourActionComparison,
             final Set<SystemLifecycleComponent> lifecycleComponents,
             final Set<Migrator> migrators,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final Set<CommandDetails> commands) {
         this.identityManager = identityManager;
         this.serverManager = serverManager;

src/com/dmdirc/MessageEncoder.java

@@ -29,8 +29,6 @@ import com.dmdirc.parser.interfaces.Parser;
 
 import java.io.UnsupportedEncodingException;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * An {@link Encoder} implementation that reads the desired encoding from the relevant target's
  * config file.
@@ -42,7 +40,7 @@ public class MessageEncoder implements Encoder {
     /** The parser that this encoder will work for. */
     private final Parser parser;
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of {@link MessageEncoder}.
@@ -52,7 +50,7 @@ public class MessageEncoder implements Encoder {
      * @param eventBus The event bus to post errors to.
      */
     public MessageEncoder(final Server server, final Parser parser,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.server = server;
         this.parser = parser;
         this.eventBus = eventBus;

src/com/dmdirc/MessageEncoderFactory.java

@@ -2,8 +2,6 @@ package com.dmdirc;
 
 import com.dmdirc.parser.interfaces.Parser;
 
-import net.engio.mbassy.bus.MBassador;
-
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
@@ -13,10 +11,10 @@ import javax.inject.Singleton;
 @Singleton
 public class MessageEncoderFactory {
 
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     @Inject
-    public MessageEncoderFactory(final MBassador eventBus) {
+    public MessageEncoderFactory(final DMDircMBassador eventBus) {
         this.eventBus = eventBus;
     }
 

src/com/dmdirc/MessageTarget.java

@@ -28,8 +28,6 @@ import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.util.URLBuilder;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.util.Collection;
 
 import javax.annotation.Nullable;
@@ -66,7 +64,7 @@ public abstract class MessageTarget extends FrameContainer {
             final TabCompleter tabCompleter,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final Collection<String> components) {
         super(parent, icon, name, title, config, urlBuilder, parser, tabCompleter,
                 messageSinkManager, eventBus, components);

src/com/dmdirc/ParserFactory.java

@@ -36,8 +36,6 @@ import java.net.URI;
 
 import javax.inject.Inject;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * Provides a method to retrieve a parser.
  *
@@ -48,7 +46,7 @@ public class ParserFactory {
     /** PluginManager used by this ParserFactory */
     private final PluginManager pluginManager;
     /** The event bus to post events to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of {@link ParserFactory}.
@@ -58,7 +56,7 @@ public class ParserFactory {
      */
     @Inject
     public ParserFactory(final PluginManager pluginManager,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.pluginManager = pluginManager;
         this.eventBus = eventBus;
     }

src/com/dmdirc/Query.java

@@ -24,7 +24,6 @@ package com.dmdirc;
 
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.parsers.QueryCommandParser;
-import com.dmdirc.events.DisplayableEvent;
 import com.dmdirc.events.QueryActionEvent;
 import com.dmdirc.events.QueryClosedEvent;
 import com.dmdirc.events.QueryMessageEvent;
@@ -134,7 +133,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
                 server.getParser().sendMessage(target, part);
 
                 doNotification("querySelfMessage", server.getParser().getLocalClient(), part);
-                final DisplayableEvent event = new QuerySelfMessageEvent(this, server.getParser().
+                final QuerySelfMessageEvent event = new QuerySelfMessageEvent(this, server.getParser().
                         getLocalClient(), part);
                 event.setDisplayFormat("querySelfMessage");
                 getEventBus().publish(event);
@@ -175,7 +174,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
             server.getParser().sendAction(getNickname(), action);
 
             doNotification("querySelfAction", client, action);
-            final DisplayableEvent event = new QuerySelfActionEvent(this, client, action);
+            final QuerySelfActionEvent event = new QuerySelfActionEvent(this, client, action);
             event.setDisplayFormat("querySelfAction");
             getEventBus().publish(event);
         } else {
@@ -190,7 +189,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
 
         final StringBuffer buff = new StringBuffer("queryMessage");
 
-        final DisplayableEvent event = new QueryMessageEvent(this, parser.getClient(host), message);
+        final QueryMessageEvent event = new QueryMessageEvent(this, parser.getClient(host), message);
         event.setDisplayFormat(buff.toString());
         getEventBus().publish(event);
 
@@ -204,7 +203,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
 
         final StringBuffer buff = new StringBuffer("queryAction");
 
-        final DisplayableEvent event = new QueryActionEvent(this, parser.getClient(host), message);
+        final QueryActionEvent event = new QueryActionEvent(this, parser.getClient(host), message);
         event.setDisplayFormat(buff.toString());
         getEventBus().publish(event);
 
@@ -258,7 +257,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
 
             final StringBuffer format = new StringBuffer("queryNickChanged");
 
-            final DisplayableEvent event = new QueryNickchangeEvent(this, oldNick);
+            final QueryNickchangeEvent event = new QueryNickchangeEvent(this, oldNick);
             event.setDisplayFormat("queryNickChanged");
             getEventBus().publish(event);
 
@@ -281,7 +280,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
             final StringBuffer format = new StringBuffer(reason.isEmpty()
                     ? "queryQuit" : "queryQuitReason");
 
-            final DisplayableEvent event = new QueryQuitEvent(this, reason);
+            final QueryQuitEvent event = new QueryQuitEvent(this, reason);
             event.setDisplayFormat(format.toString());
             getEventBus().publish(event);
 

src/com/dmdirc/Server.java

@@ -93,8 +93,6 @@ import javax.net.ssl.TrustManager;
 
 import org.slf4j.LoggerFactory;
 
-import net.engio.mbassy.bus.MBassador;
-
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -223,7 +221,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
             final QueryFactory queryFactory,
             final RawFactory rawFactory,
             final URLBuilder urlBuilder,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final MessageEncoderFactory messageEncoderFactory,
             final ConfigProvider userSettings,
             final ScheduledExecutorService executorService,

src/com/dmdirc/ServerEventHandler.java

@@ -23,7 +23,6 @@
 package com.dmdirc;
 
 import com.dmdirc.events.AppErrorEvent;
-import com.dmdirc.events.DisplayableEvent;
 import com.dmdirc.events.EventUtils;
 import com.dmdirc.events.QuerySelfActionEvent;
 import com.dmdirc.events.QuerySelfMessageEvent;
@@ -96,8 +95,6 @@ import java.util.Date;
 
 import javax.annotation.Nonnull;
 
-import net.engio.mbassy.bus.MBassador;
-
 
 /**
  * Handles parser events for a Server object.
@@ -118,7 +115,7 @@ public class ServerEventHandler extends EventHandler implements
     /** The server instance that owns this event handler. */
     private final Server owner;
     /** Event bus to post events to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of ServerEventHandler.
@@ -126,7 +123,7 @@ public class ServerEventHandler extends EventHandler implements
      * @param owner    The Server instance that we're handling events for
      * @param eventBus The event bus to post events to
      */
-    public ServerEventHandler(final Server owner, final MBassador eventBus) {
+    public ServerEventHandler(final Server owner, final DMDircMBassador eventBus) {
         this.owner = owner;
         this.eventBus = eventBus;
     }
@@ -217,7 +214,7 @@ public class ServerEventHandler extends EventHandler implements
             final String message, final String host) {
         checkParser(parser);
 
-        final DisplayableEvent event
+        final ServerCtcprEvent event
                 = new ServerCtcprEvent(owner, owner.getParser().getClient(host), type, message);
         final String format = EventUtils.postDisplayable(eventBus, event, "privateCTCPreply");
         owner.doNotification(format, owner.getParser().getClient(host), type, message);
@@ -235,7 +232,7 @@ public class ServerEventHandler extends EventHandler implements
             final String message, final String host) {
         checkParser(parser);
 
-        final DisplayableEvent event = new ServerNoticeEvent(owner, owner.getParser().
+        final ServerNoticeEvent event = new ServerNoticeEvent(owner, owner.getParser().
                 getClient(host), message);
         final String format = EventUtils.postDisplayable(eventBus, event, "privateNotice");
         owner.doNotification(format, owner.getParser().getClient(host), message);
@@ -246,7 +243,7 @@ public class ServerEventHandler extends EventHandler implements
             final String message, final String host) {
         checkParser(parser);
 
-        final DisplayableEvent event = new ServerServernoticeEvent(owner, owner.getParser().
+        final ServerServernoticeEvent event = new ServerServernoticeEvent(owner, owner.getParser().
                 getClient(host), message);
         final String format = EventUtils.postDisplayable(eventBus, event, "serverNotice");
         owner.doNotification(format, owner.getParser().getClient(host), message);
@@ -256,7 +253,7 @@ public class ServerEventHandler extends EventHandler implements
     public void onMOTDStart(final Parser parser, final Date date, final String data) {
         checkParser(parser);
 
-        final DisplayableEvent event = new ServerMotdstartEvent(owner, data);
+        final ServerMotdstartEvent event = new ServerMotdstartEvent(owner, data);
         final String format = EventUtils.postDisplayable(eventBus, event, "motdStart");
         owner.doNotification(format, data);
     }
@@ -265,7 +262,7 @@ public class ServerEventHandler extends EventHandler implements
     public void onMOTDLine(final Parser parser, final Date date, final String data) {
         checkParser(parser);
 
-        final DisplayableEvent event = new ServerMotdlineEvent(owner, data);
+        final ServerMotdlineEvent event = new ServerMotdlineEvent(owner, data);
         final String format = EventUtils.postDisplayable(eventBus, event, "motdLine");
         owner.doNotification(format, data);
     }
@@ -275,7 +272,7 @@ public class ServerEventHandler extends EventHandler implements
             final boolean noMOTD, final String data) {
         checkParser(parser);
 
-        final DisplayableEvent event = new ServerMotdendEvent(owner, data);
+        final ServerMotdendEvent event = new ServerMotdendEvent(owner, data);
         final String format = EventUtils.postDisplayable(eventBus, event, "motdEnd");
         owner.doNotification(format, data);
     }
@@ -320,11 +317,11 @@ public class ServerEventHandler extends EventHandler implements
         }
 
         if (currentState == AwayState.AWAY) {
-            final DisplayableEvent event = new ServerAwayEvent(owner, reason);
+            final ServerAwayEvent event = new ServerAwayEvent(owner, reason);
             final String format = EventUtils.postDisplayable(eventBus, event, "away");
             owner.doNotification(format, reason);
         } else {
-            final DisplayableEvent event = new ServerBackEvent(owner);
+            final ServerBackEvent event = new ServerBackEvent(owner);
             final String format = EventUtils.postDisplayable(eventBus, event, "back");
             owner.doNotification(format);
         }
@@ -352,7 +349,7 @@ public class ServerEventHandler extends EventHandler implements
     public void onNoticeAuth(final Parser parser, final Date date, final String data) {
         checkParser(parser);
 
-        final DisplayableEvent event = new ServerAuthnoticeEvent(owner, data);
+        final ServerAuthnoticeEvent event = new ServerAuthnoticeEvent(owner, data);
         final String format = EventUtils.postDisplayable(eventBus, event, "authNotice");
         owner.doNotification(format, data);
     }
@@ -362,7 +359,7 @@ public class ServerEventHandler extends EventHandler implements
             final String target, final String host) {
         checkParser(parser);
 
-        final DisplayableEvent event = new ServerUnknownnoticeEvent(owner, host, target, message);
+        final ServerUnknownnoticeEvent event = new ServerUnknownnoticeEvent(owner, host, target, message);
         final String format = EventUtils.postDisplayable(eventBus, event, "unknownNotice");
         owner.doNotification(format, host, target, message);
     }
@@ -374,13 +371,13 @@ public class ServerEventHandler extends EventHandler implements
 
         if (parser.getLocalClient().equals(parser.getClient(host))) {
             // Local client
-            final DisplayableEvent event = new QuerySelfMessageEvent(owner.getQuery(target),
+            final QuerySelfMessageEvent event = new QuerySelfMessageEvent(owner.getQuery(target),
                     parser.getLocalClient(), message);
             final String format = EventUtils.postDisplayable(eventBus, event,
                     "querySelfExternalMessage");
             owner.getQuery(target).doNotification(format, parser.getLocalClient(), message);
         } else {
-            final DisplayableEvent event
+            final ServerUnknownmessageEvent event
                     = new ServerUnknownmessageEvent(owner, host, target, message);
             final String format = EventUtils.postDisplayable(eventBus, event, "unknownMessage");
             owner.doNotification(format, host, target, message);
@@ -394,13 +391,13 @@ public class ServerEventHandler extends EventHandler implements
 
         if (parser.getLocalClient().equals(parser.getClient(host))) {
             // Local client
-            final DisplayableEvent event = new QuerySelfActionEvent(owner.getQuery(target),
+            final QuerySelfActionEvent event = new QuerySelfActionEvent(owner.getQuery(target),
                     parser.getLocalClient(), message);
             final String format = EventUtils.postDisplayable(eventBus, event,
                     "querySelfExternalAction");
             owner.getQuery(target).doNotification(format, parser.getLocalClient(), message);
         } else {
-            final DisplayableEvent event
+            final ServerUnknownactionEvent event
                     = new ServerUnknownactionEvent(owner, host, target, message);
             final String format = EventUtils.postDisplayable(eventBus, event, "unknownAction");
             owner.doNotification(format, host, target, message);
@@ -412,7 +409,7 @@ public class ServerEventHandler extends EventHandler implements
             final ClientInfo client, final String host, final String modes) {
         checkParser(parser);
 
-        final DisplayableEvent event = new ServerUsermodesEvent(owner,
+        final ServerUsermodesEvent event = new ServerUsermodesEvent(owner,
                 owner.getParser().getClient(host), modes);
         final String format = EventUtils.postDisplayable(eventBus, event, "userModeChanged");
         owner.doNotification(format, owner.getParser().getClient(host), modes);
@@ -423,7 +420,7 @@ public class ServerEventHandler extends EventHandler implements
             final ClientInfo client, final String modes) {
         checkParser(parser);
 
-        final DisplayableEvent event = new ServerUsermodesEvent(owner, client, modes);
+        final ServerUsermodesEvent event = new ServerUsermodesEvent(owner, client, modes);
         final String format = EventUtils.postDisplayable(eventBus, event, modes.isEmpty()
                 || "+".equals(modes) ? "userNoModes" : "userModeDiscovered");
         owner.doNotification(format, client, modes);
@@ -435,7 +432,7 @@ public class ServerEventHandler extends EventHandler implements
         checkParser(parser);
 
         owner.addInvite(new Invite(owner, channel, userHost));
-        final DisplayableEvent event = new ServerInvitereceivedEvent(owner, owner.getParser().
+        final ServerInvitereceivedEvent event = new ServerInvitereceivedEvent(owner, owner.getParser().
                 getClient(userHost), channel);
         final String format = EventUtils.postDisplayable(eventBus, event, "inviteReceived");
         owner.doNotification(format, owner.getParser().getClient(userHost), channel);
@@ -446,7 +443,7 @@ public class ServerEventHandler extends EventHandler implements
             final String host) {
         checkParser(parser);
 
-        final DisplayableEvent event = new ServerWallopsEvent(owner,
+        final ServerWallopsEvent event = new ServerWallopsEvent(owner,
                 owner.getParser().getClient(host), message);
         final String format = EventUtils.postDisplayable(eventBus, event, "wallop");
         owner.doNotification(format, owner.getParser().getClient(host), message);
@@ -458,7 +455,7 @@ public class ServerEventHandler extends EventHandler implements
             final String host) {
         checkParser(parser);
 
-        final DisplayableEvent event = new ServerWallusersEvent(owner,
+        final ServerWallusersEvent event = new ServerWallusersEvent(owner,
                 owner.getParser().getClient(host), message);
         final String format = EventUtils.postDisplayable(eventBus, event, "walluser");
         owner.doNotification(format, owner.getParser().getClient(host), message);
@@ -469,7 +466,7 @@ public class ServerEventHandler extends EventHandler implements
             final String host) {
         checkParser(parser);
 
-        final DisplayableEvent event = new ServerWalldesyncEvent(owner,
+        final ServerWalldesyncEvent event = new ServerWalldesyncEvent(owner,
                 owner.getParser().getClient(host), message);
         final String format = EventUtils.postDisplayable(eventBus, event, "walldesync");
         owner.doNotification(format, owner.getParser().getClient(host), message);
@@ -481,7 +478,7 @@ public class ServerEventHandler extends EventHandler implements
         checkParser(parser);
 
         if (client.equals(owner.getParser().getLocalClient())) {
-            final DisplayableEvent event = new ServerNickchangeEvent(owner, oldNick,
+            final ServerNickchangeEvent event = new ServerNickchangeEvent(owner, oldNick,
                     client.getNickname());
             final String format = EventUtils.postDisplayable(eventBus, event, "selfNickChange");
             owner.doNotification(format, oldNick, client.getNickname());
@@ -493,7 +490,7 @@ public class ServerEventHandler extends EventHandler implements
     public void onServerError(final Parser parser, final Date date, final String message) {
         checkParser(parser);
 
-        final DisplayableEvent event = new ServerErrorEvent(owner, message);
+        final ServerErrorEvent event = new ServerErrorEvent(owner, message);
         final String format = EventUtils.postDisplayable(eventBus, event, "serverError");
         owner.doNotification(format, message);
     }

src/com/dmdirc/ServerFactoryImpl.java

@@ -32,8 +32,6 @@ import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.util.URLBuilder;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.net.URI;
 import java.util.concurrent.ScheduledExecutorService;
 
@@ -58,7 +56,7 @@ public class ServerFactoryImpl {
     private final Provider<QueryFactory> queryFactory;
     private final Provider<RawFactory> rawFactory;
     private final URLBuilder urlBuilder;
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     private final MessageEncoderFactory messageEncoderFactory;
     private final ConfigProvider userSettings;
 
@@ -75,7 +73,7 @@ public class ServerFactoryImpl {
             final Provider<QueryFactory> queryFactory,
             final Provider<RawFactory> rawFactory,
             final URLBuilder urlBuilder,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final MessageEncoderFactory messageEncoderFactory,
             @ClientModule.UserConfig final ConfigProvider userSettings) {
         this.manager = manager;

src/com/dmdirc/ServerManager.java

@@ -49,8 +49,6 @@ import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 
-import net.engio.mbassy.bus.MBassador;
-
 import static com.google.common.base.Preconditions.checkArgument;
 
 /**
@@ -73,7 +71,7 @@ public class ServerManager implements ServerFactory {
     /** Concrete server factory to use. */
     private final ServerFactoryImpl serverFactoryImpl;
     /** Event bus for servers. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of ServerManager.
@@ -92,7 +90,7 @@ public class ServerManager implements ServerFactory {
             final Provider<CommandController> commandController,
             final WindowManager windowManager,
             final ServerFactoryImpl serverFactory,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.identityController = identityController;
         this.identityFactory = identityFactory;
         this.commandController = commandController;

src/com/dmdirc/actions/Action.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.actions;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.GlobalWindow;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
@@ -51,8 +52,6 @@ import java.util.Map;
 
 import javax.inject.Provider;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * Describes a single action.
  */
@@ -79,7 +78,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
     /** The controller to use to retrieve components, comparisons, etc. */
     private final ActionController actionController;
     /** Event bus to post events to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** The file system to read/write actions to. */
     private final FileSystem filesystem;
     /** The config file we're using. */
@@ -101,7 +100,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
      * @param group                       The group the action belongs to
      * @param name                        The name of the action
      */
-    public Action(final FileSystem filesystem, final MBassador eventBus,
+    public Action(final FileSystem filesystem, final DMDircMBassador eventBus,
             final Provider<GlobalWindow> globalWindowProvider,
             final ActionSubstitutorFactory substitutorFactory,
             final ActionController actionController, final IdentityController identityController,
@@ -149,7 +148,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
      * @param conditionTree               The condition tree to use
      * @param newFormat                   The new formatter to use
      */
-    public Action(final FileSystem filesystem, final MBassador eventBus,
+    public Action(final FileSystem filesystem, final DMDircMBassador eventBus,
             final Provider<GlobalWindow> globalWindowProvider,
             final ActionSubstitutorFactory substitutorFactory,
             final ActionController actionController, final IdentityController identityController,

src/com/dmdirc/actions/ActionFactory.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.actions;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.GlobalWindow;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
@@ -29,8 +30,6 @@ import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.config.IdentityController;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
 import java.util.List;
@@ -56,7 +55,7 @@ public class ActionFactory {
     /** The base directory to store actions in. */
     private final String actionsDirectory;
     /** Event bus to post events on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** The file system to read/write actions to. */
     private final FileSystem filesystem;
 
@@ -71,7 +70,7 @@ public class ActionFactory {
      * @param actionsDirectory            The base directory to store actions in.
      */
     @Inject
-    public ActionFactory(final MBassador eventBus, final Provider<ActionController> actionController,
+    public ActionFactory(final DMDircMBassador eventBus, final Provider<ActionController> actionController,
             final Provider<IdentityController> identityController,
             final Provider<GlobalWindow> globalWindowProvider,
             final ActionSubstitutorFactory substitutorFactory,

src/com/dmdirc/actions/ActionManager.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.actions;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Precondition;
 import com.dmdirc.actions.internal.WhoisNumericFormatter;
 import com.dmdirc.config.ConfigBinding;
@@ -56,7 +57,6 @@ import javax.inject.Provider;
 
 import org.slf4j.LoggerFactory;
 
-import net.engio.mbassy.bus.MBassador;
 import net.engio.mbassy.listener.Handler;
 
 import static com.google.common.base.Preconditions.checkArgument;
@@ -95,7 +95,7 @@ public class ActionManager implements ActionController {
     /** The listeners that we have registered. */
     private final MapList<ActionType, ActionListener> listeners = new MapList<>();
     /** The global event bus to monitor. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** The directory to load and save actions in. */
     private final String directory;
     /** Indicates whether or not user actions should be killed (not processed). */
@@ -117,7 +117,7 @@ public class ActionManager implements ActionController {
             final ActionFactory factory,
             final Provider<Set<ActionGroup>> actionWrappersProvider,
             final Provider<UpdateManager> updateManagerProvider,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final String directory) {
         this.identityManager = identityManager;
         this.factory = factory;

src/com/dmdirc/actions/internal/WhoisNumericFormatter.java

@@ -30,7 +30,7 @@ import com.dmdirc.interfaces.config.ConfigProvider;
 import java.util.HashMap;
 import java.util.Map;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -45,7 +45,7 @@ public class WhoisNumericFormatter {
     /** The identity to add formatters to. */
     private final ConfigProvider identity;
     /** Event bus to subscribe to events on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new whois numeric formatter that will add automatic formats to the specified
@@ -55,7 +55,7 @@ public class WhoisNumericFormatter {
      * @param eventBus The event bus to subscribe to events on
      */
     public WhoisNumericFormatter(final ConfigProvider identity,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.identity = identity;
         this.eventBus = eventBus;
     }

src/com/dmdirc/actions/wrappers/PerformWrapper.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.actions.wrappers;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionComponentChain;
 import com.dmdirc.actions.ActionCondition;
@@ -44,8 +45,6 @@ import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * An action wrapper for performs.
  */
@@ -57,7 +56,7 @@ public class PerformWrapper extends ActionGroup {
     /** Factory to use for actions. */
     private final ActionFactory actionFactory;
     /** The event bus to post events to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of PerformWrapper.
@@ -67,7 +66,7 @@ public class PerformWrapper extends ActionGroup {
      */
     @Inject
     public PerformWrapper(final ActionFactory actionFactory,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         super("performs");
 
         this.actionFactory = actionFactory;

src/com/dmdirc/commandparser/PopupManager.java

@@ -22,14 +22,13 @@
 
 package com.dmdirc.commandparser;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ClientPopupGeneratedEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import javax.inject.Inject;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * The popup manager manages which commands should be present in popup menus.
  */
@@ -38,7 +37,7 @@ public class PopupManager {
     /** The command controller to use for items. */
     private final CommandController commandController;
     /** The bus to dispatch events on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of PopupManager.
@@ -47,7 +46,7 @@ public class PopupManager {
      * @param eventBus          The bus to dispatch events on.
      */
     @Inject
-    public PopupManager(final CommandController commandController, final MBassador eventBus) {
+    public PopupManager(final CommandController commandController, final DMDircMBassador eventBus) {
         this.commandController = commandController;
         this.eventBus = eventBus;
     }

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

@@ -30,7 +30,7 @@ import java.util.concurrent.ConcurrentSkipListMap;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -41,7 +41,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
 public class AutoCommandManager {
 
     /** The bus to listen for events on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** The factory to use to create handlers. */
     private final AutoCommandHandlerFactory factory;
     /** Known auto commands, mapped on to their handlers. */
@@ -56,7 +56,7 @@ public class AutoCommandManager {
      * @param factory  The factory to use to create handlers.
      */
     @Inject
-    public AutoCommandManager(final MBassador eventBus, final AutoCommandHandlerFactory factory) {
+    public AutoCommandManager(final DMDircMBassador eventBus, final AutoCommandHandlerFactory factory) {
         this.eventBus = eventBus;
         this.factory = factory;
     }

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

@@ -24,6 +24,7 @@ package com.dmdirc.commandparser.commands.global;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.CustomWindow;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
@@ -39,8 +40,6 @@ import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.util.URLBuilder;
 
-import net.engio.mbassy.bus.MBassador;
-
 import javax.inject.Inject;
 
 /**
@@ -58,7 +57,7 @@ public class OpenWindow 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;
     /** The config provider to retrieve settings from. */
     private final AggregateConfigProvider configProvider;
 
@@ -76,7 +75,7 @@ public class OpenWindow extends Command implements IntelligentCommand {
             final CommandController controller,
             final WindowManager windowManager,
             final URLBuilder urlBuilder,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             @GlobalConfig final AggregateConfigProvider configProvider) {
         super(controller);
 

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.commands.server;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.BaseCommandInfo;
@@ -47,7 +48,6 @@ import java.util.List;
 
 import javax.inject.Inject;
 
-import net.engio.mbassy.bus.MBassador;
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -73,7 +73,7 @@ public class JoinChannelCommand extends Command implements IntelligentCommand {
     @Inject
     public JoinChannelCommand(
             final CommandController controller,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         super(controller);
         eventBus.subscribe(this);
     }

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

@@ -23,6 +23,7 @@
 package com.dmdirc.commandparser.parsers;
 
 import com.dmdirc.Channel;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
@@ -33,8 +34,6 @@ import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 
-import net.engio.mbassy.bus.MBassador;
-
 import javax.annotation.Nonnull;
 
 /**
@@ -57,7 +56,7 @@ public class ChannelCommandParser extends ChatCommandParser {
      * @param eventBus          Event bus to post events on
      */
     public ChannelCommandParser(final Server server, final CommandController commandController,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         super(server, commandController, eventBus);
     }
 

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.parsers;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.MessageTarget;
 import com.dmdirc.Server;
@@ -33,8 +34,6 @@ import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 
-import net.engio.mbassy.bus.MBassador;
-
 import javax.annotation.Nonnull;
 
 /**
@@ -57,7 +56,7 @@ public class ChatCommandParser extends ServerCommandParser {
      * @param eventBus          Event but to post events on
      */
     public ChatCommandParser(final Server server, final CommandController commandController,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         super(server.getConfigManager(), commandController, eventBus);
         super.setOwner(server);
     }

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.parsers;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
@@ -33,7 +34,6 @@ import com.dmdirc.commandparser.commands.CommandOptions;
 import com.dmdirc.commandparser.commands.ExternalCommand;
 import com.dmdirc.commandparser.commands.PreviousCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
-import com.dmdirc.events.DisplayableEvent;
 import com.dmdirc.events.EventUtils;
 import com.dmdirc.events.UnknownCommandEvent;
 import com.dmdirc.interfaces.CommandController;
@@ -47,8 +47,6 @@ import java.util.Map;
 
 import javax.annotation.Nonnull;
 
-import net.engio.mbassy.bus.MBassador;
-
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
@@ -67,7 +65,7 @@ public abstract class CommandParser implements Serializable {
     /** Command manager to use. */
     protected final CommandController commandManager;
     /** Event bus to post events to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of CommandParser.
@@ -78,7 +76,7 @@ public abstract class CommandParser implements Serializable {
      */
     protected CommandParser(final AggregateConfigProvider configManager,
             final CommandController commandManager,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.eventBus = eventBus;
         commands = new HashMap<>();
         history = new RollingList<>(configManager.getOptionInt("general", "commandhistory"));
@@ -339,7 +337,7 @@ public abstract class CommandParser implements Serializable {
         if (origin == null) {
             eventBus.publish(new UnknownCommandEvent(null, args.getCommandName(), args.getArguments()));
         } else {
-            final DisplayableEvent event = new UnknownCommandEvent(origin, args.getCommandName(),
+            final UnknownCommandEvent event = new UnknownCommandEvent(origin, args.getCommandName(),
                     args.getArguments());
             final String format = EventUtils.postDisplayable(eventBus, event, "unknownCommand");
 

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

@@ -34,7 +34,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import javax.annotation.Nonnull;
 import javax.inject.Inject;
@@ -60,7 +60,7 @@ public class GlobalCommandParser extends CommandParser {
     public GlobalCommandParser(
             @ClientModule.GlobalConfig final AggregateConfigProvider configManager,
             final CommandController commandManager,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         super(configManager, commandManager, eventBus);
     }
 

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.parsers;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
 import com.dmdirc.Server;
@@ -33,8 +34,6 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.QueryCommandContext;
 import com.dmdirc.interfaces.CommandController;
 
-import net.engio.mbassy.bus.MBassador;
-
 import javax.annotation.Nonnull;
 
 /**
@@ -58,7 +57,7 @@ public class QueryCommandParser extends ChatCommandParser {
      * @param eventBus          Event bus to post events on
      */
     public QueryCommandParser(final Server server, final CommandController commandController,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         super(server, commandController, eventBus);
     }
 

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.commandparser.parsers;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
@@ -34,8 +35,6 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
-import net.engio.mbassy.bus.MBassador;
-
 import javax.annotation.Nonnull;
 
 /**
@@ -56,7 +55,7 @@ public class ServerCommandParser extends GlobalCommandParser {
     public ServerCommandParser(
             final AggregateConfigProvider configManager,
             final CommandController commandController,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         super(configManager, commandController, eventBus);
     }
     /**

src/com/dmdirc/config/IdentityManager.java

@@ -38,7 +38,7 @@ import com.dmdirc.util.io.ConfigFile;
 import com.dmdirc.util.io.InvalidConfigFileException;
 import com.dmdirc.util.resourcemanager.ResourceManager;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import java.io.File;
 import java.io.IOException;
@@ -76,7 +76,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
      */
     private final MapList<String, ConfigProvider> identities = new MapList<>();
     /** The event bus to post events to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /**
      * The {@link IdentityListener}s that have registered with this manager.
      *
@@ -101,7 +101,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
      * @param eventBus            The event bus to post events to
      */
     public IdentityManager(final String baseDirectory, final String identitiesDirectory,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.configDirectory = baseDirectory;
         this.identitiesDirectory = identitiesDirectory;
         this.eventBus = eventBus;

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.config.prefs;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ClientPrefsClosedEvent;
 import com.dmdirc.events.ClientPrefsOpenedEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -40,8 +41,6 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * Manages categories that should appear in the preferences dialog.
  */
@@ -66,7 +65,7 @@ public class PreferencesDialogModel {
     /** Plugin manager. */
     private final PluginManager pluginManager;
     /** Event bus to post events on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of PreferencesDialogModel.
@@ -88,7 +87,7 @@ public class PreferencesDialogModel {
             final AggregateConfigProvider configManager,
             final ConfigProvider identity,
             final PluginManager pluginManager,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.pluginPanel = pluginPanel;
         this.themePanel = themePanel;
         this.updatesPanel = updatesPanel;

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.config.prefs;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ConnectionPrefsRequestedEvent;
 import com.dmdirc.events.GroupChatPrefsRequestedEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -31,8 +32,6 @@ import com.dmdirc.util.validators.OptionalValidator;
 
 import javax.inject.Inject;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * Manages preferences for the client.
  *
@@ -41,10 +40,10 @@ import net.engio.mbassy.bus.MBassador;
 public class PreferencesManager {
 
     /** Event bus to public events on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     @Inject
-    public PreferencesManager(final MBassador eventBus) {
+    public PreferencesManager(final DMDircMBassador eventBus) {
         this.eventBus = eventBus;
     }
 

src/com/dmdirc/events/EventUtils.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 /**
  * Utilities for interacting with events.
@@ -41,9 +41,9 @@ public final class EventUtils {
      *
      * @return The event's display format after it has been posted on the event bus.
      */
-    public static String postDisplayable(
-            final MBassador eventBus,
-            final DisplayableEvent event,
+    public static <T extends DMDircEvent & DisplayableEvent> String postDisplayable(
+            final DMDircMBassador eventBus,
+            final T event,
             final String displayFormat) {
         event.setDisplayFormat(displayFormat);
         eventBus.publish(event);

src/com/dmdirc/events/FrameComponentEvent.java

@@ -27,7 +27,7 @@ import com.dmdirc.FrameContainer;
 /**
  * Base class for frame component events.
  */
-public abstract class FrameComponentEvent {
+public abstract class FrameComponentEvent extends DMDircEvent {
 
     private final FrameContainer container;
     private final String component;

src/com/dmdirc/events/StatusBarEvent.java

@@ -25,5 +25,5 @@ package com.dmdirc.events;
 /**
  * Base class for all status bar events.
  */
-public abstract class StatusBarEvent {
+public abstract class StatusBarEvent extends DMDircEvent{
 }

src/com/dmdirc/interfaces/GroupChat.java

@@ -25,7 +25,7 @@ package com.dmdirc.interfaces;
 import com.dmdirc.Topic;
 
 import com.google.common.base.Optional;
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import java.util.List;
 
@@ -60,7 +60,7 @@ public interface GroupChat extends Chat {
      *
      * @return An event bus scoped to this channel.
      */
-    MBassador getEventBus();
+    DMDircMBassador getEventBus();
 
     /**
      * Retrieves the maximum length that a topic on this channel can be.

src/com/dmdirc/logger/ErrorManager.java

@@ -37,7 +37,7 @@ import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.atomic.AtomicLong;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 import net.engio.mbassy.listener.Handler;
 import net.kencochrane.raven.DefaultRavenFactory;
 import net.kencochrane.raven.RavenFactory;
@@ -88,7 +88,7 @@ public class ErrorManager implements ConfigChangeListener {
      * @param eventBus     The event bus to listen for error events on.
      */
     public void initialise(final AggregateConfigProvider globalConfig, final String directory,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         eventBus.subscribe(this);
         RavenFactory.registerFactory(new DefaultRavenFactory());
 

src/com/dmdirc/plugins/CorePluginExtractor.java

@@ -35,7 +35,7 @@ import java.util.Map;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 /**
  * Utility class that can extract bundled plugins.
@@ -48,7 +48,7 @@ public class CorePluginExtractor {
     /** The directory to extract plugins to. */
     private final String pluginDir;
     /** The event bus to post events to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of {@link CorePluginExtractor}.
@@ -61,7 +61,7 @@ public class CorePluginExtractor {
     public CorePluginExtractor(
             final PluginManager pluginManager,
             @Directory(DirectoryType.PLUGINS) final String pluginDir,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.pluginManager = pluginManager;
         this.pluginDir = pluginDir;
         this.eventBus = eventBus;

src/com/dmdirc/plugins/LegacyServiceLocator.java

@@ -33,7 +33,7 @@ import javax.annotation.Nullable;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -46,10 +46,10 @@ public class LegacyServiceLocator implements ServiceLocator {
     /** The plugin manager to use to find services. */
     private final PluginManager pluginManager;
     /** The event bus to post errors . */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     @Inject
-    public LegacyServiceLocator(final PluginManager pluginManager, final MBassador eventBus) {
+    public LegacyServiceLocator(final PluginManager pluginManager, final DMDircMBassador eventBus) {
         this.pluginManager = checkNotNull(pluginManager);
         this.eventBus = checkNotNull(eventBus);
     }

src/com/dmdirc/plugins/PluginInfo.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.plugins;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.ConfigFileBackedConfigProvider;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.events.AppErrorEvent;
@@ -53,7 +54,6 @@ import javax.inject.Provider;
 import org.slf4j.LoggerFactory;
 
 import dagger.ObjectGraph;
-import net.engio.mbassy.bus.MBassador;
 
 /**
  * Stores plugin metadata and handles loading of plugin resources.
@@ -94,7 +94,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
     /** List of configuration providers. */
     private final List<ConfigProvider> configProviders = new ArrayList<>();
     /** Event bus to post plugin loaded events to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Create a new PluginInfo.
@@ -110,7 +110,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
     public PluginInfo(
             final PluginMetaData metadata,
             final Provider<PluginInjectorInitialiser> injectorInitialiser,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final IdentityController identityController,
             final ObjectGraph objectGraph) throws PluginException {
         this.injectorInitialiser = injectorInitialiser;

src/com/dmdirc/plugins/PluginInjectorInitialiser.java

@@ -23,6 +23,7 @@
 package com.dmdirc.plugins;
 
 import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionFactory;
 import com.dmdirc.actions.ActionManager;
@@ -41,8 +42,6 @@ import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.util.SimpleInjector;
 import com.dmdirc.util.URLBuilder;
 
-import net.engio.mbassy.bus.MBassador;
-
 import javax.inject.Inject;
 
 /**
@@ -69,7 +68,7 @@ public class PluginInjectorInitialiser {
     private final URLBuilder urlBuilder;
     private final ColourManager colourManager;
     private final ActionSubstitutorFactory actionSubstitutorFactory;
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     private final IconManager iconManager;
 
     @Inject
@@ -90,7 +89,7 @@ public class PluginInjectorInitialiser {
             final URLBuilder urlBuilder,
             final ColourManager colourManager,
             final ActionSubstitutorFactory actionSubstitutorFactory,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             @GlobalConfig final IconManager iconManager) {
         this.actionManager = actionManager;
         this.actionFactory = actionFactory;

src/com/dmdirc/plugins/PluginManager.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.plugins;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.AppErrorEvent;
 import com.dmdirc.events.ClientPrefsClosedEvent;
 import com.dmdirc.events.ClientPrefsOpenedEvent;
@@ -49,7 +50,6 @@ import java.util.Map;
 import javax.inject.Provider;
 
 import dagger.ObjectGraph;
-import net.engio.mbassy.bus.MBassador;
 import net.engio.mbassy.listener.Handler;
 
 /**
@@ -76,7 +76,7 @@ public class PluginManager implements ServiceManager {
     /** The graph to pass to plugins for DI purposes. */
     private final ObjectGraph objectGraph;
     /** Event bus to pass to plugin info for plugin loaded events. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of PluginManager.
@@ -89,7 +89,7 @@ public class PluginManager implements ServiceManager {
      * @param directory           The directory to load plugins from.
      */
     public PluginManager(
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final IdentityController identityController,
             final UpdateManager updateManager,
             final Provider<PluginInjectorInitialiser> initialiserProvider,

src/com/dmdirc/ui/core/components/StatusBarManager.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.ui.core.components;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.StatusBarComponentAddedEvent;
 import com.dmdirc.events.StatusBarComponentRemovedEvent;
 import com.dmdirc.events.StatusBarMessageClearEvent;
@@ -36,8 +37,6 @@ import java.util.concurrent.CopyOnWriteArraySet;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * A manager for status bars or status bar like components.
  *
@@ -49,10 +48,10 @@ public class StatusBarManager implements StatusBar {
     /** A collection of known status bars. */
     private final Collection<StatusBar> statusBars = new CopyOnWriteArraySet<>();
     /** Event bus to fire status bar events on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     @Inject
-    public StatusBarManager(final MBassador eventBus) {
+    public StatusBarManager(final DMDircMBassador eventBus) {
         this.eventBus = eventBus;
     }
 

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.ui.core.util;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.ServerManager;
 import com.dmdirc.events.UnknownURLEvent;
 import com.dmdirc.events.UserErrorEvent;
@@ -40,15 +41,13 @@ import java.util.Date;
 
 import javax.inject.Inject;
 
-import net.engio.mbassy.bus.MBassador;
-
 /** Handles URLs. */
 public class URLHandler {
 
     /** The time a browser was last launched. */
     private static Date lastLaunch;
     /** Event bus to fire unknown protocol errors on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** Config manager. */
     private final AggregateConfigProvider config;
     /** Server manager to use to connect to servers. */
@@ -68,7 +67,7 @@ public class URLHandler {
      */
     @Inject
     public URLHandler(
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final AggregateConfigProvider globalConfig,
             final ServerManager serverManager,
             final StatusBarManager statusBarManager) {

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

@@ -53,7 +53,7 @@ import java.util.TimerTask;
 
 import org.slf4j.LoggerFactory;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 /**
  * Handles events generated by a user typing into a textfield. Allows the user to use shortcut keys
@@ -111,7 +111,7 @@ public abstract class InputHandler implements ConfigChangeListener {
     /** The controller to use to retrieve command information. */
     private final CommandController commandController;
     /** The event bus to use to dispatch input events. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of InputHandler. Adds listeners to the target that we need to operate.
@@ -129,7 +129,7 @@ public abstract class InputHandler implements ConfigChangeListener {
             final CommandController commandController,
             final CommandParser commandParser,
             final FrameContainer parentWindow,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         buffer = new RollingList<>(parentWindow.getConfigManager()
                 .getOptionInt("ui", "inputbuffersize"), "");
 

src/com/dmdirc/ui/themes/Theme.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.ui.themes;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.config.IdentityController;
@@ -34,8 +35,6 @@ import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * Represents one theme file.
  */
@@ -46,7 +45,7 @@ public class Theme implements Comparable<Theme> {
     /** The file to load the theme from. */
     private final File file;
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
     /** The config file containing theme meta-data. */
     private ConfigFile metadata;
     /** The resource manager we're using for this theme. */
@@ -56,7 +55,7 @@ public class Theme implements Comparable<Theme> {
     /** The Identity we've registered. */
     private ThemeIdentity identity;
 
-    public Theme(final MBassador eventBus, final IdentityController identityController,
+    public Theme(final DMDircMBassador eventBus, final IdentityController identityController,
             final File file) {
         this.identityController = identityController;
         this.file = file;

src/com/dmdirc/ui/themes/ThemeManager.java

@@ -32,7 +32,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 /**
  * Manages available themes.
@@ -46,7 +46,7 @@ public class ThemeManager {
     /** Available themes. */
     private final Map<String, Theme> themes = new HashMap<>();
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of the {@link ThemeManager}.
@@ -56,7 +56,7 @@ public class ThemeManager {
      * @param themesDirectory    The directory to load themes from.
      */
     public ThemeManager(
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final IdentityController identityController,
             final String themesDirectory) {
         this.identityController = identityController;

src/com/dmdirc/updater/UpdateChecker.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.updater;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
@@ -34,8 +35,6 @@ import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.Semaphore;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * The update checker contacts the DMDirc website to check to see if there are any updates
  * available.
@@ -53,7 +52,7 @@ public final class UpdateChecker implements Runnable {
     /** The controller to use to read and write settings. */
     private final IdentityController identityController;
     /** The event bus to post errors to. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of {@link UpdateChecker}.
@@ -65,7 +64,7 @@ public final class UpdateChecker implements Runnable {
     public UpdateChecker(
             final CachingUpdateManager updateManager,
             final IdentityController identityController,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.updateManager = updateManager;
         this.identityController = identityController;
         this.eventBus = eventBus;
@@ -124,7 +123,7 @@ public final class UpdateChecker implements Runnable {
     public static void init(
             final CachingUpdateManager manager,
             final IdentityController controller,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         final int last = controller.getGlobalConfiguration()
                 .getOptionInt(DOMAIN, "lastcheck");
         final int freq = controller.getGlobalConfiguration()
@@ -164,7 +163,7 @@ public final class UpdateChecker implements Runnable {
     public static void checkNow(
             final CachingUpdateManager updateManager,
             final IdentityController identityController,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         checkNow(updateManager, identityController, eventBus, "Update Checker thread");
     }
 
@@ -179,7 +178,7 @@ public final class UpdateChecker implements Runnable {
     public static void checkNow(
             final CachingUpdateManager updateManager,
             final IdentityController identityController,
-            final MBassador eventBus,
+            final DMDircMBassador eventBus,
             final String threadName) {
         new Thread(new UpdateChecker(updateManager, identityController, eventBus), threadName)
                 .start();

src/com/dmdirc/updater/UpdaterModule.java

@@ -42,7 +42,7 @@ import com.dmdirc.updater.manager.UpdateManager;
 import com.dmdirc.updater.retrieving.DownloadRetrievalStrategy;
 import com.dmdirc.updater.retrieving.UpdateRetrievalStrategy;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import javax.inject.Singleton;
 
@@ -107,7 +107,7 @@ public class UpdaterModule {
             final CommandLineParser commandLineParser,
             final DMDircUpdateManager updateManager,
             final IdentityController identityController,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         UpdateChecker.init(updateManager, identityController, eventBus);
 
         if (commandLineParser.getLauncherVersion() != null) {

src/com/dmdirc/util/ChildEventBusManager.java

@@ -22,26 +22,28 @@
 
 package com.dmdirc.util;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
+import com.dmdirc.events.DMDircEvent;
+
 import net.engio.mbassy.bus.config.BusConfiguration;
 import net.engio.mbassy.listener.Handler;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
- * Utility for creating and managing instances of {@link net.engio.mbassy.bus.MBassador} that are slaved to a parent bus.
+ * Utility for creating and managing instances of {@link com.dmdirc.DMDircMBassador} that are slaved to a parent bus.
  * <p>
  * Any events sent on the child bus will be propagated up to the parent bus.
  */
 public class ChildEventBusManager {
 
-    private final MBassador parent;
-    private final MBassador child;
+    private final DMDircMBassador parent;
+    private final DMDircMBassador child;
     private final EventPropagator propagator;
 
-    public ChildEventBusManager(final MBassador parent) {
+    public ChildEventBusManager(final DMDircMBassador parent) {
         this.parent = checkNotNull(parent);
-        this.child = new MBassador(BusConfiguration.Default());
+        this.child = new DMDircMBassador(BusConfiguration.Default());
         this.propagator = new EventPropagator();
     }
 
@@ -68,15 +70,15 @@ public class ChildEventBusManager {
      *
      * @return The child bus belonging to this manager.
      */
-    public MBassador getChildBus() {
+    public DMDircMBassador getChildBus() {
         return child;
     }
 
     private class EventPropagator {
 
         @Handler
-        public void handleEvent(final Object object) {
-            parent.post(object);
+        public void handleEvent(final DMDircEvent event) {
+            parent.post(event);
         }
 
     }

src/com/dmdirc/util/URLBuilder.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.util;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.plugins.PluginManager;
@@ -34,8 +35,6 @@ import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 
-import net.engio.mbassy.bus.MBassador;
-
 /**
  * Provides methods for building URLs to reference DMDirc resources.
  */
@@ -47,7 +46,7 @@ public class URLBuilder {
     /** Provider to retrieve a theme manager instance when needed. */
     private final Provider<ThemeManager> themeManagerProvider;
     /** The event bus to post errors on. */
-    private final MBassador eventBus;
+    private final DMDircMBassador eventBus;
 
     /**
      * Creates a new instance of URLBuilder.
@@ -60,7 +59,7 @@ public class URLBuilder {
     public URLBuilder(
             final Provider<PluginManager> pluginManagerProvider,
             final Provider<ThemeManager> themeManagerProvider,
-            final MBassador eventBus) {
+            final DMDircMBassador eventBus) {
         this.pluginManagerProvider = pluginManagerProvider;
         this.themeManagerProvider = themeManagerProvider;
         this.eventBus = eventBus;

test/com/dmdirc/ServerManagerTest.java

@@ -32,8 +32,6 @@ import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.WindowManager;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.net.URI;
 import java.util.Arrays;
 import java.util.concurrent.ScheduledExecutorService;
@@ -70,7 +68,7 @@ public class ServerManagerTest {
     @Mock private WindowManager windowManager;
     @Mock private ServerFactoryImpl serverFactoryImpl;
     @Mock private Server server;
-    @Mock private MBassador eventBus;
+    @Mock private DMDircMBassador eventBus;
 
     @Captor private ArgumentCaptor<URI> uriCaptor;
 

test/com/dmdirc/ServerTest.java

@@ -35,8 +35,6 @@ import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.util.URLBuilder;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.net.URI;
 import java.util.concurrent.ScheduledExecutorService;
 
@@ -70,7 +68,7 @@ public class ServerTest {
     @Mock private RawFactory rawFactory;
     @Mock private StatusBarManager statusBarManager;
     @Mock private URLBuilder urlBuilder;
-    @Mock private MBassador eventBus;
+    @Mock private DMDircMBassador eventBus;
     @Mock private ScheduledExecutorService executorService;
     @Mock private MessageEncoderFactory messageEncoderFactory;
 

test/com/dmdirc/WritableFrameContainerTest.java

@@ -29,8 +29,6 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.util.URLBuilder;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.util.Arrays;
 
 import org.junit.Before;
@@ -48,7 +46,7 @@ public class WritableFrameContainerTest {
     @Mock private ServerManager serverManager;
     @Mock private MessageSinkManager messageSinkManager;
     @Mock private URLBuilder urlBuilder;
-    @Mock private MBassador eventBus;
+    @Mock private DMDircMBassador eventBus;
     private CommandManager commands;
 
     @Before

test/com/dmdirc/actions/ActionTest.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.actions;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.GlobalWindow;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.config.prefs.PreferencesSetting;
@@ -36,8 +37,6 @@ import com.dmdirc.logger.Logger;
 import com.dmdirc.util.io.ConfigFile;
 import com.dmdirc.util.io.InvalidConfigFileException;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.io.IOException;
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
@@ -72,7 +71,7 @@ public class ActionTest {
 
     @Rule public final TemporaryFolder folder = new TemporaryFolder();
 
-    @Mock private MBassador eventBus;
+    @Mock private DMDircMBassador eventBus;
     @Mock private Provider<GlobalCommandParser> gcpProvider;
     @Mock private Provider<GlobalWindow> gwProvider;
     @Mock private ActionSubstitutorFactory substitutorFactory;

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

@@ -31,7 +31,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -58,7 +58,7 @@ public class CommandParserTest {
     @Mock private FrameContainer container;
     @Mock private Channel channel;
     @Mock private Connection connection;
-    @Mock private MBassador eventBus;
+    @Mock private DMDircMBassador eventBus;
     private TestCommandParser commandParser;
     private TestCommandParser channelCommandParser;
 

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

@@ -38,7 +38,7 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
@@ -52,7 +52,7 @@ import static org.mockito.Mockito.when;
 @RunWith(MockitoJUnitRunner.class)
 public class PreferencesDialogModelTest {
 
-    @Mock private MBassador eventBus;
+    @Mock private DMDircMBassador eventBus;
     @Mock private PluginManager pluginManager;
 
     @Before

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.config.prefs;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.events.ConnectionPrefsRequestedEvent;
 import com.dmdirc.events.GroupChatPrefsRequestedEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -31,15 +32,13 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import net.engio.mbassy.bus.MBassador;
-
 import static org.mockito.Matchers.isA;
 import static org.mockito.Mockito.verify;
 
 @RunWith(MockitoJUnitRunner.class)
 public class PreferencesManagerTest {
 
-    @Mock private MBassador eventBus;
+    @Mock private DMDircMBassador eventBus;
     @Mock private AggregateConfigProvider configManager;
 
     @Test

test/com/dmdirc/harness/TestCommandParser.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.harness;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -31,8 +32,6 @@ import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
-import net.engio.mbassy.bus.MBassador;
-
 public class TestCommandParser extends CommandParser {
 
     private static final long serialVersionUID = 7073002401375438532L;
@@ -48,7 +47,7 @@ public class TestCommandParser extends CommandParser {
     public String invalidCommand;
 
     public TestCommandParser(final AggregateConfigProvider configManager,
-            final CommandController commandManager, final MBassador eventBus) {
+            final CommandController commandManager, final DMDircMBassador eventBus) {
         super(configManager, commandManager, eventBus);
     }
 

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -32,7 +32,7 @@ import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.util.URLBuilder;
 
-import net.engio.mbassy.bus.MBassador;
+import com.dmdirc.DMDircMBassador;
 
 import java.util.Collections;
 
@@ -45,7 +45,7 @@ public class TestWritableFrameContainer extends FrameContainer {
     public TestWritableFrameContainer(final int lineLength,
             final AggregateConfigProvider cm, final CommandManager commandManager,
             final MessageSinkManager messageSinkManager,
-            final URLBuilder urlBuilder, final MBassador eventBus) {
+            final URLBuilder urlBuilder, final DMDircMBassador eventBus) {
         super(null, "raw", "Raw", "(Raw)", cm, urlBuilder,
                 new GlobalCommandParser(cm, commandManager, eventBus),
                 new TabCompleter(mock(CommandController.class), cm),

test/com/dmdirc/ui/core/components/StatusBarManagerTest.java

@@ -21,6 +21,7 @@
  */
 package com.dmdirc.ui.core.components;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.interfaces.ui.StatusBar;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
 import com.dmdirc.ui.StatusMessage;
@@ -30,8 +31,6 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
-import net.engio.mbassy.bus.MBassador;
-
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.verifyZeroInteractions;
@@ -40,7 +39,7 @@ import static org.mockito.Mockito.verifyZeroInteractions;
 public class StatusBarManagerTest {
 
     @Mock
-    private MBassador eventBus;
+    private DMDircMBassador eventBus;
 
     @Test
     public void testRegisterStatusBar() {

test/com/dmdirc/util/URLBuilderTest.java

@@ -22,13 +22,12 @@
 
 package com.dmdirc.util;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.PluginMetaData;
 import com.dmdirc.ui.themes.ThemeManager;
 
-import net.engio.mbassy.bus.MBassador;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 
@@ -53,7 +52,7 @@ public class URLBuilderTest {
     @Mock private ThemeManager themeManager;
     @Mock private PluginInfo pluginInfo;
     @Mock private PluginMetaData pluginMetaData;
-    @Mock private MBassador eventBus;
+    @Mock private DMDircMBassador eventBus;
 
     @Before
     public void setup() throws MalformedURLException {