Merge pull request #762 from csmith/master

Move event bus code to a bundle.

.gitignore

 # DMDirc .gitignore file
-/build
 /dist
 /lib
 /etc/clover.license
 /*.key
 /.gradle
 
-/api/build
-/api/src/*/generated
-/api/src/*/generated_tests
-
 # Generated files created by IDEA
-/src/*/generated
-/src/*/generated_tests
+**/build
+**/src/*/generated
+**/src/*/generated_tests
+

api/build.gradle

     compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.21'
     compile group: 'com.squareup.dagger', name: 'dagger', version: '1.2.5'
     compile group: 'com.google.guava', name:'guava', version: '19.0'
+    compile group: 'com.dmdirc', name: 'com.dmdirc.events.eventbus', version: '+', changing: true
     compile group: 'com.dmdirc', name: 'util', version: '+', changing: true
     compile group: 'com.dmdirc', name: 'parser-common', version: '+', changing: true
 

api/src/main/java/com/dmdirc/events/BaseDisplayableEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
 import com.dmdirc.interfaces.WindowModel;
 
 import java.time.LocalDateTime;
 /**
  * Base class for miscellaneous displayable events.
  */
-public abstract class BaseDisplayableEvent extends DMDircEvent implements DisplayableEvent {
+public abstract class BaseDisplayableEvent extends BaseEvent implements DisplayableEvent {
 
     /** The properties associated with this event. */
     private final DisplayPropertyMap properties = new DisplayPropertyMap();

api/src/main/java/com/dmdirc/events/ChannelEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
 import com.dmdirc.interfaces.GroupChat;
 
 import java.time.LocalDateTime;
 /**
  * Base type for events that occur in channels.
  */
-public abstract class ChannelEvent extends DMDircEvent {
+public abstract class ChannelEvent extends BaseEvent {
 
     /** The group chat that this event occurred on. */
     private final GroupChat groupChat;

api/src/main/java/com/dmdirc/events/ClientClosedEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
+
 /**
  * Fired when the client is being closed.
  */
-public class ClientClosedEvent extends DMDircEvent {
+public class ClientClosedEvent extends BaseEvent {
 
 }

api/src/main/java/com/dmdirc/events/ClientClosingEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
+
 /**
  * Fired when the client is about to close.
  */
-public class ClientClosingEvent extends DMDircEvent {
+public class ClientClosingEvent extends BaseEvent {
 
 }

api/src/main/java/com/dmdirc/events/ClientFrameChangedEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
 import com.dmdirc.interfaces.WindowModel;
 
 /**
  * Event fired when a new frame has been focused.
  */
-public class ClientFrameChangedEvent extends DMDircEvent {
+public class ClientFrameChangedEvent extends BaseEvent {
 
     private final WindowModel container;
 

api/src/main/java/com/dmdirc/events/ClientLineAddedEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
 import com.dmdirc.interfaces.WindowModel;
 
 /**
  * Event fired when a line has been added to a window.
  */
-public class ClientLineAddedEvent extends DMDircEvent {
+public class ClientLineAddedEvent extends BaseEvent {
 
     private final WindowModel container;
     private final String line;

api/src/main/java/com/dmdirc/events/ClientOpenedEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
+
 /**
  * Fired when the client is first opened.
  */
-public class ClientOpenedEvent extends DMDircEvent {
+public class ClientOpenedEvent extends BaseEvent {
 }

api/src/main/java/com/dmdirc/events/ClientUserInputEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
 import com.dmdirc.interfaces.WindowModel;
 
 /**
  * Event fired when some input has been entered into the client.
  */
-public class ClientUserInputEvent extends DMDircEvent {
+public class ClientUserInputEvent extends BaseEvent {
 
     private final WindowModel container;
     private final StringBuffer buffer;

api/src/main/java/com/dmdirc/events/DMDircEvent.java

-/*
- * Copyright (c) 2006-2015 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.events;
-
-import java.time.LocalDateTime;
-
-/**
- * Base class for all DMDirc events.
- */
-public abstract class DMDircEvent {
-
-    /**
-     * The time the event was triggered at.
-     */
-    private final LocalDateTime timestamp;
-
-    /**
-     * Creates a new event with the specified timestamp.
-     *
-     * @param timestamp The stamp the event was triggered at.
-     */
-    protected DMDircEvent(final LocalDateTime timestamp) {
-        this.timestamp = timestamp;
-    }
-
-    /**
-     * Creates a new event with the current system timestamp.
-     */
-    protected DMDircEvent() {
-        this.timestamp = LocalDateTime.now();
-    }
-
-    public LocalDateTime getTimestamp() {
-        return timestamp;
-    }
-
-}

api/src/main/java/com/dmdirc/events/FeedbackNagEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
+
 /**
  * Fired when its time to nag for feedback.
  */
-public class FeedbackNagEvent extends DMDircEvent {
+public class FeedbackNagEvent extends BaseEvent {
 
 }

api/src/main/java/com/dmdirc/events/FirstRunEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
+
 /**
  * Fired when the client is first run.  Handled should be checked and set appropriately, only core
  * first run events should occur if unhandled.
  */
-public class FirstRunEvent extends DMDircEvent {
+public class FirstRunEvent extends BaseEvent {
 
     private boolean handled;
 

api/src/main/java/com/dmdirc/events/FrameChangedEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
 import com.dmdirc.interfaces.WindowModel;
 
 /**
  * Base class for all frame info events.
  */
-public class FrameChangedEvent extends DMDircEvent {
+public class FrameChangedEvent extends BaseEvent {
 
     private final WindowModel container;
 

api/src/main/java/com/dmdirc/events/FrameComponentEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
 import com.dmdirc.interfaces.WindowModel;
 
 /**
  * Base class for frame component events.
  */
-public abstract class FrameComponentEvent extends DMDircEvent {
+public abstract class FrameComponentEvent extends BaseEvent {
 
     private final WindowModel container;
     private final String component;

api/src/main/java/com/dmdirc/events/FrameEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
 import com.dmdirc.interfaces.WindowModel;
 
 /**
  * Base class for window related events in the client.
  */
-public abstract class FrameEvent extends DMDircEvent implements SourcedEvent {
+public abstract class FrameEvent extends BaseEvent implements SourcedEvent {
 
     private final WindowModel source;
 

api/src/main/java/com/dmdirc/events/LinkEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
 import com.dmdirc.interfaces.WindowModel;
 
 /**
  * Common properties of link events.
  */
-public abstract class LinkEvent extends DMDircEvent {
+public abstract class LinkEvent extends BaseEvent {
 
     private final WindowModel window;
     private final String target;

api/src/main/java/com/dmdirc/events/ProfileAddedEvent.java

 package com.dmdirc.events;
 
 import com.dmdirc.config.profiles.Profile;
+import com.dmdirc.events.eventbus.BaseEvent;
 
 /**
  * Fired when a profile is added to the config.
  */
-public class ProfileAddedEvent extends DMDircEvent {
+public class ProfileAddedEvent extends BaseEvent {
 
     private final Profile profile;
 

api/src/main/java/com/dmdirc/events/ProfileDeletedEvent.java

 package com.dmdirc.events;
 
 import com.dmdirc.config.profiles.Profile;
+import com.dmdirc.events.eventbus.BaseEvent;
 
 /**
  * Fired when a profile is deleted from the config.
  */
-public class ProfileDeletedEvent extends DMDircEvent {
+public class ProfileDeletedEvent extends BaseEvent {
 
     private final Profile profile;
 

api/src/main/java/com/dmdirc/events/QueryEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
 import com.dmdirc.interfaces.PrivateChat;
 
 import java.time.LocalDateTime;
 /**
  * Base type for events that occur in queries.
  */
-public abstract class QueryEvent extends DMDircEvent {
+public abstract class QueryEvent extends BaseEvent {
 
     /** The query that this event occurred on. */
     private final PrivateChat query;

api/src/main/java/com/dmdirc/events/ServerEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
 import com.dmdirc.interfaces.Connection;
 
 import java.time.LocalDateTime;
 /**
  * Base type for events that occur on a connection.
  */
-public abstract class ServerEvent extends DMDircEvent {
+public abstract class ServerEvent extends BaseEvent {
 
     /** The connection that this event occurred on. */
     private final Connection connection;

api/src/main/java/com/dmdirc/events/UnknownCommandEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
 import com.dmdirc.interfaces.WindowModel;
 
 import java.time.LocalDateTime;
 /**
  * Fired when an unknown command is used.
  */
-public class UnknownCommandEvent extends DMDircEvent implements DisplayableEvent {
+public class UnknownCommandEvent extends BaseEvent implements DisplayableEvent {
 
     /** The properties associated with this event. */
     private final DisplayPropertyMap properties = new DisplayPropertyMap();

api/src/main/java/com/dmdirc/events/UnknownURLEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
 import java.net.URI;
 
 /**
  * Fired when the URL handler encounters an unknown URL protocol.  The handled boolean should be
  * checked, if it is true the event should be disregarded.
  */
-public class UnknownURLEvent extends DMDircEvent {
+public class UnknownURLEvent extends BaseEvent {
 
     private boolean handled;
     private final URI uri;

api/src/main/java/com/dmdirc/events/UnreadStatusChangedEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.messages.UnreadStatusManager;
 import com.dmdirc.util.colours.Colour;
 /**
  * Event raised when the unread status of a window has changed.
  */
-public class UnreadStatusChangedEvent extends DMDircEvent implements SourcedEvent {
+public class UnreadStatusChangedEvent extends BaseEvent implements SourcedEvent {
 
     private final WindowModel source;
     private final UnreadStatusManager manager;

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

 package com.dmdirc.interfaces;
 
 import com.dmdirc.Topic;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.parser.common.ChannelListModeItem;
 
 import java.util.Collection;

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

 
 package com.dmdirc.interfaces;
 
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.messages.BackBuffer;
 import com.dmdirc.ui.messages.UnreadStatusManager;

build.gradle

     bundle group: 'com.google.guava', name:'guava', version: '19.0'
     bundle group: 'net.engio', name: 'mbassador', version: '1.3.0'
     bundle group: 'com.google.code.gson', name: 'gson', 'version': '2.5'
+    bundle group: 'com.dmdirc', name: 'com.dmdirc.events.eventbus', version: '+', changing: true
     bundle group: 'com.dmdirc', name: 'api', version: '+', changing: true
     bundle group: 'com.dmdirc', name: 'util', version: '+', changing: true
     bundle group: 'com.dmdirc', name: 'parser-common', version: '+', changing: true

bundles/com.dmdirc.events.eventbus/build.gradle

+/*
+ * Copyright (c) 2006-2017 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.
+ */
+
+plugins {
+  id 'java'
+  id 'findbugs'
+  id 'pmd'
+  id 'idea'
+}
+
+group = 'com.dmdirc'
+
+idea {
+    module {
+         sourceDirs += file('src/main/generated')
+         testSourceDirs += file('src/test/generated_tests')
+         generatedSourceDirs = [file('src/main/generated'), file('src/test/generated_tests')]
+    }
+}
+
+configurations.all {
+    resolutionStrategy.cacheDynamicVersionsFor 2, 'minutes'
+    resolutionStrategy.cacheChangingModulesFor 2, 'minutes'
+}
+
+dependencies {
+    compile group: 'org.slf4j', name: 'slf4j-api', version:'1.7.21'
+    compile group: 'net.engio', name: 'mbassador', version: '1.3.0'
+
+    testCompile group: 'junit', name: 'junit', version: '4.12'
+    testCompile group: 'org.mockito', name: 'mockito-core', version: '1.10.19'
+}
+
+sourceCompatibility = 1.8
+targetCompatibility = 1.8
+
+repositories {
+    mavenCentral()
+}
+

bundles/com.dmdirc.events.eventbus/src/main/java/com/dmdirc/events/eventbus/BaseEvent.java

+/*
+ * Copyright (c) 2006-2017 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.events.eventbus;
+
+import java.time.LocalDateTime;
+
+/**
+ * Base class for all events processed by an {@link EventBus}.
+ */
+public abstract class BaseEvent {
+
+    /**
+     * The time the event was triggered at.
+     */
+    private final LocalDateTime timestamp;
+
+    /**
+     * Creates a new event with the specified timestamp.
+     *
+     * @param timestamp The stamp the event occurred at.
+     */
+    protected BaseEvent(final LocalDateTime timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    /**
+     * Creates a new event with the current system timestamp.
+     */
+    protected BaseEvent() {
+        this.timestamp = LocalDateTime.now();
+    }
+
+    /**
+     * Gets the timestamp at which the event occurred.
+     *
+     * <p>This may be prior to the creation time of the event, or of the entire application, if the event is a
+     * historical one (e.g. after connecting to a server that replays missed messages).
+     *
+     * @return The time at which the event occurred.
+     */
+    public LocalDateTime getTimestamp() {
+        return timestamp;
+    }
+
+}

api/src/main/java/com/dmdirc/interfaces/EventBus.java → bundles/com.dmdirc.events.eventbus/src/main/java/com/dmdirc/events/eventbus/EventBus.java

 /*
- * Copyright (c) 2006-2016 DMDirc Developers
+ * Copyright (c) 2006-2017 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:
+ * 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 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.
+ * 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.interfaces;
-
-import com.dmdirc.events.DMDircEvent;
+package com.dmdirc.events.eventbus;
 
 /**
  * An event bus offers facilities for publishing events to decoupled handlers.
      * the given message type, provided they are not configured to reject valid subtype. The call returns when all
      * matching handlers of all registered listeners have been notified (invoked) of the message.
      */
-    void publish(DMDircEvent message);
+    void publish(BaseEvent message);
 
     /**
      * Asynchronously publish a message to all registered listeners. This includes listeners defined for super types of
      * the given message type, provided they are not configured to reject valid subtype. The call returns immediately.
      */
-    void publishAsync(DMDircEvent message);
+    void publishAsync(BaseEvent message);
 
 }

src/main/java/com/dmdirc/DMDircMBassador.java → bundles/com.dmdirc.events.eventbus/src/main/java/com/dmdirc/events/eventbus/MBassadorEventBus.java

  * 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 com.dmdirc.interfaces.EventBus;
+package com.dmdirc.events.eventbus;
 
 import net.engio.mbassy.bus.MBassador;
 import net.engio.mbassy.bus.config.BusConfiguration;
 import net.engio.mbassy.bus.config.Feature;
-import net.engio.mbassy.bus.config.IBusConfiguration;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import static com.dmdirc.util.LogUtils.APP_ERROR;
-
 /**
- * Generified MBassador.
+ * Concrete event bus backed by {@link MBassador}.
  */
-public class DMDircMBassador implements EventBus {
+public class MBassadorEventBus implements EventBus {
 
-    private static final Logger LOG = LoggerFactory.getLogger(DMDircMBassador.class);
+    private static final Logger LOG = LoggerFactory.getLogger(MBassadorEventBus.class);
 
-    private final MBassador<DMDircEvent> bus;
+    private final MBassador<BaseEvent> bus;
 
-    public DMDircMBassador() {
-        this(new BusConfiguration()
+    public MBassadorEventBus() {
+        bus = new MBassador<>(new BusConfiguration()
                 .addFeature(Feature.SyncPubSub.Default())
                 .addFeature(Feature.AsynchronousHandlerInvocation.Default(1, 1))
-                .addFeature(
-                        Feature.AsynchronousMessageDispatch.Default()
-                                .setNumberOfMessageDispatchers(1)));
-    }
-
-    @SuppressWarnings("TypeMayBeWeakened")
-    public DMDircMBassador(final IBusConfiguration configuration) {
-        bus = new MBassador<>(configuration.addPublicationErrorHandler(
-                e -> LOG.error(APP_ERROR, e.getMessage(), e.getCause())));
+                .addFeature(Feature.AsynchronousMessageDispatch.Default().setNumberOfMessageDispatchers(1))
+                .addPublicationErrorHandler(e -> LOG.error("Unhandled exception while publishing event", e)));
     }
 
     @Override
     }
 
     @Override
-    public void publish(DMDircEvent message) {
+    public void publish(BaseEvent message) {
         bus.publish(message);
     }
 
     @Override
-    public void publishAsync(DMDircEvent message) {
+    public void publishAsync(BaseEvent message) {
         bus.publishAsync(message);
     }
 

settings.gradle

 include 'api'
+include 'bundles:com.dmdirc.events.eventbus'

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

 import com.dmdirc.events.ChannelUserAwayEvent;
 import com.dmdirc.events.ChannelUserBackEvent;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.parser.common.AwayState;
 import com.dmdirc.parser.events.ChannelCTCPEvent;
 import com.dmdirc.parser.events.ChannelListModeEvent;

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

 import com.dmdirc.events.ChannelOpenedEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.parser.interfaces.ChannelInfo;
 import com.dmdirc.ui.WindowManager;

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

 import com.dmdirc.config.ConfigModule;
 import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.config.profiles.ProfilesModule;
+import com.dmdirc.events.eventbus.MBassadorEventBus;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.ConnectionFactory;
 import com.dmdirc.interfaces.ConnectionManager;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
     @Provides
     @Singleton
     public EventBus getMBassador() {
-        return new DMDircMBassador();
+        return new MBassadorEventBus();
     }
 
     @Provides

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

 package com.dmdirc;
 
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.core.components.WindowComponent;

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

 import com.dmdirc.events.FrameNameChangedEvent;
 import com.dmdirc.events.FrameTitleChangedEvent;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.InputModel;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;

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

 import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.ui.WindowManager;

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

 import com.dmdirc.events.FirstRunEvent;
 import com.dmdirc.interfaces.CommandController.CommandDetails;
 import com.dmdirc.interfaces.ConnectionManager;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.Migrator;
 import com.dmdirc.interfaces.SystemLifecycleComponent;
 import com.dmdirc.interfaces.config.IdentityController;

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

 import com.dmdirc.events.StatusBarMessageEvent;
 import com.dmdirc.events.UserInfoResponseEvent;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.parser.common.AwayState;
 import com.dmdirc.parser.events.AuthNoticeEvent;
 import com.dmdirc.parser.events.AwayStateEvent;

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

 import com.dmdirc.config.UserConfig;
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.interfaces.config.IdentityFactory;

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

 import com.dmdirc.events.FrameClosingEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.ConnectionManager;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.parser.common.ChannelJoinRequest;

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

 import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.events.ClientClosedEvent;
 import com.dmdirc.interfaces.ConnectionManager;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.SystemLifecycleComponent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;

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

 
 import com.dmdirc.events.ClientPopupGeneratedEvent;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import javax.inject.Inject;

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

 
 package com.dmdirc.commandparser.auto;
 
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 
 import java.util.Collections;
 import java.util.Map;

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

 import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.WindowManager;

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

 import com.dmdirc.events.ClientLineAddedEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.WindowManager;

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

 import com.dmdirc.events.UnknownCommandEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.InputModel;
 import com.dmdirc.interfaces.WindowModel;

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

 import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.GroupChat;
 import com.dmdirc.interfaces.WindowModel;
 

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

 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.Chat;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 
 import javax.annotation.Nonnull;

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

 import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import javax.annotation.Nonnull;

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

 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.QueryCommandContext;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.PrivateChat;
 import com.dmdirc.interfaces.WindowModel;
 

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

 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 

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

 
 import com.dmdirc.events.ClientPrefsClosedEvent;
 import com.dmdirc.events.ClientPrefsOpenedEvent;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.plugins.Service;

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

 
 import com.dmdirc.events.ConnectionPrefsRequestedEvent;
 import com.dmdirc.events.GroupChatPrefsRequestedEvent;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.util.validators.NumericalValidator;

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

 
 import com.dmdirc.events.ProfileAddedEvent;
 import com.dmdirc.events.ProfileDeletedEvent;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.util.SystemInfo;
 
 import com.google.common.collect.Iterables;

src/main/java/com/dmdirc/events/ClientInfoRequestEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
 import com.dmdirc.ui.core.about.InfoItem;
 
 import java.util.ArrayList;
 /**
  * Fired to give other components a chance to add info to the info panel.
  */
-public class ClientInfoRequestEvent extends DMDircEvent {
+public class ClientInfoRequestEvent extends BaseEvent {
 
     private final List<InfoItem> newItems;
 

src/main/java/com/dmdirc/events/ClientPopupGeneratedEvent.java

 
 import com.dmdirc.commandparser.PopupMenu;
 import com.dmdirc.commandparser.PopupType;
+import com.dmdirc.events.eventbus.BaseEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 /**
  * Raised when a popup is being generated.
  */
-public class ClientPopupGeneratedEvent extends DMDircEvent {
+public class ClientPopupGeneratedEvent extends BaseEvent {
 
     private final PopupType type;
     private final PopupMenu menu;

src/main/java/com/dmdirc/events/ErrorEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
 import com.dmdirc.logger.ErrorLevel;
 
 import com.google.common.base.MoreObjects;
 
-public abstract class ErrorEvent extends DMDircEvent {
+public abstract class ErrorEvent extends BaseEvent {
 
     private final ErrorLevel level;
     private final Throwable throwable;

src/main/java/com/dmdirc/events/PluginEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
 import com.dmdirc.plugins.PluginInfo;
 
 /**
  * Base class for all plugin events.
  */
-public abstract class PluginEvent extends DMDircEvent {
+public abstract class PluginEvent extends BaseEvent {
 
     private final PluginInfo plugin;
 

src/main/java/com/dmdirc/events/PluginRefreshEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
+
 /**
  * Fired when the list of available plugins may have updated.
  */
-public class PluginRefreshEvent extends DMDircEvent {
+public class PluginRefreshEvent extends BaseEvent {
 
 }

src/main/java/com/dmdirc/events/PreferencesEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
+
 /**
  * Grouped preferences events.
  */
-public abstract class PreferencesEvent extends DMDircEvent {
+public abstract class PreferencesEvent extends BaseEvent {
 
 }

src/main/java/com/dmdirc/events/ProgramErrorEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
 import com.dmdirc.logger.ProgramError;
 
 /**
  * Fired when an error has been created and logged.
  */
-public abstract class ProgramErrorEvent extends DMDircEvent {
+public abstract class ProgramErrorEvent extends BaseEvent {
 
     private final ProgramError error;
     private boolean handled;

src/main/java/com/dmdirc/events/StatusBarEvent.java

 
 package com.dmdirc.events;
 
+import com.dmdirc.events.eventbus.BaseEvent;
+
 /**
  * Base class for all status bar events.
  */
-public abstract class StatusBarEvent extends DMDircEvent{
+public abstract class StatusBarEvent extends BaseEvent {
 }

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

 import com.dmdirc.config.ConfigBinding;
 import com.dmdirc.events.ErrorEvent;
 import com.dmdirc.events.ProgramErrorEvent;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import com.google.common.collect.Lists;

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

 package com.dmdirc.logger;
 
 import com.dmdirc.events.ProgramErrorStatusEvent;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 
 import com.google.common.base.MoreObjects;
 import com.google.common.base.Throwables;

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

 
 package com.dmdirc.logger;
 
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 
 import java.time.LocalDateTime;
 

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

 import com.dmdirc.events.NonFatalProgramErrorEvent;
 import com.dmdirc.events.ProgramErrorDeletedEvent;
 import com.dmdirc.events.ProgramErrorEvent;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.util.EventUtils;
 import com.dmdirc.util.LogUtils;
 

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

 import com.dmdirc.events.ProgramErrorAddedEvent;
 import com.dmdirc.events.ProgramErrorEvent;
 import com.dmdirc.events.ProgramErrorStatusEvent;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
 import com.google.common.base.Throwables;

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

 import com.dmdirc.config.GlobalConfig;
 import com.dmdirc.events.PluginLoadedEvent;
 import com.dmdirc.events.PluginUnloadedEvent;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.SystemLifecycleComponent;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.EventFormatProvider;

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

 import com.dmdirc.config.InvalidIdentityFileException;
 import com.dmdirc.events.PluginLoadedEvent;
 import com.dmdirc.events.PluginUnloadedEvent;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.util.validators.ValidationResponse;

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

 package com.dmdirc.plugins;
 
 import com.dmdirc.events.PluginRefreshEvent;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.updater.components.PluginComponent;
 import com.dmdirc.updater.manager.UpdateManager;

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

 
 package com.dmdirc.plugins;
 
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.SystemLifecycleComponent;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.updater.manager.UpdateManager;

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

 import com.dmdirc.events.ServerCertificateProblemEncounteredEvent;
 import com.dmdirc.events.ServerCertificateProblemResolvedEvent;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 

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

 import com.dmdirc.Precondition;
 import com.dmdirc.events.FrameClosingEvent;
 import com.dmdirc.events.FrameOpenedEvent;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.ui.FrameListener;
 import com.dmdirc.util.collections.ListenerList;

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

 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.commandline.CommandLineParser;
 import com.dmdirc.events.ClientInfoRequestEvent;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.ui.AboutDialogModel;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.util.ClientInfo;

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

 import com.dmdirc.events.NonFatalProgramErrorEvent;
 import com.dmdirc.events.ProgramErrorDeletedEvent;
 import com.dmdirc.events.ProgramErrorStatusEvent;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.ui.ErrorsDialogModel;
 import com.dmdirc.interfaces.ui.ErrorsDialogModelListener;
 import com.dmdirc.logger.ErrorManager;

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

 package com.dmdirc.ui.core.feedback;
 
 import com.dmdirc.events.StatusBarMessageEvent;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.util.io.Downloader;

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

 package com.dmdirc.ui.core.feedback;
 
 import com.dmdirc.config.GlobalConfig;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.io.Downloader;
 import javax.inject.Inject;

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

 import com.dmdirc.events.ProfileAddedEvent;
 import com.dmdirc.events.ProfileDeletedEvent;
 import com.dmdirc.interfaces.ConnectionManager;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.ui.NewServerDialogModel;

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

 import com.dmdirc.events.StatusBarMessageEvent;
 import com.dmdirc.events.UnknownURLEvent;
 import com.dmdirc.interfaces.ConnectionManager;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.util.CommandUtils;

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

 import com.dmdirc.events.ClientUserInputEvent;
 import com.dmdirc.events.FrameClosingEvent;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.InputField;

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

 
 import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.events.DisplayableEvent;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.util.EventUtils;
 import java.util.Arrays;

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

 import com.dmdirc.events.DisplayableEvent;
 import com.dmdirc.events.QueryHighlightEvent;
 import com.dmdirc.events.UnreadStatusChangedEvent;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.util.colours.Colour;
 

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

 package com.dmdirc.updater;
 
 import com.dmdirc.commandline.CommandLineParser;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.updater.checking.CheckResultConsolidator;
 import com.dmdirc.updater.checking.DMDircCheckStrategy;

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

 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.events.StatusBarMessageEvent;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.updater.UpdateComponent;

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

 package com.dmdirc;
 
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.WindowModel;
 

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

 
 import com.dmdirc.config.profiles.Profile;
 import com.dmdirc.config.profiles.ProfileManager;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.GroupChatManager;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.ConfigProviderMigrator;

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

 import com.dmdirc.config.ConfigBinder;
 import com.dmdirc.harness.TestWritableFrameContainer;
 import com.dmdirc.interfaces.ConnectionManager;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.messages.BackBufferFactory;
 

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

 package com.dmdirc.commandparser.aliases;
 
 import com.dmdirc.commandparser.CommandArguments;
-import com.dmdirc.commandparser.CommandInfo;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.InputModel;
 import com.dmdirc.interfaces.WindowModel;
 

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

 
 package com.dmdirc.commandparser.auto;
 
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 
 import java.util.Optional;
 

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

 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.WindowModel;

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

 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.WindowModel;

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

 import com.dmdirc.events.ChannelModesDiscoveredEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.parser.interfaces.Parser;
 

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

 import com.dmdirc.events.DisplayProperty;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.GroupChatUser;
 import com.dmdirc.interfaces.User;
 import com.dmdirc.interfaces.WindowModel;

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

 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.Chat;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 
 import org.junit.Before;

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

  */
 package com.dmdirc.commandparser.commands.flags;
 
-import com.dmdirc.DMDircMBassador;
+import com.dmdirc.events.eventbus.MBassadorEventBus;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 
 import java.util.Arrays;
     @Test
     public void testParse() {
         final WindowModel container = mock(WindowModel.class);
-        final EventBus eventBus = mock(DMDircMBassador.class);
+        final EventBus eventBus = mock(MBassadorEventBus.class);
         final CommandController controller = mock(CommandController.class);
         when(controller.getCommandChar()).thenReturn('/');
         when(controller.getSilenceChar()).thenReturn('.');

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

 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.ui.input.TabCompleterUtils;
 

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

 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.events.CommandErrorEvent;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.EventBus;
+import com.dmdirc.events.eventbus.EventBus;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.TabCompleterUtils;