MBassador.

Change-Id: I2baa7e986ded54930093768238ed24cab8cf4bf7
Depends-On: I2cf35d5859c85c3609002f126241536fda5d588e
Reviewed-on: http://gerrit.dmdirc.com/3769
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

build.xml

@@ -75,9 +75,15 @@
     </target>
 
     <target name="-bundle-guava">
-      <jar destfile="${dist.jar}" update="true">
-          <zipfileset src="lib/main/guava.jar" includes="com/google/**"/>
-      </jar>
+        <jar destfile="${dist.jar}" update="true">
+            <zipfileset src="lib/main/guava.jar" includes="com/google/**"/>
+        </jar>
+    </target>
+
+    <target name="-bundle-mbassador">
+        <jar destfile="${dist.jar}" update="true">
+            <zipfileset src="lib/main/mbassador.jar" includes="net/engio/**"/>
+        </jar>
     </target>
 
     <target name="-bundle-yamlreader">
@@ -93,6 +99,6 @@
     <target name="-pre-init" depends="-init-dependencies,-init-submodule-dependencies,-init-private-properties"/>
     <target name="-post-compile" depends="-write-version, build-plugins"/>
     <target name="-post-test-run" depends="-do-test-reports"/>
-    <target name="-post-jar" depends="-update-bundled-plugins,-bundle-slf4j,-bundle-dagger,-bundle-base64,-bundle-guava,-bundle-raven,-bundle-yamlreader"/>
+    <target name="-post-jar" depends="-update-bundled-plugins,-bundle-slf4j,-bundle-dagger,-bundle-base64,-bundle-guava,-bundle-mbassador,-bundle-raven,-bundle-yamlreader"/>
 
 </project>

ivy.xml

@@ -30,6 +30,7 @@
         <dependency org="net.kencochrane.raven" name="raven" rev="4.+" conf="bundled,main->default" />
 
         <dependency org="com.google.guava" name="guava" rev="17.+" conf="bundled,main->default" />
+        <dependency org="net.engio" name="mbassador" rev="1.1.10" conf="bundled,main->default" />
 
         <dependency org="junit" name="junit" rev="4.+" conf="test->default" />
         <dependency org="org.mockito" name="mockito-all" rev="1.+" conf="test->default" />

src/com/dmdirc/Channel.java

@@ -51,7 +51,6 @@ import com.dmdirc.util.collections.ListenerList;
 import com.dmdirc.util.collections.RollingList;
 
 import com.google.common.base.Optional;
-import com.google.common.eventbus.EventBus;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -62,6 +61,8 @@ 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
@@ -113,7 +114,7 @@ public class Channel extends MessageTarget implements GroupChat {
             final CommandController commandController,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         super(newServer, "channel-inactive", newChannelInfo.getName(),
                 Styliser.stipControlCodes(newChannelInfo.getName()),
                 configMigrator.getConfigProvider(),
@@ -307,7 +308,7 @@ public class Channel extends MessageTarget implements GroupChat {
         }
 
         // Trigger action for the window closing
-        getEventBus().post(new ChannelClosedEvent(this));
+        getEventBus().publish(new ChannelClosedEvent(this));
 
         // Inform any parents that the window is closing
         server.delChannel(channelInfo.getName());

src/com/dmdirc/ChannelEventHandler.java

@@ -72,12 +72,13 @@ import com.dmdirc.parser.interfaces.callbacks.OtherAwayStateListener;
 
 import com.google.common.base.Optional;
 import com.google.common.base.Strings;
-import com.google.common.eventbus.EventBus;
 
 import java.util.Date;
 
 import javax.annotation.Nonnull;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Handles events for channel objects.
  */
@@ -93,9 +94,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 EventBus eventBus;
+    private final MBassador eventBus;
 
-    public ChannelEventHandler(final Channel owner, final EventBus eventBus) {
+    public ChannelEventHandler(final Channel owner, final MBassador eventBus) {
         this.owner = owner;
         this.eventBus = eventBus;
     }
@@ -145,7 +146,7 @@ public class ChannelEventHandler extends EventHandler implements
         checkParser(parser);
 
         owner.setClients(channel.getChannelClients());
-        eventBus.post(new ChannelGotnamesEvent(owner));
+        eventBus.publishAsync(new ChannelGotnamesEvent(owner));
     }
 
     @Override
@@ -173,7 +174,7 @@ public class ChannelEventHandler extends EventHandler implements
             final String format = EventUtils.postDisplayable(eventBus, event,
                     Strings.isNullOrEmpty(channel.getTopic())
                     ? "channelTopicRemoved" : "channelTopicChanged");
-            eventBus.post(event);
+            eventBus.publish(event);
             owner.doNotification(date, format, channel.getChannelClient(channel.getTopicSetter(),
                     true), channel.getTopic());
         }

src/com/dmdirc/ChannelFactory.java

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

src/com/dmdirc/ClientModule.java

@@ -61,18 +61,14 @@ import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.updater.UpdaterModule;
 import com.dmdirc.updater.manager.UpdateManager;
-import com.dmdirc.util.DynamicAsyncEventBus;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.io.Downloader;
 
-import com.google.common.eventbus.EventBus;
-
 import java.awt.GraphicsEnvironment;
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Set;
-import java.util.concurrent.Executors;
 
 import javax.inject.Provider;
 import javax.inject.Qualifier;
@@ -81,6 +77,8 @@ 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;
 
 /**
  * Provides dependencies for the client.
@@ -116,6 +114,12 @@ public class ClientModule {
     /** The object graph to inject where necessary. */
     private ObjectGraph objectGraph;
 
+    @Provides
+    @Singleton
+    public MBassador getMBassador() {
+        return new MBassador(BusConfiguration.Default());
+    }
+
     @Provides
     @Singleton
     public IdentityManager getIdentityManager(
@@ -123,7 +127,7 @@ public class ClientModule {
             @Directory(DirectoryType.IDENTITIES) final String identitiesDirectory,
             @Directory(DirectoryType.ERRORS) final String errorsDirectory,
             final CommandLineParser commandLineParser,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         final IdentityManager identityManager = new IdentityManager(baseDirectory,
                 identitiesDirectory, eventBus);
         ErrorManager.getErrorManager()
@@ -182,7 +186,7 @@ public class ClientModule {
             final ActionFactory actionFactory,
             final Provider<Set<ActionGroup>> actionWrappersProvider,
             final Provider<UpdateManager> updateManagerProvider,
-            final EventBus eventBus,
+            final MBassador eventBus,
             @Directory(DirectoryType.ACTIONS) final String directory) {
         final ActionManager actionManager = new ActionManager(identityController,
                 actionFactory, actionWrappersProvider, updateManagerProvider, eventBus, directory);
@@ -218,7 +222,7 @@ public class ClientModule {
     @Provides
     @Singleton
     public PluginManager getPluginManager(
-            final EventBus eventBus,
+            final MBassador eventBus,
             final IdentityController identityController,
             final UpdateManager updateManager,
             final Provider<PluginInjectorInitialiser> initialiserProvider,
@@ -251,7 +255,7 @@ public class ClientModule {
     @Provides
     @Singleton
     public ThemeManager getThemeManager(
-            final EventBus eventBus,
+            final MBassador eventBus,
             final IdentityController controller,
             @Directory(DirectoryType.THEMES) final String directory) {
         final ThemeManager manager = new ThemeManager(eventBus, controller, directory);
@@ -286,12 +290,6 @@ public class ClientModule {
         return locator;
     }
 
-    @Provides
-    @Singleton
-    public EventBus getEventBus() {
-        return new DynamicAsyncEventBus(Executors.newSingleThreadExecutor());
-    }
-
     @Provides
     public Downloader getDownloader() {
         return new Downloader();

src/com/dmdirc/CustomWindow.java

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

src/com/dmdirc/FrameContainer.java

@@ -47,7 +47,6 @@ import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.collections.ListenerList;
 
 import com.google.common.base.Optional;
-import com.google.common.eventbus.EventBus;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -62,6 +61,8 @@ 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;
 
 /**
@@ -101,7 +102,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 EventBus eventBus;
+    private final MBassador eventBus;
     /** The icon manager to use for this container. */
     private final IconManager iconManager;
     /** Whether or not this container is writable. */
@@ -146,7 +147,7 @@ public abstract class FrameContainer {
             final String title,
             final AggregateConfigProvider config,
             final URLBuilder urlBuilder,
-            final EventBus eventBus,
+            final MBassador eventBus,
             final Collection<String> components) {
         this.parent = Optional.fromNullable(parent);
         this.configManager = config;
@@ -193,7 +194,7 @@ public abstract class FrameContainer {
             final CommandParser commandParser,
             final TabCompleter tabCompleter,
             final MessageSinkManager messageSinkManager,
-            final EventBus eventBus,
+            final MBassador eventBus,
             final Collection<String> components) {
         this.parent = Optional.fromNullable(parent);
         this.configManager = config;
@@ -238,7 +239,7 @@ public abstract class FrameContainer {
         return configManager;
     }
 
-    public EventBus getEventBus() {
+    public MBassador getEventBus() {
         return eventBus;
     }
 
@@ -313,7 +314,7 @@ public abstract class FrameContainer {
     protected void setName(final String name) {
         this.name = name;
 
-        eventBus.post(new FrameNameChangedEvent(this, name));
+        eventBus.publishAsync(new FrameNameChangedEvent(this, name));
         listeners.getCallable(FrameInfoListener.class).nameChanged(this, name);
     }
 
@@ -326,7 +327,7 @@ public abstract class FrameContainer {
     public void setTitle(final String title) {
         this.title = title;
 
-        eventBus.post(new FrameTitleChangedEvent(this, title));
+        eventBus.publishAsync(new FrameTitleChangedEvent(this, title));
         listeners.getCallable(FrameInfoListener.class).titleChanged(this, title);
     }
 
@@ -409,7 +410,7 @@ public abstract class FrameContainer {
      * Called when this container's icon is updated.
      */
     private void iconUpdated() {
-        eventBus.post(new FrameIconChangedEvent(this, icon));
+        eventBus.publish(new FrameIconChangedEvent(this, icon));
         listeners.getCallable(FrameInfoListener.class).iconChanged(this, icon);
     }
 
@@ -535,7 +536,7 @@ public abstract class FrameContainer {
                 lines.add(new String[]{myLine});
             }
 
-            eventBus.post(new ClientLineAddedEvent(this, myLine));
+            eventBus.publishAsync(new ClientLineAddedEvent(this, myLine));
         }
 
         getDocument().addText(lines);

src/com/dmdirc/GlobalWindow.java

@@ -35,7 +35,7 @@ import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.util.URLBuilder;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import java.util.Arrays;
 
@@ -66,7 +66,7 @@ public class GlobalWindow extends FrameContainer {
             final TabCompleterFactory tabCompleterFactory,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         super(null, "icon", "Global", "(Global)", config, urlBuilder, parser,
                 tabCompleterFactory.getTabCompleter(config, CommandType.TYPE_GLOBAL),
                 messageSinkManager, eventBus,

src/com/dmdirc/Main.java

@@ -45,8 +45,6 @@ import com.dmdirc.plugins.Service;
 import com.dmdirc.plugins.ServiceProvider;
 import com.dmdirc.ui.WarningDialog;
 
-import com.google.common.eventbus.EventBus;
-
 import java.awt.GraphicsEnvironment;
 import java.security.Policy;
 import java.util.Collection;
@@ -59,6 +57,7 @@ import java.util.TimerTask;
 import javax.inject.Inject;
 
 import dagger.ObjectGraph;
+import net.engio.mbassy.bus.MBassador;
 
 /**
  * Main class, handles initialisation.
@@ -92,7 +91,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 EventBus eventBus;
+    private final MBassador eventBus;
     /** The commands to load into the command manager. */
     private final Set<CommandDetails> commands;
 
@@ -126,7 +125,7 @@ public class Main {
             final ColourActionComparison colourActionComparison,
             final Set<SystemLifecycleComponent> lifecycleComponents,
             final Set<Migrator> migrators,
-            final EventBus eventBus,
+            final MBassador eventBus,
             final Set<CommandDetails> commands) {
         this.identityManager = identityManager;
         this.serverManager = serverManager;
@@ -197,7 +196,7 @@ public class Main {
         actionManager.initialise(colourActionComparison);
         pluginManager.doAutoLoad();
         actionManager.loadUserActions();
-        eventBus.post(new ClientOpenedEvent());
+        eventBus.publishAsync(new ClientOpenedEvent());
 
         commandLineParser.processArguments(serverManager);
 
@@ -211,7 +210,7 @@ public class Main {
                     component.shutDown();
                 }
 
-                eventBus.post(new ClientClosedEvent());
+                eventBus.publishAsync(new ClientClosedEvent());
                 serverManager.disconnectAll("Unexpected shutdown");
                 identityManager.saveAll();
             }
@@ -289,13 +288,13 @@ public class Main {
     private void doFirstRun() {
         if (identityManager.getGlobalConfiguration().getOptionBool("general", "firstRun")) {
             identityManager.getUserSettings().setOption("general", "firstRun", "false");
-            eventBus.post(new FirstRunEvent());
+            eventBus.publish(new FirstRunEvent());
 
             new Timer().schedule(new TimerTask() {
 
                 @Override
                 public void run() {
-                    eventBus.post(new FeedbackNagEvent());
+                    eventBus.publishAsync(new FeedbackNagEvent());
                 }
             }, FEEDBACK_DELAY);
         }

src/com/dmdirc/MessageEncoder.java

@@ -27,10 +27,10 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.parser.interfaces.Encoder;
 import com.dmdirc.parser.interfaces.Parser;
 
-import com.google.common.eventbus.EventBus;
-
 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 +42,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 EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of {@link MessageEncoder}.
@@ -52,7 +52,7 @@ public class MessageEncoder implements Encoder {
      * @param eventBus The event bus to post errors to.
      */
     public MessageEncoder(final Server server, final Parser parser,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         this.server = server;
         this.parser = parser;
         this.eventBus = eventBus;
@@ -71,7 +71,7 @@ public class MessageEncoder implements Encoder {
         try {
             return new String(message, offset, length, encoding);
         } catch (UnsupportedEncodingException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
                     "Unsupported character encoding: " + encoding, ""));
             return new String(message, offset, length);
         }

src/com/dmdirc/MessageEncoderFactory.java

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

src/com/dmdirc/MessageTarget.java

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

src/com/dmdirc/ParserFactory.java

@@ -32,12 +32,12 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.Service;
 import com.dmdirc.plugins.ServiceProvider;
 
-import com.google.common.eventbus.EventBus;
-
 import java.net.URI;
 
 import javax.inject.Inject;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Provides a method to retrieve a parser.
  *
@@ -48,7 +48,7 @@ public class ParserFactory {
     /** PluginManager used by this ParserFactory */
     private final PluginManager pluginManager;
     /** The event bus to post events to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of {@link ParserFactory}.
@@ -58,7 +58,7 @@ public class ParserFactory {
      */
     @Inject
     public ParserFactory(final PluginManager pluginManager,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         this.pluginManager = pluginManager;
         this.eventBus = eventBus;
     }
@@ -132,7 +132,7 @@ public class ParserFactory {
                 }
             }
         } catch (NoSuchProviderException nspe) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, nspe,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, nspe,
                     "No parser found for: " + address.getScheme(), ""));
         }
 

src/com/dmdirc/Query.java

@@ -137,7 +137,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
                 final DisplayableEvent event = new QuerySelfMessageEvent(this, server.getParser().
                         getLocalClient(), part);
                 event.setDisplayFormat("querySelfMessage");
-                getEventBus().post(event);
+                getEventBus().publish(event);
             }
         }
     }
@@ -177,7 +177,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
             doNotification("querySelfAction", client, action);
             final DisplayableEvent event = new QuerySelfActionEvent(this, client, action);
             event.setDisplayFormat("querySelfAction");
-            getEventBus().post(event);
+            getEventBus().publish(event);
         } else {
             addLine("actionTooLong", action.length());
         }
@@ -192,7 +192,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
 
         final DisplayableEvent event = new QueryMessageEvent(this, parser.getClient(host), message);
         event.setDisplayFormat(buff.toString());
-        getEventBus().post(event);
+        getEventBus().publish(event);
 
         addLine(buff, parts[0], parts[1], parts[2], message);
     }
@@ -206,7 +206,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
 
         final DisplayableEvent event = new QueryActionEvent(this, parser.getClient(host), message);
         event.setDisplayFormat(buff.toString());
-        getEventBus().post(event);
+        getEventBus().publish(event);
 
         addLine(buff, parts[0], parts[1], parts[2], message);
     }
@@ -260,7 +260,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
 
             final DisplayableEvent event = new QueryNickchangeEvent(this, oldNick);
             event.setDisplayFormat("queryNickChanged");
-            getEventBus().post(event);
+            getEventBus().publish(event);
 
             server.updateQuery(this, oldNick, client.getNickname());
 
@@ -283,7 +283,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
 
             final DisplayableEvent event = new QueryQuitEvent(this, reason);
             event.setDisplayFormat(format.toString());
-            getEventBus().post(event);
+            getEventBus().publish(event);
 
             addLine(format, client.getNickname(),
                     client.getUsername(), client.getHostname(), reason);
@@ -316,7 +316,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
         }
 
         // Trigger action for the window closing
-        getEventBus().post(new QueryClosedEvent(this));
+        getEventBus().publishAsync(new QueryClosedEvent(this));
 
         // Inform any parents that the window is closing
         server.delQuery(this);

src/com/dmdirc/Server.java

@@ -67,8 +67,6 @@ import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.messages.Formatter;
 import com.dmdirc.util.URLBuilder;
 
-import com.google.common.eventbus.EventBus;
-
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.security.cert.CertificateException;
@@ -95,6 +93,8 @@ 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 +223,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
             final QueryFactory queryFactory,
             final RawFactory rawFactory,
             final URLBuilder urlBuilder,
-            final EventBus eventBus,
+            final MBassador eventBus,
             final MessageEncoderFactory messageEncoderFactory,
             final ConfigProvider userSettings,
             final ScheduledExecutorService executorService,
@@ -379,7 +379,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
             }
         }
 
-        getEventBus().post(new ServerConnectingEvent(this));
+        getEventBus().publish(new ServerConnectingEvent(this));
     }
 
     @Override
@@ -535,7 +535,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
             final Query newQuery = queryFactory.getQuery(this, host);
 
             windowManager.addWindow(this, newQuery, focus);
-            getEventBus().post(new QueryOpenedEvent(newQuery));
+            getEventBus().publish(new QueryOpenedEvent(newQuery));
 
             getTabCompleter().addEntry(TabCompletionType.QUERY_NICK, nick);
             queries.put(lnick, newQuery);
@@ -619,7 +619,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
             final Channel newChan = channelFactory.getChannel(this, chan, channelConfig);
 
             windowManager.addWindow(this, newChan, focus);
-            getEventBus().post(new ChannelOpenedEvent(newChan));
+            getEventBus().publish(new ChannelOpenedEvent(newChan));
 
             getTabCompleter().addEntry(TabCompletionType.CHANNEL, chan.getName());
             channels.add(newChan);
@@ -1198,7 +1198,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
 
         handleNotification("socketClosed", getAddress());
 
-        getEventBus().post(new ServerDisconnectedEvent(this));
+        getEventBus().publish(new ServerDisconnectedEvent(this));
 
         eventHandler.unregisterCallbacks();
 
@@ -1303,7 +1303,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
                 }
             }
 
-            getEventBus().post(new ServerConnectErrorEvent(this, description));
+            getEventBus().publish(new ServerConnectErrorEvent(this, description));
 
             handleNotification("connectError", getAddress(), description);
 
@@ -1323,7 +1323,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
                 + ((int) (Math.floor(parser.getPingTime() / 1000.0)))
                 + " seconds.", getConfigManager()));
 
-        getEventBus().post(new ServerNopingEvent(this, parser.getPingTime()));
+        getEventBus().publishAsync(new ServerNopingEvent(this, parser.getPingTime()));
 
         if (parser.getPingTime()
                 >= getConfigManager().getOptionInt(DOMAIN_SERVER, "pingtimeout")) {
@@ -1370,7 +1370,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
                     channels.getWhoRunnable(), whoTime, whoTime, TimeUnit.MILLISECONDS);
         }
 
-        getEventBus().post(new ServerConnectedEvent(this));
+        getEventBus().publish(new ServerConnectedEvent(this));
     }
 
     /**

src/com/dmdirc/ServerEventHandler.java

@@ -92,12 +92,12 @@ import com.dmdirc.parser.interfaces.callbacks.WallDesyncListener;
 import com.dmdirc.parser.interfaces.callbacks.WallopListener;
 import com.dmdirc.parser.interfaces.callbacks.WalluserListener;
 
-import com.google.common.eventbus.EventBus;
-
 import java.util.Date;
 
 import javax.annotation.Nonnull;
 
+import net.engio.mbassy.bus.MBassador;
+
 
 /**
  * Handles parser events for a Server object.
@@ -118,7 +118,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 EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of ServerEventHandler.
@@ -126,7 +126,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 EventBus eventBus) {
+    public ServerEventHandler(final Server owner, final MBassador eventBus) {
         this.owner = owner;
         this.eventBus = eventBus;
     }
@@ -192,9 +192,9 @@ public class ServerEventHandler extends EventHandler implements
                 : new Exception(errorString.toString()); // NOPMD
 
         if (errorInfo.isUserError()) {
-            eventBus.post(new UserErrorEvent(errorLevel, ex, errorInfo.getData(), ""));
+            eventBus.publishAsync(new UserErrorEvent(errorLevel, ex, errorInfo.getData(), ""));
         } else {
-            eventBus.post(new AppErrorEvent(errorLevel, ex, errorInfo.getData(), ""));
+            eventBus.publishAsync(new AppErrorEvent(errorLevel, ex, errorInfo.getData(), ""));
         }
     }
 
@@ -297,14 +297,14 @@ public class ServerEventHandler extends EventHandler implements
     public void onPingSent(final Parser parser, final Date date) {
         checkParser(parser);
 
-        eventBus.post(new ServerPingsentEvent(owner));
+        eventBus.publishAsync(new ServerPingsentEvent(owner));
     }
 
     @Override
     public void onPingSuccess(final Parser parser, final Date date) {
         checkParser(parser);
 
-        eventBus.post(new ServerGotpingEvent(owner, owner.getParser().getServerLatency()));
+        eventBus.publishAsync(new ServerGotpingEvent(owner, owner.getParser().getServerLatency()));
     }
 
     @Override

src/com/dmdirc/ServerFactoryImpl.java

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

src/com/dmdirc/ServerManager.java

@@ -34,7 +34,6 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.WindowManager;
 
-import com.google.common.eventbus.EventBus;
 import com.google.common.util.concurrent.ThreadFactoryBuilder;
 
 import java.net.URI;
@@ -50,6 +49,8 @@ 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;
 
 /**
@@ -72,7 +73,7 @@ public class ServerManager implements ServerFactory {
     /** Concrete server factory to use. */
     private final ServerFactoryImpl serverFactoryImpl;
     /** Event bus for servers. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of ServerManager.
@@ -91,7 +92,7 @@ public class ServerManager implements ServerFactory {
             final Provider<CommandController> commandController,
             final WindowManager windowManager,
             final ServerFactoryImpl serverFactory,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         this.identityController = identityController;
         this.identityFactory = identityFactory;
         this.commandController = commandController;
@@ -277,7 +278,7 @@ public class ServerManager implements ServerFactory {
             try {
                 connectToAddress(new URI("irc://irc.quakenet.org/DMDirc"));
             } catch (URISyntaxException ex) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
+                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
                         "Unable to construct new server", ""));
             }
         } else {

src/com/dmdirc/actions/Action.java

@@ -40,8 +40,6 @@ import com.dmdirc.updater.Version;
 import com.dmdirc.util.io.ConfigFile;
 import com.dmdirc.util.io.InvalidConfigFileException;
 
-import com.google.common.eventbus.EventBus;
-
 import java.io.IOException;
 import java.nio.file.FileSystem;
 import java.nio.file.Files;
@@ -53,6 +51,8 @@ import java.util.Map;
 
 import javax.inject.Provider;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Describes a single action.
  */
@@ -79,7 +79,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 EventBus eventBus;
+    private final MBassador eventBus;
     /** The file system to read/write actions to. */
     private final FileSystem filesystem;
     /** The config file we're using. */
@@ -101,7 +101,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 EventBus eventBus,
+    public Action(final FileSystem filesystem, final MBassador eventBus,
             final Provider<GlobalWindow> globalWindowProvider,
             final ActionSubstitutorFactory substitutorFactory,
             final ActionController actionController, final IdentityController identityController,
@@ -149,7 +149,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 EventBus eventBus,
+    public Action(final FileSystem filesystem, final MBassador eventBus,
             final Provider<GlobalWindow> globalWindowProvider,
             final ActionSubstitutorFactory substitutorFactory,
             final ActionController actionController, final IdentityController identityController,
@@ -182,7 +182,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
 
         actionController.addAction(this);
         //TODO This needs to be done somewhere else, remove eventbus when it is.
-        eventBus.post(new ActionCreatedEvent(this));
+        eventBus.publishAsync(new ActionCreatedEvent(this));
     }
 
     /**
@@ -415,7 +415,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
                     + group + "/" + name + ": " + ex.getMessage());
         }
 
-        eventBus.post(new ActionUpdatedEvent(this));
+        eventBus.publishAsync(new ActionUpdatedEvent(this));
     }
 
     /**
@@ -587,7 +587,7 @@ public class Action extends ActionModel implements ConfigChangeListener {
      * Deletes this action.
      */
     public void delete() {
-        eventBus.post(new ActionDeletedEvent(actionController.getOrCreateGroup(getGroup()), this));
+        eventBus.publishAsync(new ActionDeletedEvent(actionController.getOrCreateGroup(getGroup()), this));
         try {
             Files.delete(filesystem.getPath(location));
         } catch (IOException ex) {

src/com/dmdirc/actions/ActionFactory.java

@@ -29,7 +29,7 @@ import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.interfaces.config.IdentityController;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import java.nio.file.FileSystem;
 import java.nio.file.FileSystems;
@@ -56,7 +56,7 @@ public class ActionFactory {
     /** The base directory to store actions in. */
     private final String actionsDirectory;
     /** Event bus to post events on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     /** The file system to read/write actions to. */
     private final FileSystem filesystem;
 
@@ -71,7 +71,7 @@ public class ActionFactory {
      * @param actionsDirectory            The base directory to store actions in.
      */
     @Inject
-    public ActionFactory(final EventBus eventBus, final Provider<ActionController> actionController,
+    public ActionFactory(final MBassador eventBus, final Provider<ActionController> actionController,
             final Provider<IdentityController> identityController,
             final Provider<GlobalWindow> globalWindowProvider,
             final ActionSubstitutorFactory substitutorFactory,

src/com/dmdirc/actions/ActionManager.java

@@ -42,9 +42,6 @@ import com.dmdirc.updater.manager.UpdateManager;
 import com.dmdirc.util.collections.MapList;
 import com.dmdirc.util.resourcemanager.ZipResourceManager;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import java.io.File;
 import java.io.IOException;
 import java.lang.reflect.Method;
@@ -59,6 +56,9 @@ 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;
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -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 EventBus eventBus;
+    private final MBassador 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 EventBus eventBus,
+            final MBassador eventBus,
             final String directory) {
         this.identityManager = identityManager;
         this.factory = factory;
@@ -170,7 +170,7 @@ public class ActionManager implements ActionController {
 
         new WhoisNumericFormatter(identityManager.getAddonSettings(), eventBus).register();
 
-        eventBus.register(this);
+        eventBus.subscribe(this);
     }
 
     @Override
@@ -187,7 +187,7 @@ public class ActionManager implements ActionController {
      *
      * @param event The event that was raised.
      */
-    @Subscribe
+    @Handler
     public void handleClientClosed(final ClientClosedEvent event) {
         LOG.debug("Client closed - saving all actions");
         saveAllActions();
@@ -262,13 +262,13 @@ public class ActionManager implements ActionController {
                 dir.mkdirs();
                 dir.createNewFile();
             } catch (IOException ex) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.HIGH, null,
+                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.HIGH, null,
                         "I/O error when creating actions directory: " + ex.getMessage(), ""));
             }
         }
 
         if (dir.listFiles() == null) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, null,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, null,
                     "Unable to load user action files", ""));
         } else {
             for (File file : dir.listFiles()) {
@@ -371,7 +371,7 @@ public class ActionManager implements ActionController {
                 try {
                     listener.processEvent(type, format, arguments);
                 } catch (Exception e) {
-                    eventBus.post(new AppErrorEvent(ErrorLevel.MEDIUM, e,
+                    eventBus.publishAsync(new AppErrorEvent(ErrorLevel.MEDIUM, e,
                             "Error processing action: " + e.getMessage(), ""));
                 }
             }
@@ -420,7 +420,7 @@ public class ActionManager implements ActionController {
                         }
                     }
                 } catch (LinkageError | Exception e) {
-                    eventBus.post(new AppErrorEvent(ErrorLevel.MEDIUM, e,
+                    eventBus.publishAsync(new AppErrorEvent(ErrorLevel.MEDIUM, e,
                             "Error processing action: " + e.getMessage(), ""));
                 }
             }
@@ -434,7 +434,7 @@ public class ActionManager implements ActionController {
      *
      * @param event The event that was raised.
      */
-    @Subscribe
+    @Handler
     public void processEvent(final DMDircEvent event) {
         final ActionType type = getType(getLegacyActionTypeName(event));
         if (type == null) {
@@ -549,7 +549,7 @@ public class ActionManager implements ActionController {
         if (dir.isDirectory()) {
             for (File file : dir.listFiles()) {
                 if (!file.delete()) {
-                    eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, null,
+                    eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, null,
                             "Unable to remove file: " + file.getAbsolutePath(), ""));
                     return;
                 }
@@ -557,7 +557,7 @@ public class ActionManager implements ActionController {
         }
 
         if (!dir.delete()) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, null,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, null,
                     "Unable to remove directory: " + dir.getAbsolutePath(), ""));
             return;
         }

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

@@ -27,12 +27,12 @@ import com.dmdirc.events.ServerNumericEvent;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.ConfigProvider;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import java.util.HashMap;
 import java.util.Map;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+
 /**
  * Listens for whois-like numeric events and automatically formats them.
  *
@@ -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 EventBus eventBus;
+    private final MBassador 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 EventBus eventBus) {
+            final MBassador eventBus) {
         this.identity = identity;
         this.eventBus = eventBus;
     }
@@ -64,7 +64,7 @@ public class WhoisNumericFormatter {
      * Registers this this whois numeric formatter with the global actions manager.
      */
     public void register() {
-        eventBus.register(this);
+        eventBus.subscribe(this);
     }
 
     /**
@@ -73,7 +73,7 @@ public class WhoisNumericFormatter {
      *
      * @param event The server disconnected event to process
      */
-    @Subscribe
+    @Handler
     public void handleServerDisconnected(final ServerDisconnectedEvent event) {
         targets.remove(event.getConnection());
     }
@@ -86,7 +86,7 @@ public class WhoisNumericFormatter {
      *
      * @param event The server numeric event to process
      */
-    @Subscribe
+    @Handler
     public void handleNumeric(final ServerNumericEvent event) {
         final Connection server = event.getConnection();
         final int numeric = event.getNumeric();

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

@@ -38,14 +38,14 @@ import com.dmdirc.interfaces.actions.ActionComponent;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.logger.ErrorLevel;
 
-import com.google.common.eventbus.EventBus;
-
 import java.util.ArrayList;
 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 +57,7 @@ public class PerformWrapper extends ActionGroup {
     /** Factory to use for actions. */
     private final ActionFactory actionFactory;
     /** The event bus to post events to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of PerformWrapper.
@@ -67,7 +67,7 @@ public class PerformWrapper extends ActionGroup {
      */
     @Inject
     public PerformWrapper(final ActionFactory actionFactory,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         super("performs");
 
         this.actionFactory = actionFactory;
@@ -77,15 +77,15 @@ public class PerformWrapper extends ActionGroup {
     @Override
     public void add(final Action action) {
         if (action.getTriggers().length != 1) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, null,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, null,
                     "Invalid perform action: " + action.getName(),
                     "Perform actions may only have one trigger"));
         } else if (action.getTriggers()[0] != CoreActionType.SERVER_CONNECTED) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, null,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, null,
                     "Invalid perform action: " + action.getName(),
                     "Perform actions must be triggered when a server connects"));
         } else if (!checkConditions(action.getConditions())) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, null,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, null,
                     "Invalid perform action: " + action.getName(),
                     "Perform actions must have exactly one or two conditions, "
                     + "one may target the server's name or network, and one may "

src/com/dmdirc/commandparser/PopupManager.java

@@ -26,10 +26,10 @@ import com.dmdirc.events.ClientPopupGeneratedEvent;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
-import com.google.common.eventbus.EventBus;
-
 import javax.inject.Inject;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * The popup manager manages which commands should be present in popup menus.
  */
@@ -38,7 +38,7 @@ public class PopupManager {
     /** The command controller to use for items. */
     private final CommandController commandController;
     /** The bus to dispatch events on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of PopupManager.
@@ -47,7 +47,7 @@ public class PopupManager {
      * @param eventBus          The bus to dispatch events on.
      */
     @Inject
-    public PopupManager(final CommandController commandController, final EventBus eventBus) {
+    public PopupManager(final CommandController commandController, final MBassador eventBus) {
         this.commandController = commandController;
         this.eventBus = eventBus;
     }
@@ -64,7 +64,7 @@ public class PopupManager {
     public PopupMenu getMenu(final PopupType menuType, final AggregateConfigProvider configManager) {
         final PopupMenu menu = getMenu(menuType.toString(), menuType, configManager);
 
-        eventBus.post(new ClientPopupGeneratedEvent(menuType, menu, configManager));
+        eventBus.publishAsync(new ClientPopupGeneratedEvent(menuType, menu, configManager));
 
         return menu;
     }

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

@@ -30,7 +30,7 @@ import com.dmdirc.events.ClientOpenedEvent;
 import com.dmdirc.events.ServerConnectedEvent;
 import com.dmdirc.interfaces.CommandController;
 
-import com.google.common.eventbus.Subscribe;
+import net.engio.mbassy.listener.Handler;
 
 /**
  * Handles execution of {@link AutoCommand}s.
@@ -58,7 +58,7 @@ public class AutoCommandHandler {
      *
      * @param event The event triggering the command.
      */
-    @Subscribe
+    @Handler
     public void checkAutoCommand(final ClientOpenedEvent event) {
         if (!autoCommand.getServer().isPresent() && !autoCommand.getNetwork().isPresent()) {
             execute(globalWindow, globalCommandParser);
@@ -70,7 +70,7 @@ public class AutoCommandHandler {
      *
      * @param event The event triggering the command.
      */
-    @Subscribe
+    @Handler
     public void checkAutoCommand(final ServerConnectedEvent event) {
         if (!autoCommand.getServer().isPresent() && !autoCommand.getNetwork().isPresent()) {
             // This is a global auto command, shouldn't be executed for servers.

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

@@ -22,8 +22,6 @@
 
 package com.dmdirc.commandparser.auto;
 
-import com.google.common.eventbus.EventBus;
-
 import java.util.Collections;
 import java.util.Map;
 import java.util.Set;
@@ -32,6 +30,8 @@ import java.util.concurrent.ConcurrentSkipListMap;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import net.engio.mbassy.bus.MBassador;
+
 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 EventBus eventBus;
+    private final MBassador 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 EventBus eventBus, final AutoCommandHandlerFactory factory) {
+    public AutoCommandManager(final MBassador eventBus, final AutoCommandHandlerFactory factory) {
         this.eventBus = eventBus;
         this.factory = factory;
     }
@@ -67,7 +67,7 @@ public class AutoCommandManager {
     public void start() {
         started = true;
         for (AutoCommandHandler handler : autoCommands.values()) {
-            eventBus.register(handler);
+            eventBus.subscribe(handler);
         }
     }
 
@@ -77,7 +77,7 @@ public class AutoCommandManager {
     public void stop() {
         started = false;
         for (AutoCommandHandler handler : autoCommands.values()) {
-            eventBus.unregister(handler);
+            eventBus.subscribe(handler);
         }
     }
 
@@ -91,7 +91,7 @@ public class AutoCommandManager {
         final AutoCommandHandler handler = factory.getAutoCommandHandler(autoCommand);
 
         if (started) {
-            eventBus.register(handler);
+            eventBus.subscribe(handler);
         }
 
         autoCommands.put(autoCommand, handler);
@@ -107,7 +107,7 @@ public class AutoCommandManager {
         final AutoCommandHandler handler = autoCommands.remove(autoCommand);
 
         if (started) {
-            eventBus.unregister(handler);
+            eventBus.subscribe(handler);
         }
     }
 

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

@@ -39,7 +39,7 @@ import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.util.URLBuilder;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import javax.inject.Inject;
 
@@ -58,7 +58,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 EventBus eventBus;
+    private final MBassador eventBus;
     /** The config provider to retrieve settings from. */
     private final AggregateConfigProvider configProvider;
 
@@ -76,7 +76,7 @@ public class OpenWindow extends Command implements IntelligentCommand {
             final CommandController controller,
             final WindowManager windowManager,
             final URLBuilder urlBuilder,
-            final EventBus eventBus,
+            final MBassador eventBus,
             @GlobalConfig final AggregateConfigProvider configProvider) {
         super(controller);
 

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

@@ -41,14 +41,15 @@ import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.collections.MapList;
 
 import com.google.common.base.Optional;
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Inject;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+
 /**
  * Allows the user to join channels.
  *
@@ -72,9 +73,9 @@ public class JoinChannelCommand extends Command implements IntelligentCommand {
     @Inject
     public JoinChannelCommand(
             final CommandController controller,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         super(controller);
-        eventBus.register(this);
+        eventBus.subscribe(this);
     }
 
     @Override
@@ -102,7 +103,7 @@ public class JoinChannelCommand extends Command implements IntelligentCommand {
         server.join(!args.isSilent(), channels.toArray(new ChannelJoinRequest[channels.size()]));
     }
 
-    @Subscribe
+    @Handler
     public void handleClientLineAdded(final ClientLineAddedEvent event) {
         final String[] parts = event.getFrameContainer().getStyliser()
                 .doLinks(event.getLine())

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

@@ -33,7 +33,7 @@ import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import javax.annotation.Nonnull;
 
@@ -57,7 +57,7 @@ public class ChannelCommandParser extends ChatCommandParser {
      * @param eventBus          Event bus to post events on
      */
     public ChannelCommandParser(final Server server, final CommandController commandController,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         super(server, commandController, eventBus);
     }
 

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

@@ -33,7 +33,7 @@ import com.dmdirc.commandparser.commands.context.ChatCommandContext;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.interfaces.CommandController;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import javax.annotation.Nonnull;
 
@@ -57,7 +57,7 @@ public class ChatCommandParser extends ServerCommandParser {
      * @param eventBus          Event but to post events on
      */
     public ChatCommandParser(final Server server, final CommandController commandController,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         super(server.getConfigManager(), commandController, eventBus);
         super.setOwner(server);
     }

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

@@ -41,14 +41,14 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.collections.RollingList;
 
-import com.google.common.eventbus.EventBus;
-
 import java.io.Serializable;
 import java.util.HashMap;
 import java.util.Map;
 
 import javax.annotation.Nonnull;
 
+import net.engio.mbassy.bus.MBassador;
+
 import static com.google.common.base.Preconditions.checkNotNull;
 
 /**
@@ -67,7 +67,7 @@ public abstract class CommandParser implements Serializable {
     /** Command manager to use. */
     protected final CommandController commandManager;
     /** Event bus to post events to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of CommandParser.
@@ -78,7 +78,7 @@ public abstract class CommandParser implements Serializable {
      */
     protected CommandParser(final AggregateConfigProvider configManager,
             final CommandController commandManager,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         this.eventBus = eventBus;
         commands = new HashMap<>();
         history = new RollingList<>(configManager.getOptionInt("general", "commandhistory"));
@@ -337,7 +337,7 @@ public abstract class CommandParser implements Serializable {
     protected void handleInvalidCommand(final FrameContainer origin,
             final CommandArguments args) {
         if (origin == null) {
-            eventBus.post(new UnknownCommandEvent(null, args.getCommandName(), args.getArguments()));
+            eventBus.publish(new UnknownCommandEvent(null, args.getCommandName(), args.getArguments()));
         } else {
             final DisplayableEvent event = new UnknownCommandEvent(origin, args.getCommandName(),
                     args.getArguments());

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 com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 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 EventBus eventBus) {
+            final MBassador eventBus) {
         super(configManager, commandManager, eventBus);
     }
 

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

@@ -33,7 +33,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.QueryCommandContext;
 import com.dmdirc.interfaces.CommandController;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import javax.annotation.Nonnull;
 
@@ -58,7 +58,7 @@ public class QueryCommandParser extends ChatCommandParser {
      * @param eventBus          Event bus to post events on
      */
     public QueryCommandParser(final Server server, final CommandController commandController,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         super(server, commandController, eventBus);
     }
 

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

@@ -34,7 +34,7 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import javax.annotation.Nonnull;
 
@@ -56,7 +56,7 @@ public class ServerCommandParser extends GlobalCommandParser {
     public ServerCommandParser(
             final AggregateConfigProvider configManager,
             final CommandController commandController,
-            final EventBus eventBus) {
+            final MBassador 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 com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 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 EventBus eventBus;
+    private final MBassador 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 EventBus eventBus) {
+            final MBassador eventBus) {
         this.configDirectory = baseDirectory;
         this.identitiesDirectory = identitiesDirectory;
         this.eventBus = eventBus;
@@ -138,7 +138,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         addConfigProvider(addonConfig);
 
         if (!getGlobalConfiguration().hasOptionString("identity", "defaultsversion")) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.FATAL, null,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.FATAL, null,
                     "Default settings could not be loaded", ""));
         }
     }
@@ -158,7 +158,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
                 }
 
                 if (!success) {
-                    eventBus.post(new UserErrorEvent(ErrorLevel.HIGH, null,
+                    eventBus.publishAsync(new UserErrorEvent(ErrorLevel.HIGH, null,
                             "Unable to create directory for default settings folder ("
                             + target + ")",
                             "A file with that name already exists, and couldn't be renamed."
@@ -168,7 +168,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
             }
 
             if (!file.exists() && !file.mkdirs()) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.FATAL, null,
+                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.FATAL, null,
                         "Unable to create required directory '" + file.getAbsolutePath()
                         + "'. Please check file permissions or specify "
                         + "a different configuration directory.", ""));
@@ -209,7 +209,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
                     "com/dmdirc/config/defaults/default/formatter",
                     identitiesDirectory + "default/", false);
         } catch (IOException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, null,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, null,
                     "Unable to extract default formatters: " + ex.getMessage(), ""));
         }
     }
@@ -225,7 +225,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
                     "com/dmdirc/config/defaults/" + target,
                     identitiesDirectory + target, false);
         } catch (IOException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, null,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, null,
                     "Unable to extract default identities: " + ex.getMessage(), ""));
         }
     }
@@ -239,7 +239,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
                 dir.mkdirs();
                 dir.createNewFile();
             } catch (IOException ex) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
+                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
                         "Unable to create identity dir", ""));
             }
         }
@@ -261,7 +261,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         checkArgument(dir.isDirectory());
 
         if (dir.listFiles() == null) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, null,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, null,
                     "Unable to load user identity files from " + dir.getAbsolutePath(), ""));
         } else {
             for (File file : dir.listFiles()) {
@@ -290,7 +290,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
                     try {
                         identity.reload();
                     } catch (IOException ex) {
-                        eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, null,
+                        eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, null,
                                 "I/O error when reloading identity file: "
                                 + file.getAbsolutePath() + " (" + ex.getMessage() + ")", ""));
                     } catch (InvalidConfigFileException ex) {
@@ -305,11 +305,11 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         try {
             addConfigProvider(new ConfigFileBackedConfigProvider(this, file, false));
         } catch (InvalidIdentityFileException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, null,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, null,
                     "Invalid identity file: " + file.getAbsolutePath() + " ("
                     + ex.getMessage() + ")", ""));
         } catch (IOException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, null,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, null,
                     "I/O error when reading identity file: " + file.getAbsolutePath(), ""));
         }
     }
@@ -353,7 +353,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
                     getResourceAsStream("/com/dmdirc/version.config"), false);
             addConfigProvider(versionConfig);
         } catch (IOException | InvalidIdentityFileException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
                     "Unable to load version information", ""));
         }
     }
@@ -375,7 +375,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
             config.setOption("identity", "name", "Global config");
             addConfigProvider(config);
         } catch (IOException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
                     "I/O error when loading global config: " + ex.getMessage(), ""));
         }
     }
@@ -597,7 +597,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         try {
             return createIdentity(settings);
         } catch (InvalidIdentityFileException | IOException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
                     "Unable to create identity", ""));
             return null;
         }
@@ -618,7 +618,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         try {
             return createIdentity(settings);
         } catch (InvalidIdentityFileException | IOException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
                     "Unable to create identity", ""));
             return null;
         }
@@ -634,7 +634,7 @@ public class IdentityManager implements IdentityFactory, IdentityController {
         try {
             return createIdentity(settings);
         } catch (InvalidIdentityFileException | IOException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
                     "Unable to create identity", ""));
             return null;
         }

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

@@ -32,8 +32,6 @@ import com.dmdirc.util.collections.ListenerList;
 import com.dmdirc.util.validators.NumericalValidator;
 import com.dmdirc.util.validators.OptionalValidator;
 
-import com.google.common.eventbus.EventBus;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
@@ -42,6 +40,8 @@ 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 +66,7 @@ public class PreferencesDialogModel {
     /** Plugin manager. */
     private final PluginManager pluginManager;
     /** Event bus to post events on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of PreferencesDialogModel.
@@ -88,7 +88,7 @@ public class PreferencesDialogModel {
             final AggregateConfigProvider configManager,
             final ConfigProvider identity,
             final PluginManager pluginManager,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         this.pluginPanel = pluginPanel;
         this.themePanel = themePanel;
         this.updatesPanel = updatesPanel;
@@ -100,7 +100,7 @@ public class PreferencesDialogModel {
 
         addDefaultCategories();
 
-        eventBus.post(new ClientPrefsOpenedEvent(this));
+        eventBus.publishAsync(new ClientPrefsOpenedEvent(this));
     }
 
     public AggregateConfigProvider getConfigManager() {
@@ -631,7 +631,7 @@ public class PreferencesDialogModel {
      * @since 0.6
      */
     public void close() {
-        eventBus.post(new ClientPrefsClosedEvent());
+        eventBus.publishAsync(new ClientPrefsClosedEvent());
     }
 
 }

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

@@ -29,10 +29,10 @@ import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.util.validators.NumericalValidator;
 import com.dmdirc.util.validators.OptionalValidator;
 
-import com.google.common.eventbus.EventBus;
-
 import javax.inject.Inject;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Manages preferences for the client.
  *
@@ -41,10 +41,10 @@ import javax.inject.Inject;
 public class PreferencesManager {
 
     /** Event bus to public events on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     @Inject
-    public PreferencesManager(final EventBus eventBus) {
+    public PreferencesManager(final MBassador eventBus) {
         this.eventBus = eventBus;
     }
 
@@ -127,7 +127,7 @@ public class PreferencesManager {
                 "Reconnect message", "Default quit message to use when reconnecting",
                 manager, identity));
 
-        eventBus.post(new ConnectionPrefsRequestedEvent(category));
+        eventBus.publish(new ConnectionPrefsRequestedEvent(category));
 
         return category;
     }
@@ -240,7 +240,7 @@ public class PreferencesManager {
                 "Number of items of input history to keep",
                 manager, identity));
 
-        eventBus.post(new GroupChatPrefsRequestedEvent(category));
+        eventBus.publish(new GroupChatPrefsRequestedEvent(category));
 
         return category;
     }

src/com/dmdirc/events/ActionCreatedEvent.java

@@ -23,12 +23,10 @@
 package com.dmdirc.events;
 
 import com.dmdirc.actions.Action;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Fired on the creation of an action.
  */
-@AsyncEvent
 public class ActionCreatedEvent extends ActionEvent {
 
     public ActionCreatedEvent(final Action action) {

src/com/dmdirc/events/ActionDeletedEvent.java

@@ -24,12 +24,10 @@ package com.dmdirc.events;
 
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionGroup;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Fired when an action is deleted.
  */
-@AsyncEvent
 public class ActionDeletedEvent extends ActionEvent {
 
     private final ActionGroup group;

src/com/dmdirc/events/ActionUpdatedEvent.java

@@ -23,12 +23,10 @@
 package com.dmdirc.events;
 
 import com.dmdirc.actions.Action;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Fired when an action is updated.
  */
-@AsyncEvent
 public class ActionUpdatedEvent extends ActionEvent {
 
     public ActionUpdatedEvent(final Action action) {

src/com/dmdirc/events/AppErrorEvent.java

@@ -23,12 +23,10 @@
 package com.dmdirc.events;
 
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Event class for app errors.
  */
-@AsyncEvent
 public class AppErrorEvent extends ErrorEvent {
 
     public AppErrorEvent(final ErrorLevel level, final Throwable throwable, final String message,

src/com/dmdirc/events/ChannelGotnamesEvent.java

@@ -23,12 +23,10 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Channel;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Fired when a channel names event is received.
  */
-@AsyncEvent
 public class ChannelGotnamesEvent extends ChannelEvent {
 
     public ChannelGotnamesEvent(final long timestamp, final Channel channel) {

src/com/dmdirc/events/ClientClosedEvent.java

@@ -22,12 +22,9 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.util.AsyncEvent;
-
 /**
  * Fired when the client is being closed.
  */
-@AsyncEvent
 public class ClientClosedEvent extends DMDircEvent {
 
 }

src/com/dmdirc/events/ClientClosingEvent.java

@@ -22,12 +22,9 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.util.AsyncEvent;
-
 /**
  * Fired when the client is about to close.
  */
-@AsyncEvent
 public class ClientClosingEvent extends DMDircEvent {
 
 }

src/com/dmdirc/events/ClientFocusGainedEvent.java

@@ -22,14 +22,11 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.util.AsyncEvent;
-
 /**
  * Fired when the the client is bought into focus.
  *
  * TODO: This should be moved into the Swing UI once the corresponding action types are removed.
  */
-@AsyncEvent
 public class ClientFocusGainedEvent extends DMDircEvent {
 
 }

src/com/dmdirc/events/ClientFocusLostEvent.java

@@ -22,14 +22,11 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.util.AsyncEvent;
-
 /**
  * Fired when the the client loses focus.
  *
  * TODO: This should be moved into the Swing UI once the corresponding action types are removed.
  */
-@AsyncEvent
 public class ClientFocusLostEvent extends DMDircEvent {
 
 }

src/com/dmdirc/events/ClientFrameChangedEvent.java

@@ -23,12 +23,10 @@
 package com.dmdirc.events;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Event fired when a new frame has been focused.
  */
-@AsyncEvent
 public class ClientFrameChangedEvent extends DMDircEvent {
 
     private final FrameContainer container;

src/com/dmdirc/events/ClientKeyPressedEvent.java

@@ -22,8 +22,6 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.util.AsyncEvent;
-
 import javax.swing.KeyStroke;
 
 /**
@@ -31,7 +29,6 @@ import javax.swing.KeyStroke;
  *
  * TODO: This should be moved into the Swing UI once the corresponding action types are removed.
  */
-@AsyncEvent
 public class ClientKeyPressedEvent extends DMDircEvent {
 
     private final KeyStroke keyStroke;

src/com/dmdirc/events/ClientLineAddedEvent.java

@@ -23,12 +23,10 @@
 package com.dmdirc.events;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Event fired when a line has been added to a window.
  */
-@AsyncEvent
 public class ClientLineAddedEvent extends DMDircEvent {
 
     private final FrameContainer container;

src/com/dmdirc/events/ClientMinimisedEvent.java

@@ -22,14 +22,11 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.util.AsyncEvent;
-
 /**
  * Fired when the the client is minimised.
  *
  * TODO: This should be moved into the Swing UI once the corresponding action types are removed.
  */
-@AsyncEvent
 public class ClientMinimisedEvent extends DMDircEvent {
 
 }

src/com/dmdirc/events/ClientOpenedEvent.java

@@ -22,11 +22,8 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.util.AsyncEvent;
-
 /**
  * Fired when the client is first opened.
  */
-@AsyncEvent
 public class ClientOpenedEvent extends DMDircEvent {
 }

src/com/dmdirc/events/ClientPopupGeneratedEvent.java

@@ -25,12 +25,10 @@ package com.dmdirc.events;
 import com.dmdirc.commandparser.PopupMenu;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Raised when a popup is being generated.
  */
-@AsyncEvent
 public class ClientPopupGeneratedEvent extends DMDircEvent {
 
     private final PopupType type;

src/com/dmdirc/events/ClientPrefsClosedEvent.java

@@ -22,12 +22,9 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.util.AsyncEvent;
-
 /**
  * Raised when the preferences dialog is closed.
  */
-@AsyncEvent
 public class ClientPrefsClosedEvent extends PreferencesEvent {
 
 }

src/com/dmdirc/events/ClientPrefsOpenedEvent.java

@@ -23,12 +23,10 @@
 package com.dmdirc.events;
 
 import com.dmdirc.config.prefs.PreferencesDialogModel;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Raised when the preferences dialog is opened.
  */
-@AsyncEvent
 public class ClientPrefsOpenedEvent extends PreferencesEvent {
 
     private final PreferencesDialogModel model;

src/com/dmdirc/events/ClientUnminimisedEvent.java

@@ -22,14 +22,11 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.util.AsyncEvent;
-
 /**
  * Fired when the the client is unminimised.
  *
  * TODO: This should be moved into the Swing UI once the corresponding action types are removed.
  */
-@AsyncEvent
 public class ClientUnminimisedEvent extends DMDircEvent {
 
 }

src/com/dmdirc/events/ClientUserInputEvent.java

@@ -23,12 +23,10 @@
 package com.dmdirc.events;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Event fired when some input has been entered into the client.
  */
-@AsyncEvent
 public class ClientUserInputEvent extends DMDircEvent {
 
     private final FrameContainer container;

src/com/dmdirc/events/EventUtils.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc.events;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 /**
  * Utilities for interacting with events.
@@ -42,11 +42,11 @@ public final class EventUtils {
      * @return The event's display format after it has been posted on the event bus.
      */
     public static String postDisplayable(
-            final EventBus eventBus,
+            final MBassador eventBus,
             final DisplayableEvent event,
             final String displayFormat) {
         event.setDisplayFormat(displayFormat);
-        eventBus.post(event);
+        eventBus.publish(event);
         return event.getDisplayFormat();
     }
 

src/com/dmdirc/events/FeedbackNagEvent.java

@@ -22,12 +22,9 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.util.AsyncEvent;
-
 /**
  * Fired when its time to nag for feedback.
  */
-@AsyncEvent
 public class FeedbackNagEvent extends DMDircEvent {
 
 }

src/com/dmdirc/events/FrameChangedEvent.java

@@ -23,12 +23,10 @@
 package com.dmdirc.events;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Base class for all frame info events.
  */
-@AsyncEvent
 public class FrameChangedEvent extends DMDircEvent {
 
     private final FrameContainer container;

src/com/dmdirc/events/FrameIconChangedEvent.java

@@ -23,12 +23,10 @@
 package com.dmdirc.events;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Fired when a frame icon changes.
  */
-@AsyncEvent
 public class FrameIconChangedEvent extends FrameChangedEvent {
 
     private final String icon;

src/com/dmdirc/events/FrameNameChangedEvent.java

@@ -23,12 +23,10 @@
 package com.dmdirc.events;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Fired when a frame's name changes.
  */
-@AsyncEvent
 public class FrameNameChangedEvent extends FrameChangedEvent {
 
     private final String name;

src/com/dmdirc/events/FrameTitleChangedEvent.java

@@ -23,12 +23,10 @@
 package com.dmdirc.events;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Fired when a frame title changes.
  */
-@AsyncEvent
 public class FrameTitleChangedEvent extends FrameChangedEvent {
 
     private final String title;

src/com/dmdirc/events/LinkChannelClickedEvent.java

@@ -23,12 +23,10 @@
 package com.dmdirc.events;
 
 import com.dmdirc.interfaces.ui.Window;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Raised when a channel link has been clicked.
  */
-@AsyncEvent
 public class LinkChannelClickedEvent extends LinkEvent {
 
     public LinkChannelClickedEvent(final Window window, final String target) {

src/com/dmdirc/events/LinkNicknameClickedEvent.java

@@ -23,12 +23,10 @@
 package com.dmdirc.events;
 
 import com.dmdirc.interfaces.ui.Window;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Raised when a nickname link has been clicked.
  */
-@AsyncEvent
 public class LinkNicknameClickedEvent extends LinkEvent {
 
     public LinkNicknameClickedEvent(final Window window, final String target) {

src/com/dmdirc/events/LinkUrlClickedEvent.java

@@ -23,12 +23,10 @@
 package com.dmdirc.events;
 
 import com.dmdirc.interfaces.ui.Window;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Raised when a URL link has been clicked.
  */
-@AsyncEvent
 public class LinkUrlClickedEvent extends LinkEvent {
 
     public LinkUrlClickedEvent(final Window window, final String target) {

src/com/dmdirc/events/PluginLoadedEvent.java

@@ -23,12 +23,10 @@
 package com.dmdirc.events;
 
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Fired when a plugin is loaded.
  */
-@AsyncEvent
 public class PluginLoadedEvent extends PluginEvent {
 
     public PluginLoadedEvent(final PluginInfo plugin) {

src/com/dmdirc/events/PluginRefreshEvent.java

@@ -22,12 +22,9 @@
 
 package com.dmdirc.events;
 
-import com.dmdirc.util.AsyncEvent;
-
 /**
  * Fired when the list of available plugins may have updated.
  */
-@AsyncEvent
 public class PluginRefreshEvent extends DMDircEvent {
 
 }

src/com/dmdirc/events/PluginUnloadedEvent.java

@@ -23,12 +23,10 @@
 package com.dmdirc.events;
 
 import com.dmdirc.plugins.PluginInfo;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Fired when a plugin is loaded.
  */
-@AsyncEvent
 public class PluginUnloadedEvent extends PluginEvent {
 
     public PluginUnloadedEvent(final PluginInfo plugin) {

src/com/dmdirc/events/QueryClosedEvent.java

@@ -23,12 +23,10 @@
 package com.dmdirc.events;
 
 import com.dmdirc.Query;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Fired when a query window is closed.
  */
-@AsyncEvent
 public class QueryClosedEvent extends QueryEvent {
 
     public QueryClosedEvent(final long timestamp, final Query query) {

src/com/dmdirc/events/ServerGotpingEvent.java

@@ -23,12 +23,10 @@
 package com.dmdirc.events;
 
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Fired when we receive a server ping reply.
  */
-@AsyncEvent
 public class ServerGotpingEvent extends ServerEvent {
 
     private final long ping;

src/com/dmdirc/events/ServerNopingEvent.java

@@ -23,12 +23,10 @@
 package com.dmdirc.events;
 
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Fired when we miss a server ping reply.
  */
-@AsyncEvent
 public class ServerNopingEvent extends ServerEvent {
 
     private final long ping;

src/com/dmdirc/events/ServerPingsentEvent.java

@@ -23,12 +23,10 @@
 package com.dmdirc.events;
 
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Fired when sending a server ping request.
  */
-@AsyncEvent
 public class ServerPingsentEvent extends ServerEvent {
 
     public ServerPingsentEvent(final long timestamp, final Connection connection) {

src/com/dmdirc/events/UserErrorEvent.java

@@ -23,12 +23,10 @@
 package com.dmdirc.events;
 
 import com.dmdirc.logger.ErrorLevel;
-import com.dmdirc.util.AsyncEvent;
 
 /**
  * Event class for user errors.
  */
-@AsyncEvent
 public class UserErrorEvent extends ErrorEvent {
 
     public UserErrorEvent(final ErrorLevel level, final Throwable throwable, final String message,

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 com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import java.util.List;
 
@@ -60,7 +60,7 @@ public interface GroupChat extends Chat {
      *
      * @return An event bus scoped to this channel.
      */
-    EventBus getEventBus();
+    MBassador getEventBus();
 
     /**
      * Retrieves the maximum length that a topic on this channel can be.

src/com/dmdirc/logger/ErrorManager.java

@@ -29,9 +29,6 @@ import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.ui.FatalErrorDialog;
 import com.dmdirc.util.collections.ListenerList;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import java.awt.GraphicsEnvironment;
 import java.util.Date;
 import java.util.LinkedList;
@@ -40,6 +37,8 @@ import java.util.concurrent.BlockingQueue;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.atomic.AtomicLong;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
 import net.kencochrane.raven.DefaultRavenFactory;
 import net.kencochrane.raven.RavenFactory;
 
@@ -89,8 +88,8 @@ 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 EventBus eventBus) {
-        eventBus.register(this);
+            final MBassador eventBus) {
+        eventBus.subscribe(this);
         RavenFactory.registerFactory(new DefaultRavenFactory());
 
         config = globalConfig;
@@ -134,13 +133,13 @@ public class ErrorManager implements ConfigChangeListener {
         me = errorManager;
     }
 
-    @Subscribe
+    @Handler
     public void handleAppErrorEvent(final AppErrorEvent appError) {
         addError(appError.getLevel(), appError.getMessage(), appError.getThrowable(),
                 appError.getDetails(), true, isValidError(appError.getThrowable()));
     }
 
-    @Subscribe
+    @Handler
     public void handleUserErrorEvent(final UserErrorEvent userError) {
         addError(userError.getLevel(), userError.getMessage(), userError.getThrowable(),
                 userError.getDetails(), false, isValidError(userError.getThrowable()));

src/com/dmdirc/plugins/CorePluginExtractor.java

@@ -28,8 +28,6 @@ import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.util.resourcemanager.ResourceManager;
 
-import com.google.common.eventbus.EventBus;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.Map;
@@ -37,6 +35,8 @@ import java.util.Map;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * 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 EventBus eventBus;
+    private final MBassador 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 EventBus eventBus) {
+            final MBassador eventBus) {
         this.pluginManager = pluginManager;
         this.pluginDir = pluginDir;
         this.eventBus = eventBus;
@@ -107,7 +107,7 @@ public class CorePluginExtractor {
                     }
                 }
             } catch (IOException ex) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
+                eventBus.publish(new UserErrorEvent(ErrorLevel.LOW, ex,
                         "Failed to extract plugins", ""));
             }
         }

src/com/dmdirc/plugins/LegacyServiceLocator.java

@@ -25,8 +25,6 @@ package com.dmdirc.plugins;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 
-import com.google.common.eventbus.EventBus;
-
 import java.lang.reflect.Method;
 import java.util.Collection;
 import java.util.HashSet;
@@ -35,6 +33,8 @@ import javax.annotation.Nullable;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import net.engio.mbassy.bus.MBassador;
+
 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 EventBus eventBus;
+    private final MBassador eventBus;
 
     @Inject
-    public LegacyServiceLocator(final PluginManager pluginManager, final EventBus eventBus) {
+    public LegacyServiceLocator(final PluginManager pluginManager, final MBassador eventBus) {
         this.pluginManager = checkNotNull(pluginManager);
         this.eventBus = checkNotNull(eventBus);
     }
@@ -85,7 +85,7 @@ public class LegacyServiceLocator implements ServiceLocator {
                                 services.add((T) object);
                             }
                         } catch (ReflectiveOperationException ex) {
-                            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
+                            eventBus.publish(new UserErrorEvent(ErrorLevel.LOW, ex,
                                     "Unable to execute exported method " + method.getName() +
                                             " in plugin " + pluginInfo.getMetaData().getName(),
                                     ""));

src/com/dmdirc/plugins/PluginInfo.java

@@ -35,8 +35,6 @@ import com.dmdirc.util.SimpleInjector;
 import com.dmdirc.util.resourcemanager.ResourceManager;
 import com.dmdirc.util.validators.ValidationResponse;
 
-import com.google.common.eventbus.EventBus;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
@@ -55,6 +53,7 @@ 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.
@@ -95,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 EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Create a new PluginInfo.
@@ -111,7 +110,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
     public PluginInfo(
             final PluginMetaData metadata,
             final Provider<PluginInjectorInitialiser> injectorInitialiser,
-            final EventBus eventBus,
+            final MBassador eventBus,
             final IdentityController identityController,
             final ObjectGraph objectGraph) throws PluginException {
         this.injectorInitialiser = injectorInitialiser;
@@ -304,14 +303,14 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
                         identityController.addConfigProvider(configProvider);
                         configProviders.add(configProvider);
                     } catch (final InvalidIdentityFileException ex) {
-                        eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
+                        eventBus.publish(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
                                 "Error with identity file '" + name + "' in plugin '"
                                 + metaData.getName() + "'", ""));
                     }
                 }
             }
         } catch (final IOException ioe) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, ioe,
+            eventBus.publish(new UserErrorEvent(ErrorLevel.MEDIUM, ioe,
                     "Error finding identities in plugin '" + metaData.getName() + "'", ""));
         }
     }
@@ -375,7 +374,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
             updateProvides();
             getDefaults();
         } catch (IOException ioe) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, ioe,
+            eventBus.publish(new UserErrorEvent(ErrorLevel.MEDIUM, ioe,
                     "There was an error updating " + metaData.getName(), ""));
         }
     }
@@ -618,7 +617,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
             } catch (LinkageError | Exception e) {
                 lastError = "Error in onLoad for " + metaData.getName() + ":"
                         + e.getMessage();
-                eventBus.post(new AppErrorEvent(ErrorLevel.MEDIUM, e, lastError, ""));
+                eventBus.publishAsync(new AppErrorEvent(ErrorLevel.MEDIUM, e, lastError, ""));
                 unloadPlugin();
             }
         } else {
@@ -636,7 +635,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
 
             if (isLoaded()) {
                 //TODO plugin loading shouldn't be done from here, event bus shouldn't be here.
-                eventBus.post(new PluginLoadedEvent(this));
+                eventBus.publishAsync(new PluginLoadedEvent(this));
             }
 
             isLoading = false;
@@ -746,7 +745,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
                             lastError = "Prerequisites for plugin not met. ('"
                                     + filename + ":" + metaData.getMainClass()
                                     + "' -> '" + prerequisites.getFailureReason() + "') ";
-                            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, null, lastError, ""));
+                            eventBus.publish(new UserErrorEvent(ErrorLevel.LOW, null, lastError, ""));
                         }
                     } else {
                         plugin = (Plugin) temp;
@@ -762,7 +761,7 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
                             } catch (LinkageError | Exception e) {
                                 lastError = "Error in onLoad for "
                                         + metaData.getName() + ":" + e.getMessage();
-                                eventBus.post(new AppErrorEvent(ErrorLevel.MEDIUM,
+                                eventBus.publishAsync(new AppErrorEvent(ErrorLevel.MEDIUM,
                                         e, lastError, ""));
                                 unloadPlugin();
                             }
@@ -774,23 +773,23 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
             lastError = "Class not found ('" + filename + ":" + classname + ":"
                     + classname.equals(metaData.getMainClass()) + "') - "
                     + cnfe.getMessage();
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, cnfe, lastError, ""));
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, cnfe, lastError, ""));
         } catch (NoClassDefFoundError ncdf) {
             lastError = "Unable to instantiate plugin ('" + filename + ":"
                     + classname + ":"
                     + classname.equals(metaData.getMainClass())
                     + "') - Unable to find class: " + ncdf.getMessage();
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ncdf, lastError, ""));
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ncdf, lastError, ""));
         } catch (VerifyError ve) {
             lastError = "Unable to instantiate plugin ('" + filename + ":"
                     + classname + ":"
                     + classname.equals(metaData.getMainClass())
                     + "') - Incompatible: " + ve.getMessage();
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ve, lastError, ""));
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ve, lastError, ""));
         } catch (IllegalArgumentException ex) {
             lastError = "Unable to instantiate class for plugin " + metaData.getName()
                     + ": " + classname;
-            eventBus.post(new AppErrorEvent(ErrorLevel.LOW, ex, lastError, ""));
+            eventBus.publishAsync(new AppErrorEvent(ErrorLevel.LOW, ex, lastError, ""));
         }
     }
 
@@ -852,11 +851,11 @@ public class PluginInfo implements Comparable<PluginInfo>, ServiceProvider {
                 } catch (Exception | LinkageError e) {
                     lastError = "Error in onUnload for " + metaData.getName()
                             + ":" + e + " - " + e.getMessage();
-                    eventBus.post(new AppErrorEvent(ErrorLevel.MEDIUM, e, lastError, ""));
+                    eventBus.publishAsync(new AppErrorEvent(ErrorLevel.MEDIUM, e, lastError, ""));
                 }
 
                 //TODO plugin unloading shouldn't be done from here, event bus shouldn't be here.
-                eventBus.post(new PluginUnloadedEvent(this));
+                eventBus.publishAsync(new PluginUnloadedEvent(this));
                 synchronized (provides) {
                     for (Service service : provides) {
                         service.delProvider(this);

src/com/dmdirc/plugins/PluginInjectorInitialiser.java

@@ -41,7 +41,7 @@ import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.util.SimpleInjector;
 import com.dmdirc.util.URLBuilder;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import javax.inject.Inject;
 
@@ -69,7 +69,7 @@ public class PluginInjectorInitialiser {
     private final URLBuilder urlBuilder;
     private final ColourManager colourManager;
     private final ActionSubstitutorFactory actionSubstitutorFactory;
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     private final IconManager iconManager;
 
     @Inject
@@ -90,7 +90,7 @@ public class PluginInjectorInitialiser {
             final URLBuilder urlBuilder,
             final ColourManager colourManager,
             final ActionSubstitutorFactory actionSubstitutorFactory,
-            final EventBus eventBus,
+            final MBassador eventBus,
             @GlobalConfig final IconManager iconManager) {
         this.actionManager = actionManager;
         this.actionFactory = actionFactory;

src/com/dmdirc/plugins/PluginManager.java

@@ -33,9 +33,6 @@ import com.dmdirc.updater.components.PluginComponent;
 import com.dmdirc.updater.manager.UpdateManager;
 import com.dmdirc.util.collections.MapList;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import java.io.File;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -52,6 +49,8 @@ import java.util.Map;
 import javax.inject.Provider;
 
 import dagger.ObjectGraph;
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
 
 /**
  * Searches for and manages plugins and services.
@@ -77,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 EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of PluginManager.
@@ -90,7 +89,7 @@ public class PluginManager implements ServiceManager {
      * @param directory           The directory to load plugins from.
      */
     public PluginManager(
-            final EventBus eventBus,
+            final MBassador eventBus,
             final IdentityController identityController,
             final UpdateManager updateManager,
             final Provider<PluginInjectorInitialiser> initialiserProvider,
@@ -104,7 +103,7 @@ public class PluginManager implements ServiceManager {
         this.objectGraph = objectGraph;
         this.eventBus = eventBus;
 
-        eventBus.register(this);
+        eventBus.subscribe(this);
     }
 
     /**
@@ -251,7 +250,7 @@ public class PluginManager implements ServiceManager {
         }
 
         if (!new File(directory, filename).exists()) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, null,
+            eventBus.publish(new UserErrorEvent(ErrorLevel.MEDIUM, null,
                     "Error loading plugin " + filename + ": File does not exist", ""));
             return false;
         }
@@ -266,7 +265,7 @@ public class PluginManager implements ServiceManager {
                     identityController, objectGraph);
             final PluginInfo existing = getPluginInfoByName(metadata.getName());
             if (existing != null) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, null,
+                eventBus.publish(new UserErrorEvent(ErrorLevel.MEDIUM, null,
                         "Duplicate Plugin detected, Ignoring. (" + filename
                         + " is the same as " + existing.getFilename() + ")", ""));
                 return false;
@@ -281,13 +280,13 @@ public class PluginManager implements ServiceManager {
 
             knownPlugins.put(filename.toLowerCase(), pluginInfo);
 
-            eventBus.post(new PluginRefreshEvent());
+            eventBus.publishAsync(new PluginRefreshEvent());
             return true;
         } catch (MalformedURLException mue) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, mue,
+            eventBus.publish(new UserErrorEvent(ErrorLevel.MEDIUM, mue,
                     "Error creating URL for plugin " + filename + ": " + mue.getMessage(), ""));
         } catch (PluginException e) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, e,
+            eventBus.publish(new UserErrorEvent(ErrorLevel.MEDIUM, e,
                     "Error loading plugin " + filename + ": " + e.getMessage(), ""));
         }
 
@@ -443,7 +442,7 @@ public class PluginManager implements ServiceManager {
             plugins.addAll(newPlugins);
         }
 
-        eventBus.post(new PluginRefreshEvent());
+        eventBus.publishAsync(new PluginRefreshEvent());
     }
 
     /**
@@ -505,7 +504,7 @@ public class PluginManager implements ServiceManager {
                 targetMetaData.load();
 
                 if (targetMetaData.hasErrors()) {
-                    eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, null,
+                    eventBus.publish(new UserErrorEvent(ErrorLevel.MEDIUM, null,
                             "Error reading plugin metadata for plugin " + target
                             + ": " + targetMetaData.getErrors(), ""));
                 } else {
@@ -524,7 +523,7 @@ public class PluginManager implements ServiceManager {
                     }
                 }
             } catch (MalformedURLException mue) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, mue,
+                eventBus.publish(new UserErrorEvent(ErrorLevel.MEDIUM, mue,
                         "Error creating URL for plugin " + target + ": " + mue.getMessage(), ""));
             }
         }
@@ -537,7 +536,7 @@ public class PluginManager implements ServiceManager {
             if (results.isEmpty()) {
                 res.add(target.getValue());
             } else {
-                eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, null,
+                eventBus.publish(new UserErrorEvent(ErrorLevel.MEDIUM, null,
                         "Plugin validation failed for " + target.getKey() + ": " + results, ""));
             }
         }
@@ -573,7 +572,7 @@ public class PluginManager implements ServiceManager {
         return new ArrayList<>(knownPlugins.values());
     }
 
-    @Subscribe
+    @Handler
     public void handlePrefsOpened(final ClientPrefsOpenedEvent event) {
         for (PluginInfo pi : getPluginInfos()) {
             if (!pi.isLoaded() && !pi.isTempLoaded()) {
@@ -583,7 +582,7 @@ public class PluginManager implements ServiceManager {
                 try {
                     pi.getPlugin().showConfig(event.getModel());
                 } catch (LinkageError | Exception le) {
-                    eventBus.post(new AppErrorEvent(ErrorLevel.MEDIUM, le,
+                    eventBus.publishAsync(new AppErrorEvent(ErrorLevel.MEDIUM, le,
                             "Unable to show plugin configuration for "
                             + pi.getMetaData().getFriendlyName(), ""));
                 }
@@ -591,7 +590,7 @@ public class PluginManager implements ServiceManager {
         }
     }
 
-    @Subscribe
+    @Handler
     public void handlePrefsClosed(final ClientPrefsClosedEvent event) {
         for (PluginInfo pi : getPluginInfos()) {
             if (pi.isTempLoaded()) {

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

@@ -31,8 +31,6 @@ import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.util.CommandUtils;
 
-import com.google.common.eventbus.EventBus;
-
 import java.awt.Desktop;
 import java.io.IOException;
 import java.net.URI;
@@ -42,13 +40,15 @@ 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 EventBus eventBus;
+    private final MBassador eventBus;
     /** Config manager. */
     private final AggregateConfigProvider config;
     /** Server manager to use to connect to servers. */
@@ -68,7 +68,7 @@ public class URLHandler {
      */
     @Inject
     public URLHandler(
-            final EventBus eventBus,
+            final MBassador eventBus,
             final AggregateConfigProvider globalConfig,
             final ServerManager serverManager,
             final StatusBarManager statusBarManager) {
@@ -94,7 +94,7 @@ public class URLHandler {
                 uri = new URI("http://" + sanitisedString);
             }
         } catch (URISyntaxException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
+            eventBus.publish(new UserErrorEvent(ErrorLevel.LOW, ex,
                     "Invalid URL: " + ex.getMessage(), ""));
             return;
         }
@@ -140,7 +140,7 @@ public class URLHandler {
                 uri = new URI("http://" + url.toString());
             }
         } catch (URISyntaxException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
+            eventBus.publish(new UserErrorEvent(ErrorLevel.LOW, ex,
                     "Invalid URL: " + ex.getMessage(), ""));
             return;
         }
@@ -166,7 +166,7 @@ public class URLHandler {
         }
 
         if (!config.hasOptionString("protocol", uri.getScheme().toLowerCase())) {
-            eventBus.post(new UnknownURLEvent(uri));
+            eventBus.publish(new UnknownURLEvent(uri));
             return;
         }
 
@@ -272,7 +272,7 @@ public class URLHandler {
         try {
             Runtime.getRuntime().exec(CommandUtils.parseArguments(command));
         } catch (IOException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
+            eventBus.publish(new UserErrorEvent(ErrorLevel.LOW, ex,
                     "Unable to run application: " + ex.getMessage(), ""));
         }
     }
@@ -287,11 +287,11 @@ public class URLHandler {
             try {
                 desktop.browse(url);
             } catch (IOException ex) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
+                eventBus.publish(new UserErrorEvent(ErrorLevel.LOW, ex,
                         "Unable to open URL: " + ex.getMessage(), ""));
             }
         } else {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, null,
+            eventBus.publish(new UserErrorEvent(ErrorLevel.LOW, null,
                     "Unable to open your browser: Your desktop enviroment is "
                     + "not supported, please go to the URL Handlers section of "
                     + "the preferences dialog and set the path to your browser "
@@ -309,11 +309,11 @@ public class URLHandler {
             try {
                 desktop.mail(url);
             } catch (IOException ex) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
+                eventBus.publish(new UserErrorEvent(ErrorLevel.LOW, ex,
                         "Unable to open URL: " + ex.getMessage(), ""));
             }
         } else {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, null,
+            eventBus.publish(new UserErrorEvent(ErrorLevel.LOW, null,
                     "Unable to open your mail client: Your desktop enviroment is "
                     + "not supported, please go to the URL Handlers section of "
                     + "the preferences dialog and set the path to your browser "

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

@@ -43,8 +43,6 @@ import com.dmdirc.util.collections.ListenerList;
 import com.dmdirc.util.collections.RollingList;
 import com.dmdirc.util.validators.ValidationResponse;
 
-import com.google.common.eventbus.EventBus;
-
 import java.awt.Toolkit;
 import java.awt.event.KeyEvent;
 import java.util.ArrayList;
@@ -55,6 +53,8 @@ import java.util.TimerTask;
 
 import org.slf4j.LoggerFactory;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Handles events generated by a user typing into a textfield. Allows the user to use shortcut keys
  * for control characters (ctrl+b, etc), to tab complete nicknames/channel names/etc, and to scroll
@@ -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 EventBus eventBus;
+    private final MBassador 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 EventBus eventBus) {
+            final MBassador eventBus) {
         buffer = new RollingList<>(parentWindow.getConfigManager()
                 .getOptionInt("ui", "inputbuffersize"), "");
 
@@ -579,7 +579,7 @@ public abstract class InputHandler implements ConfigChangeListener {
     public void enterPressed(final String line) {
         if (!line.isEmpty()) {
             final StringBuffer bufferedLine = new StringBuffer(line);
-            eventBus.post(new ClientUserInputEvent(parentWindow, bufferedLine));
+            eventBus.publishAsync(new ClientUserInputEvent(parentWindow, bufferedLine));
             addToBuffer(bufferedLine.toString());
             commandParser.parseCommand(parentWindow, bufferedLine.toString());
         }

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

@@ -30,12 +30,12 @@ import com.dmdirc.util.io.ConfigFile;
 import com.dmdirc.util.io.InvalidConfigFileException;
 import com.dmdirc.util.resourcemanager.ZipResourceManager;
 
-import com.google.common.eventbus.EventBus;
-
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Represents one theme file.
  */
@@ -46,7 +46,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 EventBus eventBus;
+    private final MBassador eventBus;
     /** The config file containing theme meta-data. */
     private ConfigFile metadata;
     /** The resource manager we're using for this theme. */
@@ -56,7 +56,7 @@ public class Theme implements Comparable<Theme> {
     /** The Identity we've registered. */
     private ThemeIdentity identity;
 
-    public Theme(final EventBus eventBus, final IdentityController identityController,
+    public Theme(final MBassador eventBus, final IdentityController identityController,
             final File file) {
         this.identityController = identityController;
         this.file = file;
@@ -74,7 +74,7 @@ public class Theme implements Comparable<Theme> {
             try {
                 rm = ZipResourceManager.getInstance(file.getCanonicalPath());
             } catch (IOException ex) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
+                eventBus.publish(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
                         "I/O error when loading theme: " + file.getAbsolutePath() + ": "
                                 + ex.getMessage(), ""));
 
@@ -112,7 +112,7 @@ public class Theme implements Comparable<Theme> {
                 identity = new ThemeIdentity(stream, this);
                 identityController.addConfigProvider(identity);
             } catch (InvalidIdentityFileException | IOException ex) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM,
+                eventBus.publish(new UserErrorEvent(ErrorLevel.MEDIUM,
                         ex, "Error loading theme identity file: " + ex.getMessage(), ""));
             }
         }

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

@@ -27,13 +27,13 @@ import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.logger.ErrorLevel;
 
-import com.google.common.eventbus.EventBus;
-
 import java.io.File;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * 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 EventBus eventBus;
+    private final MBassador 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 EventBus eventBus,
+            final MBassador eventBus,
             final IdentityController identityController,
             final String themesDirectory) {
         this.identityController = identityController;
@@ -78,12 +78,13 @@ public class ThemeManager {
         final File dir = new File(themeDirectory);
 
         if (!dir.exists() && !dir.mkdirs()) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.HIGH, null,
+            eventBus.publish(new UserErrorEvent(ErrorLevel.HIGH, null,
                     "Could not create themes directory", ""));
         }
 
         if (dir.listFiles() == null) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, null, "Unable to load themes", ""));
+            eventBus.publish(new UserErrorEvent(ErrorLevel.MEDIUM, null,
+                    "Unable to load themes", ""));
             return;
         }
 

src/com/dmdirc/updater/UpdateChecker.java

@@ -29,13 +29,13 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.updater.manager.CachingUpdateManager;
 import com.dmdirc.updater.manager.UpdateStatus;
 
-import com.google.common.eventbus.EventBus;
-
 import java.util.Date;
 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 +53,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 EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of {@link UpdateChecker}.
@@ -65,7 +65,7 @@ public final class UpdateChecker implements Runnable {
     public UpdateChecker(
             final CachingUpdateManager updateManager,
             final IdentityController identityController,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         this.updateManager = updateManager;
         this.identityController = identityController;
         this.eventBus = eventBus;
@@ -124,7 +124,7 @@ public final class UpdateChecker implements Runnable {
     public static void init(
             final CachingUpdateManager manager,
             final IdentityController controller,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         final int last = controller.getGlobalConfiguration()
                 .getOptionInt(DOMAIN, "lastcheck");
         final int freq = controller.getGlobalConfiguration()
@@ -137,7 +137,7 @@ public final class UpdateChecker implements Runnable {
         }
 
         if (time > freq || time < 0) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, null,
+            eventBus.publish(new UserErrorEvent(ErrorLevel.LOW, null,
                     "Attempted to schedule update check " + (time < 0
                             ? "in the past" : "too far in the future") + ", rescheduling.", ""));
             time = 1;
@@ -164,7 +164,7 @@ public final class UpdateChecker implements Runnable {
     public static void checkNow(
             final CachingUpdateManager updateManager,
             final IdentityController identityController,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         checkNow(updateManager, identityController, eventBus, "Update Checker thread");
     }
 
@@ -179,7 +179,7 @@ public final class UpdateChecker implements Runnable {
     public static void checkNow(
             final CachingUpdateManager updateManager,
             final IdentityController identityController,
-            final EventBus eventBus,
+            final MBassador 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 com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import javax.inject.Singleton;
 
@@ -107,7 +107,7 @@ public class UpdaterModule {
             final CommandLineParser commandLineParser,
             final DMDircUpdateManager updateManager,
             final IdentityController identityController,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         UpdateChecker.init(updateManager, identityController, eventBus);
 
         if (commandLineParser.getLauncherVersion() != null) {

src/com/dmdirc/util/AsyncEvent.java

@@ -1,37 +0,0 @@
-/*
- * 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.util;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Marker interface used to identify an event that should be dispatched asynchronously by a
- * {@link DynamicAsyncEventBus}.
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface AsyncEvent {
-}

src/com/dmdirc/util/ChildEventBusManager.java

@@ -22,25 +22,26 @@
 
 package com.dmdirc.util;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
+import net.engio.mbassy.bus.MBassador;
+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 EventBus} that are slaved to a parent bus.
+ * Utility for creating and managing instances of {@link net.engio.mbassy.bus.MBassador} 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 EventBus parent;
-    private final EventBus child;
+    private final MBassador parent;
+    private final MBassador child;
     private final EventPropagator propagator;
 
-    public ChildEventBusManager(final EventBus parent) {
+    public ChildEventBusManager(final MBassador parent) {
         this.parent = checkNotNull(parent);
-        this.child = new EventBus();
+        this.child = new MBassador(BusConfiguration.Default());
         this.propagator = new EventPropagator();
     }
 
@@ -50,7 +51,7 @@ public class ChildEventBusManager {
      * After this method is called, all events sent to the child bus will be passed to the parent.
      */
     public void connect() {
-        child.register(propagator);
+        child.subscribe(propagator);
     }
 
     /**
@@ -59,7 +60,7 @@ public class ChildEventBusManager {
      * After this method is called, no further events will be passed to the parent.
      */
     public void disconnect() {
-        child.unregister(propagator);
+        child.unsubscribe(propagator);
     }
 
     /**
@@ -67,13 +68,13 @@ public class ChildEventBusManager {
      *
      * @return The child bus belonging to this manager.
      */
-    public EventBus getChildBus() {
+    public MBassador getChildBus() {
         return child;
     }
 
     private class EventPropagator {
 
-        @Subscribe
+        @Handler
         public void handleEvent(final Object object) {
             parent.post(object);
         }

src/com/dmdirc/util/DynamicAsyncEventBus.java

@@ -1,55 +0,0 @@
-/*
- * 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.util;
-
-import com.google.common.eventbus.EventBus;
-
-import java.util.concurrent.Executor;
-
-/**
- * An {@link EventBus} that will dispatch events asynchronously if they annotated with
- * {@link AsyncEvent}.
- */
-public class DynamicAsyncEventBus extends EventBus {
-
-    private final Executor executor;
-
-    public DynamicAsyncEventBus(final Executor executor) {
-        this.executor = executor;
-    }
-
-    @Override
-    public void post(final Object event) {
-        if (event.getClass().isAnnotationPresent(AsyncEvent.class)) {
-            executor.execute(new Runnable() {
-                @Override
-                public void run() {
-                    DynamicAsyncEventBus.super.post(event);
-                }
-            });
-        } else {
-            super.post(event);
-        }
-    }
-
-}

src/com/dmdirc/util/URLBuilder.java

@@ -27,8 +27,6 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.themes.ThemeManager;
 
-import com.google.common.eventbus.EventBus;
-
 import java.net.MalformedURLException;
 import java.net.URL;
 
@@ -36,6 +34,8 @@ 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 +47,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 EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of URLBuilder.
@@ -60,7 +60,7 @@ public class URLBuilder {
     public URLBuilder(
             final Provider<PluginManager> pluginManagerProvider,
             final Provider<ThemeManager> themeManagerProvider,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         this.pluginManagerProvider = pluginManagerProvider;
         this.themeManagerProvider = themeManagerProvider;
         this.eventBus = eventBus;
@@ -79,7 +79,7 @@ public class URLBuilder {
         try {
             return new URL(prefix + path);
         } catch (MalformedURLException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.HIGH, ex, "Unable to build file URL", ""));
+            eventBus.publish(new UserErrorEvent(ErrorLevel.HIGH, ex, "Unable to build file URL", ""));
             return null;
         }
     }
@@ -100,7 +100,7 @@ public class URLBuilder {
             }
             return new URL(url);
         } catch (MalformedURLException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.HIGH, ex, "Unable to build jar URL", ""));
+            eventBus.publish(new UserErrorEvent(ErrorLevel.HIGH, ex, "Unable to build jar URL", ""));
             return null;
         }
     }
@@ -165,7 +165,7 @@ public class URLBuilder {
             final int offset = spec.indexOf(':', 6);
 
             if (offset < 0) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, null,
+                eventBus.publish(new UserErrorEvent(ErrorLevel.LOW, null,
                         "Invalid URL, must contain ':': " + spec, ""));
                 return null;
             } else {
@@ -175,7 +175,7 @@ public class URLBuilder {
             final int offset = spec.indexOf(':', 8);
 
             if (offset < 0) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, null,
+                eventBus.publish(new UserErrorEvent(ErrorLevel.LOW, null,
                         "Invalid URL, must contain ':': " + spec, ""));
                 return null;
             } else {
@@ -185,7 +185,7 @@ public class URLBuilder {
             final int offset = spec.indexOf(':', 8);
 
             if (offset < 0) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, null,
+                eventBus.publish(new UserErrorEvent(ErrorLevel.LOW, null,
                         "Invalid URL, must contain ':': " + spec, ""));
                 return null;
             } else {
@@ -195,7 +195,7 @@ public class URLBuilder {
             try {
                 return new URL(spec);
             } catch (MalformedURLException ex) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
+                eventBus.publish(new UserErrorEvent(ErrorLevel.LOW, ex,
                         "Unable to load resource", ""));
                 return null;
             }

test/com/dmdirc/ServerManagerTest.java

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

test/com/dmdirc/ServerTest.java

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

test/com/dmdirc/WritableFrameContainerTest.java

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

test/com/dmdirc/actions/ActionTest.java

@@ -36,7 +36,7 @@ import com.dmdirc.logger.Logger;
 import com.dmdirc.util.io.ConfigFile;
 import com.dmdirc.util.io.InvalidConfigFileException;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import java.io.IOException;
 import java.nio.file.FileSystem;
@@ -72,7 +72,7 @@ public class ActionTest {
 
     @Rule public final TemporaryFolder folder = new TemporaryFolder();
 
-    @Mock private EventBus eventBus;
+    @Mock private MBassador 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 com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 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 EventBus eventBus;
+    @Mock private MBassador eventBus;
     private TestCommandParser commandParser;
     private TestCommandParser channelCommandParser;
 

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

@@ -29,8 +29,6 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.Service;
 
-import com.google.common.eventbus.EventBus;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -40,6 +38,8 @@ import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
+import net.engio.mbassy.bus.MBassador;
+
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
@@ -52,7 +52,7 @@ import static org.mockito.Mockito.when;
 @RunWith(MockitoJUnitRunner.class)
 public class PreferencesDialogModelTest {
 
-    @Mock private EventBus eventBus;
+    @Mock private MBassador eventBus;
     @Mock private PluginManager pluginManager;
 
     @Before
@@ -171,7 +171,7 @@ public class PreferencesDialogModelTest {
         final PreferencesDialogModel pm = new PreferencesDialogModel(null, null,
                 null, null, cm, null, pluginManager, eventBus);
 
-        verify(eventBus).post(isA(ClientPrefsOpenedEvent.class));
+        verify(eventBus).publishAsync(isA(ClientPrefsOpenedEvent.class));
     }
 
     @Test
@@ -183,7 +183,7 @@ public class PreferencesDialogModelTest {
                 null, null, cm, null, pluginManager, eventBus);
         pm.close();
 
-        verify(eventBus).post(isA(ClientPrefsClosedEvent.class));
+        verify(eventBus).publishAsync(isA(ClientPrefsClosedEvent.class));
     }
 
     @Test

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

@@ -26,34 +26,34 @@ import com.dmdirc.events.ConnectionPrefsRequestedEvent;
 import com.dmdirc.events.GroupChatPrefsRequestedEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
-import com.google.common.eventbus.EventBus;
-
 import org.junit.Test;
 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 EventBus eventBus;
+    @Mock private MBassador eventBus;
     @Mock private AggregateConfigProvider configManager;
 
     @Test
     public void testGettingChannelPrefsRaisesAction() {
         new PreferencesManager(eventBus).getChannelSettings(this.configManager, null);
-        verify(eventBus).post(isA(GroupChatPrefsRequestedEvent.class));
+        verify(eventBus).publish(isA(GroupChatPrefsRequestedEvent.class));
     }
 
     @Test
     public void testGettingServerPrefsRaisesAction() {
         new PreferencesManager(eventBus).getServerSettings(this.configManager, null);
 
-        verify(eventBus).post(isA(GroupChatPrefsRequestedEvent.class));
-        verify(eventBus).post(isA(ConnectionPrefsRequestedEvent.class));
+        verify(eventBus).publish(isA(GroupChatPrefsRequestedEvent.class));
+        verify(eventBus).publish(isA(ConnectionPrefsRequestedEvent.class));
     }
 
 }

test/com/dmdirc/harness/TestCommandParser.java

@@ -31,7 +31,7 @@ import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 public class TestCommandParser extends CommandParser {
 
@@ -48,7 +48,7 @@ public class TestCommandParser extends CommandParser {
     public String invalidCommand;
 
     public TestCommandParser(final AggregateConfigProvider configManager,
-            final CommandController commandManager, final EventBus eventBus) {
+            final CommandController commandManager, final MBassador eventBus) {
         super(configManager, commandManager, eventBus);
     }