MBassador.

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

ivy.xml

@@ -17,6 +17,7 @@
         <dependency org="com.squareup.dagger" name="dagger-compiler" rev="1.2.1" conf="build->default" />
         <dependency org="com.google.code.findbugs" name="jsr305" rev="2.+" conf="main->default" />
         <dependency org="org.slf4j" name="slf4j-api" rev="1.+" conf="main->default" />
+        <dependency org="net.engio" name="mbassador" rev="1.1.10" conf="main->default" />
 
         <!-- Main - ui_swing -->
         <dependency org="com.miglayout" name="miglayout-swing" rev="4.+" conf="main->default" />

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

@@ -31,13 +31,13 @@ import com.dmdirc.interfaces.FrameCloseListener;
 import com.dmdirc.interfaces.NicklistListener;
 import com.dmdirc.parser.interfaces.ChannelClientInfo;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import java.util.Collection;
 
 import javax.inject.Inject;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+
 /**
  * Listens for contact list related events.
  */
@@ -46,7 +46,7 @@ public class ContactListListener implements NicklistListener, FrameCloseListener
     /** The channel this listener is for. */
     private final Channel channel;
     /** Event bus to register listeners with. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new ContactListListener for the specified channel.
@@ -65,7 +65,7 @@ public class ContactListListener implements NicklistListener, FrameCloseListener
     public void addListeners() {
         channel.addNicklistListener(this);
         channel.addCloseListener(this);
-        eventBus.register(this);
+        eventBus.subscribe(this);
     }
 
     /**
@@ -74,7 +74,7 @@ public class ContactListListener implements NicklistListener, FrameCloseListener
     public void removeListeners() {
         channel.removeNicklistListener(this);
         channel.removeCloseListener(this);
-        eventBus.unregister(this);
+        eventBus.unsubscribe(this);
     }
 
     @Override
@@ -102,12 +102,12 @@ public class ContactListListener implements NicklistListener, FrameCloseListener
         // Do nothing
     }
 
-    @Subscribe
+    @Handler
     public void handleUserAway(final ChannelUserAwayEvent event) {
         clientAdded(event.getUser());
     }
 
-    @Subscribe
+    @Handler
     public void handleUserBack(final ChannelUserBackEvent event) {
         clientAdded(event.getUser());
     }

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

@@ -37,7 +37,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;
 
@@ -55,7 +55,7 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
     /** Other Nickname. */
     private final String otherNickname;
     /** Event bus to post events on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of DCCChatWindow with a given DCCChat object.
@@ -83,7 +83,7 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
             final TabCompleterFactory tabCompleterFactory,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         super(parent, title, "dcc-chat-inactive", configManager,
                 new DCCCommandParser(configManager, commandController, eventBus),
                 messageSinkManager,

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

@@ -49,8 +49,6 @@ import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.util.URLBuilder;
 
-import com.google.common.eventbus.EventBus;
-
 import java.awt.Window;
 import java.io.File;
 import java.util.concurrent.Callable;
@@ -59,6 +57,8 @@ import javax.inject.Inject;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * This command allows starting dcc chats/file transfers.
  */
@@ -81,7 +81,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
     /** The URL builder to use when finding icons. */
     private final URLBuilder urlBuilder;
     /** The bus to dispatch events on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of DCCCommand.
@@ -104,7 +104,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
             final WindowManager windowManager,
             final TabCompleterFactory tabCompleterFactory,
             final URLBuilder urlBuilder,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         super(controller);
         this.mainWindow = mainWindow;
         myPlugin = plugin;
@@ -190,7 +190,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
             windowManager.addWindow(myPlugin.getContainer(), window);
             parser.sendCTCP(target, "DCC", "CHAT chat " + DCC.ipToLong(
                     myPlugin.getListenIP(parser)) + " " + chat.getPort());
-            eventBus.post(new DccChatRequestSentEvent(connection, target));
+            eventBus.publish(new DccChatRequestSentEvent(connection, target));
             sendLine(origin, isSilent, "DCCChatStarting", target, chat.getHost(), chat.getPort());
             window.addLine("DCCChatStarting", target, chat.getHost(), chat.getPort());
         } else {
@@ -246,7 +246,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
                         myPlugin.getDomain(), "send.forceturbo"));
                 send.setType(DCCTransfer.TransferType.SEND);
 
-                eventBus.post(new DccSendRequestEvent(connection, target, selectedFile.
+                eventBus.publish(new DccSendRequestEvent(connection, target, selectedFile.
                         getAbsolutePath()));
 
                 sendLine(origin, isSilent, FORMAT_OUTPUT,

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

@@ -27,7 +27,7 @@ import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 /**
  * DCC CommandParser.
@@ -47,7 +47,7 @@ public class DCCCommandParser extends GlobalCommandParser {
     public DCCCommandParser(
             final AggregateConfigProvider configManager,
             final CommandController commandController,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         super(configManager, commandController, eventBus);
     }
 

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

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

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

@@ -53,9 +53,6 @@ import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.util.URLBuilder;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import java.awt.Window;
 import java.io.File;
 import java.io.IOException;
@@ -70,6 +67,9 @@ import javax.inject.Singleton;
 import javax.swing.JFileChooser;
 import javax.swing.JOptionPane;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+
 /**
  * This plugin adds DCC to DMDirc.
  */
@@ -95,7 +95,7 @@ public class DCCManager {
     /** The URL builder to use when finding icons. */
     private final URLBuilder urlBuilder;
     /** The bus to dispatch events on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of this plugin.
@@ -128,7 +128,7 @@ public class DCCManager {
             final SwingWindowFactory windowFactory,
             final ComponentFrameFactory componentFrameFactory,
             final URLBuilder urlBuilder,
-            final EventBus eventBus,
+            final MBassador eventBus,
             final GlobalCommandParser commandParser,
             @Directory(DirectoryType.BASE) final String baseDirectory) {
         this.mainWindow = mainWindow;
@@ -355,7 +355,7 @@ public class DCCManager {
         }
     }
 
-    @Subscribe
+    @Handler
     public void handleServerCtctpEvent(final ServerCtcpEvent event) {
         final boolean autoAccept = config.getOptionBool(getDomain(), "receive.autoaccept");
         final String[] ctcpData = event.getContent().split(" ");
@@ -399,7 +399,7 @@ public class DCCManager {
         if (dontAsk) {
             handleDCCChat(connection.getParser(), nickname, ctcpData);
         } else {
-            eventBus.post(new DccChatRequestEvent(connection, nickname));
+            eventBus.publish(new DccChatRequestEvent(connection, nickname));
             new ChatRequestDialog(mainWindow, this, connection, nickname, ctcpData).display();
         }
     }
@@ -510,7 +510,7 @@ public class DCCManager {
         if (DCCTransfer.findByToken(token) == null && !dontAsk) {
             if (token.isEmpty() || port.equals("0")) {
                 // Make sure this is not a reverse DCC Send that we no longer care about.
-                eventBus.post(new DccSendRequestEvent(connection, nickname, filename));
+                eventBus.publish(new DccSendRequestEvent(connection, nickname, filename));
                 new SendRequestDialog(mainWindow, this, token, ipLong, portInt, filename, size,
                         nickname, connection).display();
             }
@@ -661,7 +661,7 @@ public class DCCManager {
                 "receive.savelocation"));
         if (dir.exists()) {
             if (!dir.isDirectory()) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, null,
+                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, null,
                         "Unable to create download dir (file exists instead)", ""));
             }
         } else {
@@ -669,19 +669,19 @@ public class DCCManager {
                 dir.mkdirs();
                 dir.createNewFile();
             } catch (IOException ex) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, null,
+                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, null,
                         "Unable to create download dir", ""));
             }
         }
 
-        eventBus.register(this);
+        eventBus.subscribe(this);
     }
 
     /**
      * Called when this plugin is Unloaded.
      */
     public synchronized void onUnload() {
-        eventBus.unregister(this);
+        eventBus.unsubscribe(this);
         if (container != null) {
             container.close();
         }

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

@@ -28,7 +28,7 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.util.URLBuilder;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import java.awt.Dialog.ModalityType;
 import java.awt.Window;
@@ -58,7 +58,7 @@ public class PlaceholderContainer extends FrameContainer {
             final AggregateConfigProvider config,
             final Window parentWindow,
             final URLBuilder urlBuilder,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         super(null, "dcc", "DCCs", "DCCs", config, urlBuilder, eventBus,
                 Arrays.asList("com.dmdirc.addons.dcc.ui.PlaceholderPanel"));
         this.plugin = plugin;

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

@@ -35,8 +35,6 @@ import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.SocketCloseListener;
 import com.dmdirc.util.URLBuilder;
 
-import com.google.common.eventbus.EventBus;
-
 import java.awt.Desktop;
 import java.io.File;
 import java.util.Arrays;
@@ -44,6 +42,8 @@ import java.util.Date;
 
 import javax.swing.JOptionPane;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * This class links DCC Send objects to a window.
  */
@@ -74,7 +74,7 @@ public class TransferContainer extends FrameContainer implements
     private final boolean showOpen = Desktop.isDesktopSupported()
             && Desktop.getDesktop().isSupported(Desktop.Action.OPEN);
     /** Event bus to post events on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of DCCTransferWindow with a given DCCTransfer object.
@@ -91,7 +91,7 @@ public class TransferContainer extends FrameContainer implements
     public TransferContainer(final DCCManager plugin, final DCCTransfer dcc,
             final AggregateConfigProvider config, final String title,
             final String targetNick, final Connection connection,
-            final URLBuilder urlBuilder, final EventBus eventBus) {
+            final URLBuilder urlBuilder, final MBassador eventBus) {
         super(plugin.getContainer(), dcc.getType() == DCCTransfer.TransferType.SEND
                 ? "dcc-send-inactive" : "dcc-receive-inactive",
                 title, title, config, urlBuilder, eventBus,
@@ -172,7 +172,7 @@ public class TransferContainer extends FrameContainer implements
             setTitle(title.toString());
         }
 
-        eventBus.post(new DccSendDatatransferedEvent(this, bytes));
+        eventBus.publish(new DccSendDatatransferedEvent(this, bytes));
     }
 
     /**
@@ -265,7 +265,7 @@ public class TransferContainer extends FrameContainer implements
      */
     @Override
     public void socketClosed(final DCCTransfer dcc) {
-        eventBus.post(new DccSendSocketclosedEvent(this));
+        eventBus.publish(new DccSendSocketclosedEvent(this));
         if (!windowClosing) {
             synchronized (this) {
                 if (transferCount == dcc.getFileSize() - dcc.getFileStart()) {
@@ -286,7 +286,7 @@ public class TransferContainer extends FrameContainer implements
      */
     @Override
     public void socketOpened(final DCCTransfer dcc) {
-        eventBus.post(new DccSendSocketopenedEvent(this));
+        eventBus.publish(new DccSendSocketopenedEvent(this));
         timeStarted = System.currentTimeMillis();
         setIcon(dcc.getType() == DCCTransfer.TransferType.SEND
                 ? "dcc-send-active" : "dcc-receive-active");

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

@@ -33,8 +33,6 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.SocketCloseListener;
 
-import com.google.common.eventbus.EventBus;
-
 import java.awt.Desktop;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -49,6 +47,8 @@ import javax.swing.JProgressBar;
 
 import net.miginfocom.swing.MigLayout;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * A panel for displaying the progress of DCC transfers.
  *
@@ -78,7 +78,7 @@ public class TransferPanel extends JPanel implements ActionListener,
     /** The transfer that this window is showing. */
     private final DCCTransfer dcc;
     /** The event bus to post errors. */
-    private final EventBus errorBus;
+    private final MBassador errorBus;
 
     /**
      * Creates a new transfer window for the specified UI controller and owner.
@@ -86,7 +86,7 @@ public class TransferPanel extends JPanel implements ActionListener,
      * @param owner    The frame container that owns this frame
      * @param errorBus The event bus to post errors to
      */
-    public TransferPanel(final FrameContainer owner, final EventBus errorBus) {
+    public TransferPanel(final FrameContainer owner, final MBassador errorBus) {
         this.transferContainer = (TransferContainer) owner;
         this.errorBus = errorBus;
         dcc = transferContainer.getDCC();
@@ -150,18 +150,18 @@ public class TransferPanel extends JPanel implements ActionListener,
             try {
                 Desktop.getDesktop().open(file);
             } catch (IllegalArgumentException ex) {
-                errorBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
+                errorBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
                         "Unable to open file: " + file, ""));
                 openButton.setEnabled(false);
             } catch (IOException ex) {
                 try {
                     Desktop.getDesktop().open(file.getParentFile());
                 } catch (IllegalArgumentException ex1) {
-                    errorBus.post(new UserErrorEvent(ErrorLevel.LOW, ex1, "Unable to open folder: "
+                    errorBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex1, "Unable to open folder: "
                             + file.getParentFile(), ""));
                     openButton.setEnabled(false);
                 } catch (IOException ex1) {
-                    errorBus.post(new UserErrorEvent(ErrorLevel.LOW, ex1,
+                    errorBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex1,
                             "No associated handler to open file or directory.", ""));
                     openButton.setEnabled(false);
                 }

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

@@ -37,14 +37,14 @@ import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.URLBuilder;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import java.lang.reflect.Method;
 
 import javax.inject.Inject;
 import javax.inject.Provider;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+
 /**
  * Displays events passed on an event bus.
  */
@@ -53,7 +53,7 @@ public class EventBusViewer extends DebugCommand {
     private final URLBuilder urlBuilder;
     private final AggregateConfigProvider globalConfig;
     private final WindowManager windowManager;
-    private final EventBus globalEventBus;
+    private final MBassador globalEventBus;
 
     /**
      * Creates a new instance of the command.
@@ -70,7 +70,7 @@ public class EventBusViewer extends DebugCommand {
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final URLBuilder urlBuilder,
             final WindowManager windowManager,
-            final EventBus globalEventBus) {
+            final MBassador globalEventBus) {
         super(commandProvider);
         this.globalConfig = globalConfig;
         this.urlBuilder = urlBuilder;
@@ -105,9 +105,9 @@ public class EventBusViewer extends DebugCommand {
             windowManager.addWindow(origin, window);
         }
 
-        final EventBus eventBus = isGlobal ? globalEventBus : origin.getEventBus();
+        final MBassador eventBus = isGlobal ? globalEventBus : origin.getEventBus();
         final WindowUpdater updater = new WindowUpdater(eventBus, window);
-        eventBus.register(updater);
+        eventBus.subscribe(updater);
         window.addCloseListener(updater);
     }
 
@@ -116,15 +116,15 @@ public class EventBusViewer extends DebugCommand {
      */
     private static class WindowUpdater implements FrameCloseListener {
 
-        private final EventBus eventBus;
+        private final MBassador eventBus;
         private final FrameContainer target;
 
-        WindowUpdater(final EventBus eventBus, final FrameContainer target) {
+        WindowUpdater(final MBassador eventBus, final FrameContainer target) {
             this.eventBus = eventBus;
             this.target = target;
         }
 
-        @Subscribe
+        @Handler
         public void handleEvent(final DMDircEvent event) {
             if (event instanceof ClientLineAddedEvent
                     && ((ClientLineAddedEvent) event).getFrameContainer() == target) {
@@ -158,7 +158,7 @@ public class EventBusViewer extends DebugCommand {
 
         @Override
         public void windowClosing(final FrameContainer window) {
-            eventBus.unregister(this);
+            eventBus.unsubscribe(this);
         }
 
     }

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

@@ -33,18 +33,18 @@ import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
-import com.google.common.eventbus.EventBus;
-
 import javax.inject.Inject;
 import javax.inject.Provider;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Creates DMDirc errors with the specified parameters.
  */
 public class FakeError extends DebugCommand implements IntelligentCommand {
 
     /** The event bus to post errors on . */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of the command.
@@ -53,7 +53,7 @@ public class FakeError extends DebugCommand implements IntelligentCommand {
      * @param eventBus        The event bus to post errors on
      */
     @Inject
-    public FakeError(final Provider<Debug> commandProvider, final EventBus eventBus) {
+    public FakeError(final Provider<Debug> commandProvider, final MBassador eventBus) {
         super(commandProvider);
         this.eventBus = eventBus;
     }
@@ -75,12 +75,12 @@ public class FakeError extends DebugCommand implements IntelligentCommand {
         if ((args.getArguments().length == 1
                 || args.getArguments().length == 2)
                 && args.getArguments()[0].equals("user")) {
-            eventBus.post(new UserErrorEvent(getLevel(args.getArguments()),
+            eventBus.publishAsync(new UserErrorEvent(getLevel(args.getArguments()),
                     null, "Debug error message", ""));
         } else if ((args.getArguments().length == 1
                 || args.getArguments().length == 2)
                 && args.getArguments()[0].equals("app")) {
-            eventBus.post(new AppErrorEvent(getLevel(args.getArguments()),
+            eventBus.publishAsync(new AppErrorEvent(getLevel(args.getArguments()),
                     new IllegalArgumentException(), "Debug error message", ""));
         } else {
             showUsage(origin, args.isSilent(), getName(), getUsage());

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

@@ -29,18 +29,18 @@ import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.events.FirstRunEvent;
 
-import com.google.common.eventbus.EventBus;
-
 import javax.inject.Inject;
 import javax.inject.Provider;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Opens the DMDirc first run wizard.
  */
 public class FirstRun extends DebugCommand {
 
     /** Event bus to trigger first run event on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of the command.
@@ -49,7 +49,7 @@ public class FirstRun extends DebugCommand {
      * @param eventBus        Event bus to trigger first run event on.
      */
     @Inject
-    public FirstRun(final Provider<Debug> commandProvider, final EventBus eventBus) {
+    public FirstRun(final Provider<Debug> commandProvider, final MBassador eventBus) {
         super(commandProvider);
 
         this.eventBus = eventBus;
@@ -68,7 +68,7 @@ public class FirstRun extends DebugCommand {
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        eventBus.post(new FirstRunEvent());
+        eventBus.publish(new FirstRunEvent());
     }
 
 }

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

@@ -34,7 +34,7 @@ import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.manager.CachingUpdateManager;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import javax.inject.Inject;
 import javax.inject.Provider;
@@ -51,7 +51,7 @@ public class ForceUpdate extends DebugCommand {
     /** The update manager to use when forcing an update. */
     private final CachingUpdateManager updateManager;
     /** The event bus to post errors to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of the command.
@@ -68,7 +68,7 @@ public class ForceUpdate extends DebugCommand {
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final IdentityController identityController,
             final CachingUpdateManager updateManager,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         super(commandProvider);
 
         this.globalConfig = globalConfig;

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

@@ -34,8 +34,6 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.util.CommandUtils;
 import com.dmdirc.util.io.StreamReader;
 
-import com.google.common.eventbus.EventBus;
-
 import java.io.File;
 import java.io.IOException;
 import java.util.LinkedList;
@@ -43,6 +41,8 @@ import java.util.List;
 
 import javax.inject.Inject;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * A command which allows users execute scripts.
  */
@@ -53,7 +53,7 @@ public class ExecCommand extends Command {
             "exec <command> [<parameters>] - executes an external program "
             + "and displays the output", CommandType.TYPE_GLOBAL);
     /** Event bus to post errors to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of this command.
@@ -62,7 +62,7 @@ public class ExecCommand extends Command {
      * @param eventBus   The event bus to post errors to
      */
     @Inject
-    public ExecCommand(final CommandController controller, final EventBus eventBus) {
+    public ExecCommand(final CommandController controller, final MBassador eventBus) {
         super(controller);
         this.eventBus = eventBus;
     }
@@ -105,7 +105,7 @@ public class ExecCommand extends Command {
                 }
             }
         } catch (IOException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex, "Unable to run application: "
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex, "Unable to run application: "
                     + ex.getMessage(), ""));
         }
     }

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

@@ -35,7 +35,6 @@ import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.io.StreamReader;
 
 import com.google.common.base.Strings;
-import com.google.common.eventbus.EventBus;
 import com.google.common.html.HtmlEscapers;
 
 import java.io.IOException;
@@ -43,6 +42,8 @@ import java.io.IOException;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import net.engio.mbassy.bus.MBassador;
+
 @Singleton
 public class FDManager implements ConfigChangeListener {
 
@@ -55,7 +56,7 @@ public class FDManager implements ConfigChangeListener {
     /** Plugin files helper. */
     private final PluginFilesHelper filesHelper;
     /** The event bus to post errors to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     /** notification timeout. */
     private int timeout;
     /** notification icon. */
@@ -71,7 +72,7 @@ public class FDManager implements ConfigChangeListener {
             @UserConfig final ConfigProvider userConfig,
             @PluginDomain(FreeDesktopNotificationsPlugin.class) final String domain,
             final PluginFilesHelper filesHelper,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         this.domain = domain;
         this.config = config;
         this.userConfig = userConfig;
@@ -162,7 +163,7 @@ public class FDManager implements ConfigChangeListener {
             filesHelper.extractResourcesEndingWith(".py");
             filesHelper.extractResourcesEndingWith(".png");
         } catch (IOException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
                     "Unable to extract files for Free desktop notifications: " + ex.getMessage(),
                     ""));
         }

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

@@ -29,21 +29,21 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.util.io.StreamUtils;
 
-import com.google.common.eventbus.EventBus;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.net.Socket;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * The IdentClient responds to an ident request.
  */
 public class IdentClient implements Runnable {
 
     /** The event bus to post errors on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     /** The IdentdServer that owns this Client. */
     private final IdentdServer server;
     /** The Socket that we are in charge of. */
@@ -67,7 +67,7 @@ public class IdentClient implements Runnable {
      * @param config        Global config to read settings from
      * @param domain        This plugin's settings domain
      */
-    public IdentClient(final EventBus eventBus, final IdentdServer server, final Socket socket,
+    public IdentClient(final MBassador eventBus, final IdentdServer server, final Socket socket,
             final ServerManager serverManager, final AggregateConfigProvider config,
             final String domain) {
         this.eventBus = eventBus;
@@ -103,7 +103,7 @@ public class IdentClient implements Runnable {
             }
         } catch (IOException e) {
             if (thisThread == thread) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.HIGH, e,
+                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.HIGH, e,
                         "ClientSocket Error: " + e.getMessage(), ""));
             }
         } finally {

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

@@ -30,14 +30,14 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 
-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;
+
 public class IdentdManager {
 
     /** List of all the connections that need ident replies. */
@@ -49,12 +49,12 @@ public class IdentdManager {
     /** Ident server. */
     private final IdentdServer server;
     /** Event bus to subscribe to events on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     @Inject
     public IdentdManager(@GlobalConfig final AggregateConfigProvider config,
             @PluginDomain(IdentdPlugin.class) final String domain,
-            final IdentdServer server, final EventBus eventBus) {
+            final IdentdServer server, final MBassador eventBus) {
         connections = new ArrayList<>();
         this.config = config;
         this.domain = domain;
@@ -67,7 +67,7 @@ public class IdentdManager {
      */
     public void onLoad() {
         // Add action hooks
-        eventBus.register(this);
+        eventBus.subscribe(this);
 
         if (config.getOptionBool(domain, "advanced.alwaysOn")) {
             server.startServer();
@@ -78,12 +78,12 @@ public class IdentdManager {
      * Called when this plugin is unloaded.
      */
     public void onUnload() {
-        eventBus.unregister(this);
+        eventBus.unsubscribe(this);
         server.stopServer();
         connections.clear();
     }
 
-    @Subscribe
+    @Handler
     public void handleServerConnecting(final ServerConnectingEvent event) {
         synchronized (connections) {
                 if (connections.isEmpty()) {
@@ -93,12 +93,12 @@ public class IdentdManager {
             }
     }
 
-    @Subscribe
+    @Handler
     public void handleServerConnected(final ServerConnectedEvent event) {
         handleServerRemoved(event.getConnection());
     }
 
-    @Subscribe
+    @Handler
     public void handleServerConnectError(final ServerConnectErrorEvent event) {
         handleServerRemoved(event.getConnection());
     }

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

@@ -29,8 +29,6 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.plugins.PluginDomain;
 
-import com.google.common.eventbus.EventBus;
-
 import java.io.IOException;
 import java.net.ServerSocket;
 import java.net.Socket;
@@ -39,13 +37,15 @@ import java.util.List;
 
 import javax.inject.Inject;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * The IdentdServer watches over the ident port when required
  */
 public final class IdentdServer implements Runnable {
 
     /** The event bus to post errors on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     /** The Thread in use for this server */
     private volatile Thread myThread = null;
     /** The current socket in use for this server */
@@ -70,7 +70,7 @@ public final class IdentdServer implements Runnable {
      * @param domain        This plugin's setting domain
      */
     @Inject
-    public IdentdServer(final EventBus eventBus,
+    public IdentdServer(final MBassador eventBus,
             final ServerManager serverManager,
             @GlobalConfig final AggregateConfigProvider config,
             @PluginDomain(IdentdPlugin.class) final String domain) {
@@ -95,7 +95,7 @@ public final class IdentdServer implements Runnable {
                 addClient(client);
             } catch (IOException e) {
                 if (myThread == thisThread) {
-                    eventBus.post(new UserErrorEvent(ErrorLevel.HIGH, e,
+                    eventBus.publishAsync(new UserErrorEvent(ErrorLevel.HIGH, e,
                             "Accepting client failed: " + e.getMessage(), ""));
                 }
             }
@@ -149,7 +149,7 @@ public final class IdentdServer implements Runnable {
                 myThread = new Thread(this);
                 myThread.start();
             } catch (IOException e) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.HIGH, e,
+                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.HIGH, e,
                         "Unable to start identd server: " + e.getMessage(), ""));
                 if (e.getMessage().equals("Permission denied")) {
                     failed = true;

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

@@ -41,9 +41,6 @@ import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.util.collections.RollingList;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -53,6 +50,9 @@ import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+
 /**
  * Manages the lifecycle of the lag display plugin.
  */
@@ -60,7 +60,7 @@ import javax.inject.Singleton;
 public class LagDisplayManager implements ConfigChangeListener, SelectionListener {
 
     /** Event bus to receive events on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     /** Active frame manager. */
     private final ActiveFrameManager activeFrameManager;
     /** Status bar to add panels to. */
@@ -85,7 +85,7 @@ public class LagDisplayManager implements ConfigChangeListener, SelectionListene
 
     @Inject
     public LagDisplayManager(
-            final EventBus eventBus,
+            final MBassador eventBus,
             final ActiveFrameManager activeFrameManager,
             final SwingStatusBar statusBar,
             final Provider<LagDisplayPanel> panelProvider,
@@ -105,14 +105,14 @@ public class LagDisplayManager implements ConfigChangeListener, SelectionListene
         activeFrameManager.addSelectionListener(this);
         globalConfig.addChangeListener(domain, this);
         readConfig();
-        eventBus.register(this);
+        eventBus.subscribe(this);
     }
 
     public void unload() {
         statusBar.removeComponent(panel);
         activeFrameManager.removeSelectionListener(this);
         globalConfig.removeListener(this);
-        eventBus.unregister(this);
+        eventBus.unsubscribe(this);
         panel = null;
     }
 
@@ -170,7 +170,7 @@ public class LagDisplayManager implements ConfigChangeListener, SelectionListene
         panel.refreshDialog();
     }
 
-    @Subscribe
+    @Handler
     public void handleServerNumeric(final ServerNumericEvent event) {
         if (event.getNumeric() != 421) {
             return;
@@ -201,7 +201,7 @@ public class LagDisplayManager implements ConfigChangeListener, SelectionListene
         }
     }
 
-    @Subscribe
+    @Handler
     public void handleServerDisconnected(final ServerDisconnectedEvent event) {
         final TextFrame activeFrame = activeFrameManager.getActiveFrame();
         final FrameContainer active = activeFrame == null ? null : activeFrame.getContainer();
@@ -215,7 +215,7 @@ public class LagDisplayManager implements ConfigChangeListener, SelectionListene
             panel.refreshDialog();
     }
 
-    @Subscribe
+    @Handler
     public void handleServerGotPing(final ServerGotpingEvent event) {
         if (event.getConnection().getWindowModel().getConfigManager().
                 getOptionBool(domain, "usealternate")) {
@@ -237,7 +237,7 @@ public class LagDisplayManager implements ConfigChangeListener, SelectionListene
         panel.refreshDialog();
     }
 
-    @Subscribe
+    @Handler
     public void handleServerNoPing(final ServerNopingEvent event) {
         if (event.getConnection().getWindowModel().getConfigManager().
                 getOptionBool(domain, "usealternate")) {
@@ -258,7 +258,7 @@ public class LagDisplayManager implements ConfigChangeListener, SelectionListene
         panel.refreshDialog();
     }
 
-    @Subscribe
+    @Handler
     public void HandleServerPingSent(final ServerPingsentEvent event) {
         if (!event.getConnection().getWindowModel().getConfigManager().
                 getOptionBool(domain, "usealternate")) {

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

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

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

@@ -44,7 +44,6 @@ import com.dmdirc.events.ChannelTopicChangeEvent;
 import com.dmdirc.events.QueryClosedEvent;
 import com.dmdirc.events.QueryOpenedEvent;
 import com.dmdirc.events.UserErrorEvent;
-import com.dmdirc.interfaces.ActionController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
@@ -60,9 +59,6 @@ import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.io.ReverseFileReader;
 import com.dmdirc.util.io.StreamUtils;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import java.awt.Color;
 import java.io.BufferedWriter;
 import java.io.File;
@@ -87,6 +83,9 @@ import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+
 /**
  * Manages logging activities.
  */
@@ -106,7 +105,7 @@ public class LoggingManager implements ConfigChangeListener {
     private final Map<String, OpenFile> openFiles = Collections.synchronizedMap(
             new HashMap<String, OpenFile>());
     private final URLBuilder urlBuilder;
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     private final Provider<String> directoryProvider;
     /** Timer used to close idle files. */
     private Timer idleFileTimer;
@@ -130,7 +129,7 @@ public class LoggingManager implements ConfigChangeListener {
     @Inject
     public LoggingManager(@PluginDomain(LoggingPlugin.class) final String domain,
             @GlobalConfig final AggregateConfigProvider globalConfig,
-            final WindowManager windowManager, final URLBuilder urlBuilder, final EventBus eventBus,
+            final WindowManager windowManager, final URLBuilder urlBuilder, final MBassador eventBus,
             @Directory(LoggingModule.LOGS_DIRECTORY) final Provider<String> directoryProvider) {
         this.domain = domain;
         this.config = globalConfig;
@@ -146,12 +145,12 @@ public class LoggingManager implements ConfigChangeListener {
         final File dir = new File(directoryProvider.get());
         if (dir.exists()) {
             if (!dir.isDirectory()) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, null,
+                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, null,
                         "Unable to create logging dir (file exists instead)", ""));
             }
         } else {
             if (!dir.mkdirs()) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, null,
+                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, null,
                         "Unable to create logging dir", ""));
             }
         }
@@ -168,7 +167,7 @@ public class LoggingManager implements ConfigChangeListener {
             }
         }, 3600000);
 
-        eventBus.register(this);
+        eventBus.subscribe(this);
     }
 
     public void unload() {
@@ -184,7 +183,7 @@ public class LoggingManager implements ConfigChangeListener {
             openFiles.clear();
         }
 
-        eventBus.unregister(this);
+        eventBus.unsubscribe(this);
     }
 
     /**
@@ -207,7 +206,7 @@ public class LoggingManager implements ConfigChangeListener {
         }
     }
 
-    @Subscribe
+    @Handler
     public void handleQueryOpened(final QueryOpenedEvent event) {
         final Parser parser = event.getQuery().getConnection().getParser();
         final ClientInfo client = parser.getClient(event.getQuery().getHost());
@@ -221,7 +220,7 @@ public class LoggingManager implements ConfigChangeListener {
         appendLine(filename, "");
     }
 
-    @Subscribe
+    @Handler
     public void handleQueryClosed(final QueryClosedEvent event) {
         final Parser parser = event.getQuery().getConnection().getParser();
         final ClientInfo client = parser.getClient(event.getQuery().getHost());
@@ -233,33 +232,33 @@ public class LoggingManager implements ConfigChangeListener {
         }
     }
 
-    @Subscribe
+    @Handler
     public void handleQueryActions(final BaseQueryActionEvent event) {
         final ClientInfo client = event.getClient();
         final String filename = getLogFile(client);
         appendLine(filename, "* %s %s", client.getNickname(), event.getMessage());
     }
 
-    @Subscribe
+    @Handler
     public void handleQueryMessages(final BaseQueryMessageEvent event) {
         final ClientInfo client = event.getClient();
         final String filename = getLogFile(client);
         appendLine(filename, "<%s> %s", client.getNickname(), event.getMessage());
     }
 
-    @Subscribe
+    @Handler
     public void handleChannelMessage(final BaseChannelMessageEvent event) {
         final String filename = getLogFile(event.getChannel().getChannelInfo());
         appendLine(filename, "<%s> %s", getDisplayName(event.getClient()), event.getMessage());
     }
 
-    @Subscribe
+    @Handler
     public void handleChannelAction(final BaseChannelActionEvent event) {
         final String filename = getLogFile(event.getChannel().getChannelInfo());
         appendLine(filename, "* %s %s", getDisplayName(event.getClient()), event.getMessage());
     }
 
-    @Subscribe
+    @Handler
     public void handleChannelGotTopic(final ChannelGottopicEvent event) {
         final String filename = getLogFile(event.getChannel().getChannelInfo());
         final ChannelInfo channel = event.getChannel().getChannelInfo();
@@ -272,7 +271,7 @@ public class LoggingManager implements ConfigChangeListener {
                 getTopicSetter());
     }
 
-    @Subscribe
+    @Handler
     public void handleChannelTopicChange(final ChannelTopicChangeEvent event) {
         final String filename = getLogFile(event.getChannel().getChannelInfo());
         final ChannelClientInfo channelClient = event.getClient();
@@ -280,7 +279,7 @@ public class LoggingManager implements ConfigChangeListener {
                 getDisplayName(channelClient), event.getTopic());
     }
 
-    @Subscribe
+    @Handler
     public void handleChannelJoin(final ChannelJoinEvent event) {
         final String filename = getLogFile(event.getChannel().getChannelInfo());
         final ChannelClientInfo channelClient = event.getClient();
@@ -289,7 +288,7 @@ public class LoggingManager implements ConfigChangeListener {
                 getDisplayName(channelClient), client.toString());
     }
 
-    @Subscribe
+    @Handler
     public void handleChannelPart(final ChannelPartEvent event) {
         final String filename = getLogFile(event.getChannel().getChannelInfo());
         final String message = event.getMessage();
@@ -304,7 +303,7 @@ public class LoggingManager implements ConfigChangeListener {
         }
     }
 
-    @Subscribe
+    @Handler
     public void handleChannelQuit(final ChannelQuitEvent event) {
         final String filename = getLogFile(event.getChannel().getChannelInfo());
         final String reason = event.getMessage();
@@ -319,7 +318,7 @@ public class LoggingManager implements ConfigChangeListener {
         }
     }
 
-    @Subscribe
+    @Handler
     public void handleChannelKick(final ChannelKickEvent event) {
         final ChannelClientInfo victim = event.getVictim();
         final ChannelClientInfo perpetrator = event.getClient();
@@ -335,14 +334,14 @@ public class LoggingManager implements ConfigChangeListener {
         }
     }
 
-    @Subscribe
+    @Handler
     public void handleNickChange(final ChannelNickchangeEvent event) {
         final String filename = getLogFile(event.getChannel().getChannelInfo());
         appendLine(filename, "*** %s is now %s", getDisplayName(event.getClient(),
                 event.getOldNick()), getDisplayName(event.getClient()));
     }
 
-    @Subscribe
+    @Handler
     public void handleModeChange(final ChannelModechangeEvent event) {
         final String filename = getLogFile(event.getChannel().getChannelInfo());
         if (event.getClient().getClient().getNickname().isEmpty()) {
@@ -358,7 +357,7 @@ public class LoggingManager implements ConfigChangeListener {
         setCachedSettings();
     }
 
-    @Subscribe
+    @Handler
     public void handleChannelOpened(final ChannelOpenedEvent event) {
         final String filename = getLogFile(event.getChannel());
 
@@ -370,7 +369,7 @@ public class LoggingManager implements ConfigChangeListener {
         appendLine(filename, "");
     }
 
-    @Subscribe
+    @Handler
     public void handleChannelClosed(final ChannelClosedEvent event) {
         final String filename = getLogFile(event.getChannel());
 
@@ -389,7 +388,7 @@ public class LoggingManager implements ConfigChangeListener {
      */
     protected void showBackBuffer(final FrameContainer frame, final String filename) {
         if (frame == null) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, null, "Given a null frame", ""));
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, null, "Given a null frame", ""));
             return;
         }
 
@@ -409,7 +408,7 @@ public class LoggingManager implements ConfigChangeListener {
                 frame.addLine(getColouredString(colour, "--- End of backbuffer\n"),
                         backbufferTimestamp);
             } catch (IOException | SecurityException e) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, e,
+                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, e,
                         "Unable to show backbuffer (Filename: " + filename + "): " + e.getMessage(),
                         ""));
             }
@@ -485,7 +484,7 @@ public class LoggingManager implements ConfigChangeListener {
                 final DateFormat dateFormat = new SimpleDateFormat("[dd/MM/yyyy HH:mm:ss]");
                 dateString = dateFormat.format(new Date()).trim();
 
-                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, iae,
+                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, iae,
                         "Dateformat String '" + timestamp + "' is invalid. For more information: "
                         + "http://java.sun.com/javase/6/docs/api/java/text/SimpleDateFormat.html",
                         ""));
@@ -602,7 +601,7 @@ public class LoggingManager implements ConfigChangeListener {
 
             if (!new File(directory.toString()).exists() && !(new File(directory.toString())).
                     mkdirs()) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, null,
+                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, null,
                         "Unable to create date dirs", ""));
             }
         }
@@ -654,12 +653,12 @@ public class LoggingManager implements ConfigChangeListener {
         final File dir = new File(directory.toString() + network + System.getProperty(
                 "file.separator"));
         if (dir.exists() && !dir.isDirectory()) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, null,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, null,
                     "Unable to create networkfolders dir (file exists instead)", ""));
             // Prepend network name to file instead.
             prependNetwork = true;
         } else if (!dir.exists() && !dir.mkdirs()) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, null,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, null,
                     "Unable to create networkfolders dir", ""));
             prependNetwork = true;
         }

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

@@ -26,8 +26,6 @@ import com.dmdirc.addons.nowplaying.MediaSource;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 
-import com.google.common.eventbus.EventBus;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -39,6 +37,8 @@ import java.util.Map;
 
 import javax.inject.Inject;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Provides a media source for DBUS players.
  */
@@ -47,14 +47,14 @@ public class DBusMediaSourceManager {
     /** A map of discovered mpris sources. */
     private final Map<String, MediaSource> mprisSources;
     /** The event bus to post errors to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     /** The sources used by this media source. */
     private final List<MediaSource> sources;
     /** The path to qdbus. */
     private String qdbus;
 
     @Inject
-    public DBusMediaSourceManager(final EventBus eventBus) {
+    public DBusMediaSourceManager(final MBassador eventBus) {
         this.eventBus = eventBus;
         sources = new ArrayList<>();
         mprisSources = new HashMap<>();
@@ -146,7 +146,7 @@ public class DBusMediaSourceManager {
                 }
             }
         } catch (IOException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.HIGH, ex, "Unable to get DBUS info", ""));
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.HIGH, ex, "Unable to get DBUS info", ""));
         } finally {
             if (process != null) {
                 process.destroy();

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

@@ -27,19 +27,19 @@ import com.dmdirc.addons.nowplaying.MediaSourceState;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 
-import com.google.common.eventbus.EventBus;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Provides a media source for Linux players using the `xwininfo` command.
  */
 public class TitleMediaSource implements MediaSource {
 
     /** The event bus to post errors to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     /** The command to use to get the title. */
     private final String command;
     /** The name of the player we're retrieving. */
@@ -52,7 +52,7 @@ public class TitleMediaSource implements MediaSource {
      * @param command  The command to be executed
      * @param name     The name of the media source
      */
-    public TitleMediaSource(final EventBus eventBus, final String command, final String name) {
+    public TitleMediaSource(final MBassador eventBus, final String command, final String name) {
         this.eventBus = eventBus;
         this.command = command;
         this.name = name;
@@ -127,11 +127,11 @@ public class TitleMediaSource implements MediaSource {
                     return line;
                 }
             } catch (IOException ex) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
+                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
                         "Unable to retrieve media source info", ""));
             }
         } catch (IOException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
                             "Unable to retrieve media source info", ""));
         }
 

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

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

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

@@ -35,9 +35,6 @@ import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.messages.ColourManager;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
@@ -45,6 +42,9 @@ import java.util.Map;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+
 /**
  * Provides various features related to nickname colouring.
  */
@@ -58,7 +58,7 @@ public class NickColourManager implements ConfigChangeListener {
     /** Plugin's setting domain. */
     private final String domain;
     /** Event bus to subscribe to events on . */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     /** "Random" colours to use to colour nicknames. */
     private String[] randColours = new String[]{
         "E90E7F", "8E55E9", "B30E0E", "18B33C", "58ADB3", "9E54B3", "B39875", "3176B3",};
@@ -71,14 +71,14 @@ public class NickColourManager implements ConfigChangeListener {
     @Inject
     public NickColourManager(final ColourManager colourManager,
             @PluginDomain(NickColourPlugin.class) final String domain,
-            @GlobalConfig final AggregateConfigProvider globalConfig, final EventBus eventBus) {
+            @GlobalConfig final AggregateConfigProvider globalConfig, final MBassador eventBus) {
         this.domain = domain;
         this.globalConfig = globalConfig;
         this.colourManager = colourManager;
         this.eventBus = eventBus;
     }
 
-    @Subscribe
+    @Handler
     public void handleChannelNames(final ChannelGotnamesEvent event) {
         final ChannelInfo chanInfo = event.getChannel().getChannelInfo();
         final String network = event.getChannel().getConnection().getNetwork();
@@ -88,7 +88,7 @@ public class NickColourManager implements ConfigChangeListener {
         }
     }
 
-    @Subscribe
+    @Handler
     public void handleChannelJoin(final ChannelJoinEvent event) {
         final String network = event.getChannel().getConnection().getNetwork();
         colourClient(network, event.getClient());
@@ -240,14 +240,14 @@ public class NickColourManager implements ConfigChangeListener {
      */
     public void onLoad() {
         setCachedSettings();
-        eventBus.register(this);
+        eventBus.subscribe(this);
     }
 
     /**
      * Unloads this plugin.
      */
     public void onUnload() {
-        eventBus.unregister(this);
+        eventBus.unsubscribe(this);
     }
 
     /**

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

@@ -30,14 +30,14 @@ import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 
-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;
+
 public class NotificationsManager {
 
     /** The notification methods that we know of. */
@@ -51,11 +51,11 @@ public class NotificationsManager {
     /** Plugin manager. */
     private final PluginManager pluginManager;
     /** Event bus to listen for events on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     @Inject
     public NotificationsManager(@PluginDomain(NotificationsPlugin.class) final String domain,
-            @GlobalConfig final AggregateConfigProvider globalConfig, final EventBus eventBus,
+            @GlobalConfig final AggregateConfigProvider globalConfig, final MBassador eventBus,
             final PluginManager pluginManager) {
         this.domain = domain;
         this.globalConfig = globalConfig;
@@ -66,7 +66,7 @@ public class NotificationsManager {
     public void onLoad() {
         methods.clear();
         loadSettings();
-        eventBus.register(this);
+        eventBus.subscribe(this);
         for (PluginInfo target : pluginManager.getPluginInfos()) {
             if (target.isLoaded()) {
                 addPlugin(target);
@@ -76,15 +76,15 @@ public class NotificationsManager {
 
     public void onUnload() {
         methods.clear();
-        eventBus.unregister(this);
+        eventBus.unsubscribe(this);
     }
 
-    @Subscribe
+    @Handler
     public void handlePluginLoaded(final PluginLoadedEvent event) {
         addPlugin(event.getPlugin());
     }
 
-    @Subscribe
+    @Handler
     public void handlePluginUnloaded(final PluginUnloadedEvent event) {
         removePlugin(event.getPlugin());
     }

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

@@ -31,15 +31,15 @@ import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import javax.inject.Inject;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+
 public class NowPlayingManager {
 
     /** Plugin manager to get plugins from. */
@@ -47,7 +47,7 @@ public class NowPlayingManager {
     /** Global configuration to read settings from. */
     private final AggregateConfigProvider globalConfig;
     /** Event bus to subscribe to events on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     /** This plugin's settings domain. */
     private final String domain;
     /** The sources that we know of. */
@@ -58,7 +58,7 @@ public class NowPlayingManager {
     private List<String> order;
 
     @Inject
-    public NowPlayingManager(final PluginManager pluginManager, final EventBus eventBus,
+    public NowPlayingManager(final PluginManager pluginManager, final MBassador eventBus,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             @PluginDomain(NowPlayingPlugin.class) final String domain) {
         this.pluginManager = pluginManager;
@@ -74,7 +74,7 @@ public class NowPlayingManager {
         sources.clear();
         managers.clear();
         order = getSettings();
-        eventBus.register(this);
+        eventBus.subscribe(this);
         for (PluginInfo target : pluginManager.getPluginInfos()) {
             if (target.isLoaded()) {
                 addPlugin(target);
@@ -88,15 +88,15 @@ public class NowPlayingManager {
     public void onUnload() {
         sources.clear();
         managers.clear();
-        eventBus.unregister(this);
+        eventBus.unsubscribe(this);
     }
 
-    @Subscribe
+    @Handler
     public void handlePluginLoaded(final PluginLoadedEvent event) {
         addPlugin(event.getPlugin());
     }
 
-    @Subscribe
+    @Handler
     public void handlePluginUnloaded(final PluginUnloadedEvent event) {
         removePlugin(event.getPlugin());
     }

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

@@ -29,7 +29,7 @@ import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.util.URLBuilder;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import java.util.Arrays;
 
@@ -61,7 +61,7 @@ public class DebugWindow extends FrameContainer {
             final Parser parser,
             final Connection connection,
             final URLBuilder urlBuilder,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         super(connection.getWindowModel(), "raw", "Parser Debug", title,
                 connection.getWindowModel().getConfigManager(),
                 urlBuilder, eventBus, Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));

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

@@ -30,19 +30,19 @@ import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.util.URLBuilder;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
 import javax.inject.Inject;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+
 public class ParserDebugManager implements DebugInfoListener {
 
     /** Event bus to subscribe to events on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     /** Map of parsers registered. */
     protected final Map<Parser, DebugWindow> registeredParsers;
     /** URL Builder. */
@@ -54,7 +54,7 @@ public class ParserDebugManager implements DebugInfoListener {
     public ParserDebugManager(
             final URLBuilder urlBuilder,
             final WindowManager windowManager,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         this.urlBuilder = urlBuilder;
         this.windowManager = windowManager;
         this.eventBus = eventBus;
@@ -65,14 +65,14 @@ public class ParserDebugManager implements DebugInfoListener {
      * Adds action listener.
      */
     public void addActionListener() {
-        eventBus.register(this);
+        eventBus.subscribe(this);
     }
 
     /**
      * Remove action listener.
      */
     public void removeActionListener() {
-        eventBus.unregister(this);
+        eventBus.unsubscribe(this);
     }
 
     /**
@@ -146,7 +146,7 @@ public class ParserDebugManager implements DebugInfoListener {
         }
     }
 
-    @Subscribe
+    @Handler
     public void handleServerDisconnected(final ServerDisconnectedEvent event) {
             final Parser parser = event.getConnection().getParser();
             if (registeredParsers.containsKey(parser)) {

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

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

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

@@ -36,7 +36,7 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.util.URLBuilder;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import javax.inject.Inject;
 
@@ -56,7 +56,7 @@ public class RedirectCommand extends Command implements IntelligentCommand {
     /** The URL builder to use when finding icons. */
     private final URLBuilder urlBuilder;
     /** The bus to dispatch events on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of this command.
@@ -71,7 +71,7 @@ public class RedirectCommand extends Command implements IntelligentCommand {
             final CommandController controller,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         super(controller);
         this.messageSinkManager = messageSinkManager;
         this.urlBuilder = urlBuilder;

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

@@ -37,7 +37,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -69,7 +69,7 @@ public class ScriptCommand extends Command implements IntelligentCommand {
     /** Script manager to handle scripts. */
     private final ScriptManager scriptManager;
     /** The event bus to post errors to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of this command.
@@ -84,7 +84,7 @@ public class ScriptCommand extends Command implements IntelligentCommand {
      */
     @Inject
     public ScriptCommand(final ScriptManager scriptManager,
-            final EventBus eventBus,
+            final MBassador eventBus,
             @Directory(ScriptModule.SCRIPTS) final String scriptDirectory,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final CommandController commandController,

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

@@ -26,7 +26,6 @@ import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 
 import com.google.common.base.Preconditions;
-import com.google.common.eventbus.EventBus;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -38,13 +37,15 @@ import javax.script.ScriptEngine;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Class to create script engines!
  */
 public class ScriptEngineWrapper {
 
     /** The event bus to post errors to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     /** The Script Engine this wrapper wraps */
     private ScriptEngine engine;
     /** The File this script is from */
@@ -65,7 +66,7 @@ public class ScriptEngineWrapper {
      * @throws javax.script.ScriptException  If there was an error during creation
      */
     protected ScriptEngineWrapper(final ScriptEngineManager scriptEngineManager,
-            final EventBus eventBus, final String filename)
+            final MBassador eventBus, final String filename)
             throws FileNotFoundException, ScriptException {
         Preconditions.checkNotNull(filename, "File cannot be null");
         this.eventBus = eventBus;
@@ -141,7 +142,7 @@ public class ScriptEngineWrapper {
             // and do nothing rather that add an error every time a method is called
             // that doesn't exist (such as the action_* methods)
         } catch (ScriptException e) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, e,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, e,
                     "Error calling '" + functionName + "' in '" + file.getPath() + "': " +
                             e.getMessage(), ""));
         }
@@ -162,7 +163,7 @@ public class ScriptEngineWrapper {
             // Tell it that it has been rehashed
             callFunction("onRehashSucess");
         } catch (ScriptException e) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, e,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, e,
                     "Reloading '" + file.getPath() + "' failed: " + e.getMessage(), ""));
             // Tell it that its rehash failed
             callFunction("onRehashFailed", e);

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

@@ -26,8 +26,6 @@ import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 
-import com.google.common.eventbus.EventBus;
-
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.util.Arrays;
@@ -40,6 +38,8 @@ import javax.inject.Inject;
 import javax.script.ScriptEngineManager;
 import javax.script.ScriptException;
 
+import net.engio.mbassy.bus.MBassador;
+
 public class ScriptManager {
 
     /** Script engine manager. */
@@ -49,12 +49,12 @@ public class ScriptManager {
     /** Store Script State Name,Engine */
     private final Map<String, ScriptEngineWrapper> scripts = new HashMap<>();
     /** The event bus to post events to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     @Inject
     public ScriptManager(final ScriptEngineManager scriptEngineManager,
             @Directory(ScriptModule.SCRIPTS) final String scriptDirectory,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         this.scriptEngineManager = scriptEngineManager;
         this.scriptDirectory = scriptDirectory;
         this.eventBus = eventBus;
@@ -105,7 +105,7 @@ public class ScriptManager {
                         eventBus, scriptFilename);
                 scripts.put(scriptFilename, wrapper);
             } catch (FileNotFoundException | ScriptException e) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, e,
+                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, e,
                         "Error loading '" + scriptFilename + "': " + e.getMessage(), ""));
                 return false;
             }

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

@@ -29,9 +29,6 @@ import com.dmdirc.events.PluginUnloadedEvent;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
@@ -43,15 +40,18 @@ import java.util.List;
 import javax.inject.Inject;
 import javax.script.ScriptEngineManager;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+
 public class ScriptPluginManager {
 
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     private final String scriptDir;
     private final ScriptManager scriptManager;
     private final TypedProperties globalVariables;
 
     @Inject
-    public ScriptPluginManager(final EventBus eventBus,
+    public ScriptPluginManager(final MBassador eventBus,
             @Directory(ScriptModule.SCRIPTS) final String scriptDir,
             final ScriptManager scriptManager,
             final ScriptEngineManager scriptEngineManager) {
@@ -64,7 +64,7 @@ public class ScriptPluginManager {
     public void onLoad() {
         // Register the plugin_loaded action initially, this will be called
         // after this method finishes for us to register the rest.
-        eventBus.register(this);
+        eventBus.subscribe(this);
 
         // Make sure our scripts dir exists
         final File newDir = new File(scriptDir);
@@ -77,7 +77,7 @@ public class ScriptPluginManager {
             try (FileInputStream fis = new FileInputStream(savedVariables)) {
                 globalVariables.load(fis);
             } catch (IOException e) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.LOW, e,
+                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, e,
                         "Error reading savedVariables from '" + savedVariables.getPath() + "': "
                                 + e.getMessage(), ""));
             }
@@ -85,18 +85,18 @@ public class ScriptPluginManager {
     }
 
     public void onUnLoad() {
-        eventBus.unregister(this);
+        eventBus.unsubscribe(this);
 
         final File savedVariables = new File(scriptDir + "storedVariables");
         try (FileOutputStream fos = new FileOutputStream(savedVariables)) {
             globalVariables.store(fos, "# DMDirc Script Plugin savedVariables");
         } catch (IOException e) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, e,"Error reading savedVariables to '"
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, e,"Error reading savedVariables to '"
                     + savedVariables.getPath() + "': " + e.getMessage(), ""));
         }
     }
 
-    @Subscribe
+    @Handler
     public void handlePluginLoadEvent(final DMDircEvent event) throws ReflectiveOperationException {
         if (event instanceof PluginLoadedEvent || event instanceof PluginUnloadedEvent) {
             return;

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

@@ -33,9 +33,8 @@ import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.config.IdentityFactory;
 import com.dmdirc.plugins.PluginManager;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
-import java.io.IOException;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
@@ -75,7 +74,7 @@ public class ServerList implements ConfigProviderListener {
             final ServerManager serverManager,
             final IdentityController identityController,
             final IdentityFactory identityFactory,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         this.serverManager = serverManager;
         this.identityController = identityController;
         this.identityFactory = identityFactory;

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

@@ -33,7 +33,7 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.Service;
 import com.dmdirc.plugins.ServiceProvider;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import java.net.URI;
 import java.util.Arrays;
@@ -54,7 +54,7 @@ public class ServerListServiceProvider implements ServiceProvider {
     /** Plugin Manager */
     private final PluginManager pluginManager;
     /** The event bus to post errors to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new server list service provider.
@@ -64,7 +64,7 @@ public class ServerListServiceProvider implements ServiceProvider {
      * @param eventBus      The event bus to post errors to
      */
     public ServerListServiceProvider(final PluginManager pluginManager, final ServerList serverList,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         this.serverList = serverList;
         this.pluginManager = pluginManager;
         this.eventBus = eventBus;

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

@@ -30,9 +30,6 @@ import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.Styliser;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import java.awt.AWTException;
 import java.awt.Frame;
 import java.awt.MenuItem;
@@ -46,6 +43,9 @@ import java.awt.event.MouseListener;
 
 import javax.inject.Inject;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+
 public class SystrayManager implements ActionListener, MouseListener {
 
     /** Main frame instance. */
@@ -57,7 +57,7 @@ public class SystrayManager implements ActionListener, MouseListener {
     /** Icon manager to get images from. */
     private final IconManager iconManager;
     /** The event bus to listen to events on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     /** The tray icon we're currently using. */
     private TrayIcon icon;
 
@@ -67,7 +67,7 @@ public class SystrayManager implements ActionListener, MouseListener {
             @PluginDomain(SystrayPlugin.class) final String domain,
             final MainFrame mainFrame,
             @GlobalConfig final IconManager iconManager,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         this.globalConfig = globalConfig;
         this.domain = domain;
         this.mainFrame = mainFrame;
@@ -92,7 +92,7 @@ public class SystrayManager implements ActionListener, MouseListener {
 
         try {
             SystemTray.getSystemTray().add(icon);
-            eventBus.register(this);
+            eventBus.subscribe(this);
         } catch (AWTException ex) {
             throw new IllegalStateException("Unable to load plugin", ex);
         }
@@ -100,7 +100,7 @@ public class SystrayManager implements ActionListener, MouseListener {
 
     public void unload() {
         SystemTray.getSystemTray().remove(icon);
-        eventBus.unregister(this);
+        eventBus.unsubscribe(this);
         icon = null;
     }
 
@@ -151,7 +151,7 @@ public class SystrayManager implements ActionListener, MouseListener {
         }
     }
 
-    @Subscribe
+    @Handler
     public void handleClientMinimised(final ClientMinimisedEvent event) {
         if (globalConfig.getOptionBool(domain, "autominimise")) {
             mainFrame.setVisible(false);

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

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

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

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

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

@@ -32,9 +32,6 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.util.InvalidURIException;
 import com.dmdirc.util.URIParser;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import java.awt.Image;
 import java.awt.PopupMenu;
 import java.awt.event.ActionEvent;
@@ -54,6 +51,9 @@ import javax.swing.JMenuBar;
 import javax.swing.JMenuItem;
 import javax.swing.UIManager;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+
 /**
  * Integrate DMDirc with OS X better.
  */
@@ -75,7 +75,7 @@ public class Apple implements InvocationHandler {
     /** The server manager to use to connect to URLs. */
     private final ServerManager serverManager;
     /** Event bus. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of {@link Apple}.
@@ -91,7 +91,7 @@ public class Apple implements InvocationHandler {
     public Apple(
             @GlobalConfig final AggregateConfigProvider configManager,
             final ServerManager serverManager,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         this.configManager = configManager;
         this.serverManager = serverManager;
         this.eventBus = eventBus;
@@ -102,9 +102,9 @@ public class Apple implements InvocationHandler {
             try {
                 System.loadLibrary("DMDirc-Apple"); // NOPMD
                 registerOpenURLCallback();
-                eventBus.register(this);
+                eventBus.subscribe(this);
             } catch (UnsatisfiedLinkError ule) {
-                eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM,
+                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM,
                         ule, "Unable to load JNI library", ""));
             }
         }
@@ -136,7 +136,7 @@ public class Apple implements InvocationHandler {
                     : classes);
             return method.invoke(obj, objects == null ? new Object[0] : objects);
         } catch (ReflectiveOperationException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex, "Unable to find OS X classes.", ""));
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex, "Unable to find OS X classes.", ""));
         }
 
         return null;
@@ -444,7 +444,7 @@ public class Apple implements InvocationHandler {
      *
      * @param event The event describing the client opening.
      */
-    @Subscribe
+    @Handler
     public void handleClientOpened(final ClientOpenedEvent event) {
         synchronized (addresses) {
             clientOpened = true;

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

@@ -28,8 +28,6 @@ import com.dmdirc.addons.ui_swing.actions.PasteAction;
 import com.dmdirc.addons.ui_swing.events.SwingWindowEvent;
 import com.dmdirc.events.ClientKeyPressedEvent;
 
-import com.google.common.eventbus.EventBus;
-
 import java.awt.AWTEvent;
 import java.awt.Component;
 import java.awt.EventQueue;
@@ -47,6 +45,8 @@ import javax.swing.MenuSelectionManager;
 import javax.swing.SwingUtilities;
 import javax.swing.text.JTextComponent;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Custom event queue to add common functionality to certain components.
  */
@@ -54,12 +54,12 @@ import javax.swing.text.JTextComponent;
 public class DMDircEventQueue extends EventQueue {
 
     /** Event bus to dispatch events to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     /** Clipboard to copy and paste from. */
     private final Clipboard clipboard;
 
     @Inject
-    public DMDircEventQueue(final EventBus eventBus, final Clipboard clipboard) {
+    public DMDircEventQueue(final MBassador eventBus, final Clipboard clipboard) {
         this.eventBus = eventBus;
         this.clipboard = clipboard;
     }
@@ -74,7 +74,7 @@ public class DMDircEventQueue extends EventQueue {
         } else if (event instanceof KeyEvent) {
             handleKeyEvent((KeyEvent) event);
         } else if (event instanceof WindowEvent) {
-            eventBus.post(new SwingWindowEvent((WindowEvent) event));
+            eventBus.publish(new SwingWindowEvent((WindowEvent) event));
         }
     }
 
@@ -102,7 +102,7 @@ public class DMDircEventQueue extends EventQueue {
      * @param ke Key event
      */
     private void handleKeyEvent(final KeyEvent ke) {
-        eventBus.post(new ClientKeyPressedEvent(
+        eventBus.publishAsync(new ClientKeyPressedEvent(
                 KeyStroke.getKeyStroke(ke.getKeyChar(), ke.getModifiers())));
     }
 

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

@@ -50,9 +50,6 @@ import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.collections.ListenerList;
 import com.dmdirc.util.collections.QueuedLinkedHashSet;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import java.awt.Dimension;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowFocusListener;
@@ -68,6 +65,9 @@ import javax.swing.WindowConstants;
 
 import net.miginfocom.swing.MigLayout;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+
 import static com.dmdirc.addons.ui_swing.SwingPreconditions.checkOnEDT;
 
 /**
@@ -99,7 +99,7 @@ public class MainFrame extends JFrame implements WindowListener,
     /** Provider of frame managers. */
     private final Provider<FrameManager> frameManagerProvider;
     /** The bus to despatch events on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     /** The main application icon. */
     private ImageIcon imageIcon;
     /** The frame manager that's being used. */
@@ -143,7 +143,7 @@ public class MainFrame extends JFrame implements WindowListener,
             final Provider<QuitWorker> quitWorker,
             final IconManager iconManager,
             final Provider<FrameManager> frameManagerProvider,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         checkOnEDT();
         this.apple = apple;
         this.lifecycleController = lifecycleController;
@@ -176,12 +176,12 @@ public class MainFrame extends JFrame implements WindowListener,
 
                 @Override
                 public void windowGainedFocus(final WindowEvent e) {
-                    eventBus.post(new ClientFocusGainedEvent());
+                    eventBus.publishAsync(new ClientFocusGainedEvent());
                 }
 
                 @Override
                 public void windowLostFocus(final WindowEvent e) {
-                    eventBus.post(new ClientFocusLostEvent());
+                    eventBus.publishAsync(new ClientFocusLostEvent());
                 }
             });
 
@@ -260,7 +260,7 @@ public class MainFrame extends JFrame implements WindowListener,
 
     @Override
     public void windowIconified(final WindowEvent windowEvent) {
-        eventBus.post(new ClientMinimisedEvent());
+        eventBus.publishAsync(new ClientMinimisedEvent());
     }
 
     /**
@@ -270,7 +270,7 @@ public class MainFrame extends JFrame implements WindowListener,
      */
     @Override
     public void windowDeiconified(final WindowEvent windowEvent) {
-        eventBus.post(new ClientUnminimisedEvent());
+        eventBus.publishAsync(new ClientUnminimisedEvent());
     }
 
     /**
@@ -587,7 +587,7 @@ public class MainFrame extends JFrame implements WindowListener,
         listeners.remove(SelectionListener.class, listener);
     }
 
-    @Subscribe
+    @Handler
     public void doWindowAdded(final SwingWindowAddedEvent event) {
         final TextFrame window = event.getChildWindow();
         if (activeFrame == null) {
@@ -595,7 +595,7 @@ public class MainFrame extends JFrame implements WindowListener,
         }
     }
 
-    @Subscribe
+    @Handler
     public void doWindowDeleted(final SwingWindowDeletedEvent event) {
         final TextFrame window = event.getChildWindow();
         if (window == null) {
@@ -621,7 +621,7 @@ public class MainFrame extends JFrame implements WindowListener,
         }
     }
 
-    @Subscribe
+    @Handler
     public void titleChanged(final FrameTitleChangedEvent event) {
         if (activeFrame != null && activeFrame.getContainer().equals(event.getContainer())) {
             setTitle(event.getTitle());

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

@@ -39,7 +39,7 @@ import com.dmdirc.util.validators.NumericalValidator;
 import com.dmdirc.util.validators.OptionalValidator;
 import com.dmdirc.util.validators.Validator;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import java.awt.Dimension;
 import java.awt.Font;
@@ -78,7 +78,7 @@ public final class PrefsComponentFactory {
     /** The colour manager to use for colour preferences. */
     private final ColourManager colourManager;
     /** The global event bus. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of PrefsComponentFactory.
@@ -89,7 +89,7 @@ public final class PrefsComponentFactory {
      */
     @Inject
     public PrefsComponentFactory(
-            final EventBus eventBus,
+            final MBassador eventBus,
             @GlobalConfig final IconManager iconManager,
             final ColourManager colourManager) {
         this.iconManager = iconManager;

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

@@ -28,11 +28,11 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 
-import com.google.common.eventbus.EventBus;
-
 import javax.inject.Inject;
 import javax.swing.SwingWorker;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Worker which handles quitting the application on behalf of a {@link MainFrame}.
  */
@@ -47,7 +47,7 @@ public class QuitWorker extends SwingWorker<Void, Void> {
     /** The main frame to interact with. */
     private final MainFrame mainFrame;
     /** Bus to dispatch events on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new {@link QuitWorker}.
@@ -62,7 +62,7 @@ public class QuitWorker extends SwingWorker<Void, Void> {
             final IdentityController identityController,
             final ServerManager serverManager,
             final MainFrame mainFrame,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         this.globalIdentity = identityController.getUserSettings();
         this.globalConfig = identityController.getGlobalConfiguration();
         this.serverManager = serverManager;
@@ -72,7 +72,7 @@ public class QuitWorker extends SwingWorker<Void, Void> {
 
     @Override
     protected Void doInBackground() {
-        eventBus.post(new ClientClosingEvent());
+        eventBus.publishAsync(new ClientClosingEvent());
         serverManager.closeAll(globalConfig.getOption("general", "closemessage"));
         globalIdentity.setOption("ui", "frameManagerSize",
                 String.valueOf(mainFrame.getFrameManagerSize()));

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

@@ -31,7 +31,7 @@ import com.dmdirc.interfaces.Connection;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.core.util.URLHandler;
 
-import com.google.common.eventbus.Subscribe;
+import net.engio.mbassy.listener.Handler;
 
 import javax.inject.Inject;
 import javax.inject.Singleton;
@@ -56,7 +56,7 @@ public class SwingLinkHandler {
         this.windowFactory = windowFactory;
     }
 
-    @Subscribe
+    @Handler
     public void handleChannelClick(final LinkChannelClickedEvent event) {
         final FrameContainer container = event.getWindow().getContainer();
         final Connection connection = container.getConnection();
@@ -65,12 +65,12 @@ public class SwingLinkHandler {
         }
     }
 
-    @Subscribe
+    @Handler
     public void handleLinkClick(final LinkUrlClickedEvent event) {
         urlHandler.launchApp(event.getTarget());
     }
 
-    @Subscribe
+    @Handler
     public void handleNicknameClick(final LinkNicknameClickedEvent event) {
         final FrameContainer container = event.getWindow().getContainer();
         final Connection connection = container.getConnection();

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

@@ -41,9 +41,6 @@ import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import java.awt.Window;
 
 import javax.inject.Inject;
@@ -51,6 +48,9 @@ import javax.inject.Provider;
 import javax.inject.Singleton;
 import javax.swing.SwingUtilities;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+
 /**
  * Manages swing components and dependencies.
  */
@@ -76,9 +76,9 @@ public class SwingManager {
     /** Link handler for swing links. */
     private final SwingLinkHandler linkHandler;
     /** Bus to listen on for events. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     /** The event bus for this plugin. */
-    private final EventBus swingEventBus;
+    private final MBassador swingEventBus;
     /** The provider to use to create tree-based frame managers. */
     private final TreeFrameManagerProvider treeProvider;
     /** The provider to use to create button-based frame managers. */
@@ -128,8 +128,8 @@ public class SwingManager {
             final Provider<FeedbackNag> feedbackNagProvider,
             final URLDialogFactory urlDialogFactory,
             final SwingLinkHandler linkHandler,
-            final EventBus eventBus,
-            @SwingEventBus final EventBus swingEventBus,
+            final MBassador eventBus,
+            @SwingEventBus final MBassador swingEventBus,
             final TreeFrameManagerProvider treeProvider,
             final ButtonBarProvider buttonProvider,
             final Provider<SwingWindowManager> swingWindowManager,
@@ -165,14 +165,14 @@ public class SwingManager {
         this.mainFrame.setWindowManager(ctrlTabManager);
         this.mainFrame.setStatusBar(statusBar.get());
         this.mainFrame.initComponents();
-        swingEventBus.register(mainFrame);
-        swingEventBus.register(ctrlTabManager);
+        swingEventBus.subscribe(mainFrame);
+        swingEventBus.subscribe(ctrlTabManager);
 
         windowManager.addListenerAndSync(windowFactory.get());
         statusBarManager.registerStatusBar(statusBar.get());
-        eventBus.register(this);
-        eventBus.register(mainFrame);
-        eventBus.register(linkHandler);
+        eventBus.subscribe(this);
+        eventBus.subscribe(mainFrame);
+        eventBus.subscribe(linkHandler);
         SwingUtilities.invokeLater(new Runnable() {
 
             @Override
@@ -198,13 +198,13 @@ public class SwingManager {
                 errorListDialogProvider.get().dispose();
             }
         });
-        swingEventBus.unregister(mainFrame);
-        swingEventBus.unregister(ctrlTabManager);
+        swingEventBus.unsubscribe(mainFrame);
+        swingEventBus.unsubscribe(ctrlTabManager);
         mainFrame.dispose();
         statusBarManager.unregisterStatusBar(statusBar.get());
-        eventBus.unregister(this);
-        eventBus.unregister(mainFrame);
-        eventBus.unregister(linkHandler);
+        eventBus.unsubscribe(this);
+        eventBus.unsubscribe(mainFrame);
+        eventBus.unsubscribe(linkHandler);
         uiInitialiser.unload();
     }
 
@@ -228,7 +228,7 @@ public class SwingManager {
         return buttonProvider;
     }
 
-    @Subscribe
+    @Handler
     public void showFirstRunWizard(final FirstRunEvent event) {
         if (!event.isHandled()) {
             firstRunExecutor.get().showWizardAndWait();
@@ -236,7 +236,7 @@ public class SwingManager {
         }
     }
 
-    @Subscribe
+    @Handler
     public void showURLDialog(final UnknownURLEvent event) {
         if (!event.isHandled()) {
             event.setHandled(true);
@@ -250,7 +250,7 @@ public class SwingManager {
         }
     }
 
-    @Subscribe
+    @Handler
     public void showFeedbackNag(final FeedbackNagEvent event) {
         UIUtilities.invokeLater(new Runnable() {
 

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

@@ -30,8 +30,6 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.logger.ErrorLevel;
 
-import com.google.common.eventbus.EventBus;
-
 import java.awt.Font;
 import java.awt.KeyboardFocusManager;
 import java.awt.Toolkit;
@@ -42,6 +40,8 @@ import javax.swing.UnsupportedLookAndFeelException;
 
 import net.miginfocom.layout.PlatformDefaults;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Initialises swing and system UI settings.
  */
@@ -52,10 +52,10 @@ public class SwingUIInitialiser {
     private final ConfigProvider addonConfig;
     private final DialogKeyListener dialogKeyListener;
     private final DMDircEventQueue eventQueue;
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     @Inject
-    public SwingUIInitialiser(final EventBus eventBus, final Apple apple,
+    public SwingUIInitialiser(final MBassador eventBus, final Apple apple,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             @AddonConfig final ConfigProvider addonConfig,
             final DialogKeyListener dialogKeyListener,
@@ -126,7 +126,7 @@ public class SwingUIInitialiser {
                             Font.PLAIN, 12));
                 } catch (UnsupportedOperationException | UnsupportedLookAndFeelException |
                         IllegalAccessException | InstantiationException | ClassNotFoundException ex) {
-                    eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
+                    eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
                             "Unable to set UI Settings", ""));
                 }
 

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

@@ -37,7 +37,6 @@ import com.dmdirc.interfaces.ui.FrameListener;
 import com.dmdirc.logger.ErrorLevel;
 
 import com.google.common.base.Optional;
-import com.google.common.eventbus.EventBus;
 
 import java.util.Collection;
 import java.util.HashMap;
@@ -49,6 +48,8 @@ import javax.inject.Inject;
 import javax.inject.Provider;
 import javax.inject.Singleton;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Handles creation of windows in the Swing UI.
  *
@@ -64,9 +65,9 @@ public class SwingWindowFactory implements FrameListener {
     /** Active window manager. */
     private final Provider<ActiveFrameManager> activeFrameManager;
     /** The event bus to post errors to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     /** The swing event bus. */
-    private final EventBus swingEventBus;
+    private final MBassador swingEventBus;
 
     /**
      * Creates a new window factory for the specified controller.
@@ -86,8 +87,8 @@ public class SwingWindowFactory implements FrameListener {
             final CustomInputFrameFactory customInputFrameFactory,
             final ServerFrameFactory serverFrameFactory,
             final ChannelFrameFactory channelFrameFactory,
-            final EventBus eventBus,
-            @SwingEventBus final EventBus swingEventBus) {
+            final MBassador eventBus,
+            @SwingEventBus final MBassador swingEventBus) {
         this.activeFrameManager = activeFrameManager;
         this.eventBus = eventBus;
         this.swingEventBus = swingEventBus;
@@ -124,7 +125,7 @@ public class SwingWindowFactory implements FrameListener {
      */
     protected TextFrame doAddWindow(final FrameContainer window) {
         if (!implementations.containsKey(window.getComponents())) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.HIGH, null,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.HIGH, null,
                     "Unable to create window: Unknown type.", ""));
             return null;
         }
@@ -166,7 +167,7 @@ public class SwingWindowFactory implements FrameListener {
                 if (childWindow == null) {
                     return;
                 }
-                swingEventBus.post(new SwingWindowAddedEvent(
+                swingEventBus.publish(new SwingWindowAddedEvent(
                         Optional.fromNullable(parentWindow), childWindow));
 
                 if (focus) {
@@ -184,7 +185,7 @@ public class SwingWindowFactory implements FrameListener {
             public void run() {
                 final TextFrame parentWindow = getSwingWindow(parent);
                 final TextFrame childWindow = getSwingWindow(window);
-                swingEventBus.post(new SwingWindowDeletedEvent(
+                swingEventBus.publish(new SwingWindowDeletedEvent(
                         Optional.fromNullable(parentWindow), childWindow));
 
                 windows.remove(window);

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

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

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

@@ -25,14 +25,14 @@ package com.dmdirc.addons.ui_swing.actions;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 
-import com.google.common.eventbus.EventBus;
-
 import java.awt.event.ActionEvent;
 
 import javax.swing.AbstractAction;
 import javax.swing.undo.CannotUndoException;
 import javax.swing.undo.UndoManager;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Handles redo's on text components.
  */
@@ -43,7 +43,7 @@ public final class RedoAction extends AbstractAction {
     /** Undo manager. */
     private final UndoManager undoManager;
     /** The event bus to post errors to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of RedoAction.
@@ -51,7 +51,7 @@ public final class RedoAction extends AbstractAction {
      * @param eventBus    The event bus to post errors to
      * @param undoManager UndoManager to use for this redo action
      */
-    public RedoAction(final EventBus eventBus, final UndoManager undoManager) {
+    public RedoAction(final MBassador eventBus, final UndoManager undoManager) {
         super("Undo");
 
         this.undoManager = undoManager;
@@ -65,7 +65,7 @@ public final class RedoAction extends AbstractAction {
                 undoManager.redo();
             }
         } catch (CannotUndoException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex, "Unable to redo", ""));
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex, "Unable to redo", ""));
         }
     }
 

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

@@ -25,8 +25,6 @@ package com.dmdirc.addons.ui_swing.actions;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 
-import com.google.common.eventbus.EventBus;
-
 import java.awt.datatransfer.Clipboard;
 import java.awt.datatransfer.DataFlavor;
 import java.awt.datatransfer.UnsupportedFlavorException;
@@ -36,6 +34,8 @@ import java.io.IOException;
 import javax.swing.AbstractAction;
 import javax.swing.text.JTextComponent;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Paste action that replaces matching regexes.
  */
@@ -50,7 +50,7 @@ public final class ReplacePasteAction extends AbstractAction {
     /** Replacement string. */
     private final String replacementString;
     /** The event bus to post errors to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of regex replacement paste action.
@@ -60,7 +60,7 @@ public final class ReplacePasteAction extends AbstractAction {
      * @param replacementRegex  Regex to match for replacement
      * @param replacementString Replacement string
      */
-    public ReplacePasteAction(final EventBus eventBus, final Clipboard clipboard,
+    public ReplacePasteAction(final MBassador eventBus, final Clipboard clipboard,
             final String replacementRegex, final String replacementString) {
         super("NoSpacesPasteAction");
 
@@ -85,10 +85,10 @@ public final class ReplacePasteAction extends AbstractAction {
                     ((String) clipboard.getData(DataFlavor.stringFlavor))
                             .replaceAll(replacementRegex, replacementString));
         } catch (IOException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
                     "Unable to get clipboard contents: " + ex.getMessage(), ""));
         } catch (UnsupportedFlavorException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
                     "Unable to get clipboard contents", ""));
         }
     }

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

@@ -25,14 +25,14 @@ package com.dmdirc.addons.ui_swing.actions;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 
-import com.google.common.eventbus.EventBus;
-
 import java.awt.event.ActionEvent;
 
 import javax.swing.AbstractAction;
 import javax.swing.undo.CannotUndoException;
 import javax.swing.undo.UndoManager;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Handles undo's on text components.
  */
@@ -43,7 +43,7 @@ public final class UndoAction extends AbstractAction {
     /** Undo manager. */
     private final UndoManager undoManager;
     /** The event bus to post errors to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of UndoAction.
@@ -51,7 +51,7 @@ public final class UndoAction extends AbstractAction {
      * @param eventBus    The event bus to post errors to
      * @param undoManager UndoManager to use for this redo action
      */
-    public UndoAction(final EventBus eventBus, final UndoManager undoManager) {
+    public UndoAction(final MBassador eventBus, final UndoManager undoManager) {
         super("Undo");
 
         this.undoManager = undoManager;
@@ -65,7 +65,7 @@ public final class UndoAction extends AbstractAction {
                 undoManager.undo();
             }
         } catch (CannotUndoException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex, "Unable to undo", ""));
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex, "Unable to undo", ""));
         }
     }
 

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

@@ -26,8 +26,6 @@ import com.dmdirc.addons.ui_swing.components.renderers.FontListCellRenderer;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 
-import com.google.common.eventbus.EventBus;
-
 import java.awt.Font;
 import java.awt.GraphicsEnvironment;
 import java.util.concurrent.ExecutionException;
@@ -36,6 +34,8 @@ import javax.swing.DefaultComboBoxModel;
 import javax.swing.JComboBox;
 import javax.swing.SwingUtilities;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * System font picking component.
  */
@@ -52,7 +52,7 @@ public class FontPicker extends JComboBox<Object> {
      * @param eventBus   The event bus to post errors to
      * @param fontFamily Font family
      */
-    public FontPicker(final EventBus eventBus, final String fontFamily) {
+    public FontPicker(final MBassador eventBus, final String fontFamily) {
         super(new DefaultComboBoxModel<>());
         this.fontFamily = fontFamily;
 
@@ -72,7 +72,7 @@ public class FontPicker extends JComboBox<Object> {
                 } catch (InterruptedException ex) {
                     //Ignore
                 } catch (ExecutionException ex) {
-                    eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, ex, ex.getMessage(), ""));
+                    eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, ex, ex.getMessage(), ""));
                 }
             }
         }.execute();

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

@@ -25,12 +25,12 @@ package com.dmdirc.addons.ui_swing.components;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 
-import com.google.common.eventbus.EventBus;
-
 import java.util.concurrent.ExecutionException;
 
 import javax.swing.SwingWorker;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Logging swing worker.
  *
@@ -39,14 +39,14 @@ import javax.swing.SwingWorker;
  */
 public abstract class LoggingSwingWorker<T, V> extends SwingWorker<T, V> {
 
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new logging swing worker.
      *
      * @param eventBus Event bus to post errors to.
      */
-    public LoggingSwingWorker(final EventBus eventBus) {
+    public LoggingSwingWorker(final MBassador eventBus) {
         this.eventBus = eventBus;
     }
 
@@ -60,7 +60,7 @@ public abstract class LoggingSwingWorker<T, V> extends SwingWorker<T, V> {
         } catch (InterruptedException ex) {
             //Ignore
         } catch (ExecutionException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, ex, ex.getMessage(), ""));
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, ex, ex.getMessage(), ""));
         }
     }
 

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

@@ -35,9 +35,6 @@ import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.IconManager;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -48,6 +45,9 @@ import javax.swing.SwingUtilities;
 
 import net.miginfocom.swing.MigLayout;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+
 /**
  * Provides an MDI style bar for closing frames.
  */
@@ -84,7 +84,7 @@ public class MDIBar extends JPanel implements SelectionListener, ActionListener,
             @GlobalConfig final IconManager iconManager,
             @PluginDomain(SwingController.class) final String domain,
             final ActiveFrameManager activeFrameManager,
-            @SwingEventBus final EventBus eventBus) {
+            @SwingEventBus final MBassador eventBus) {
         this.activeFrameManager = activeFrameManager;
         config = globalConfig;
         configDomain = domain;
@@ -96,7 +96,7 @@ public class MDIBar extends JPanel implements SelectionListener, ActionListener,
         setLayout(new MigLayout("hmax 17, ins 1 0 0 0, fill"));
         add(closeButton, "w 17!, h 17!, right");
 
-        eventBus.register(this);
+        eventBus.subscribe(this);
 
         activeFrameManager.addSelectionListener(this);
         closeButton.addActionListener(this);
@@ -123,12 +123,12 @@ public class MDIBar extends JPanel implements SelectionListener, ActionListener,
         });
     }
 
-    @Subscribe
+    @Handler
     public void windowAdded(final SwingWindowAddedEvent event) {
         check();
     }
 
-    @Subscribe
+    @Handler
     public void windowDeleted(final SwingWindowDeletedEvent event) {
         check();
     }

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

@@ -40,7 +40,7 @@ import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.messages.Styliser;
 
 import com.google.common.base.Optional;
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import java.awt.Color;
 import java.awt.Window;
@@ -131,7 +131,7 @@ public class TopicBar extends JComponent implements ActionListener, ConfigChange
             final Channel channel,
             final ChannelFrame window,
             final IconManager iconManager,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         this.channel = channel;
         this.domain = domain;
         this.colourManager = colourManager;

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

@@ -33,7 +33,7 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import java.awt.Window;
 import java.awt.datatransfer.Clipboard;
@@ -57,7 +57,7 @@ public class TopicBarFactory {
     private final PluginManager pluginManager;
     private final Clipboard clipboard;
     private final CommandController commandController;
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     @Inject
     public TopicBarFactory(
@@ -68,7 +68,7 @@ public class TopicBarFactory {
             final PluginManager pluginManager,
             final Clipboard clipboard,
             final CommandController commandController,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         this.parentWindow = parentWindow;
         this.globalConfig = globalConfig;
         this.domain = domain;

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

@@ -38,8 +38,6 @@ import com.dmdirc.util.io.DownloadListener;
 import com.dmdirc.util.io.Downloader;
 import com.dmdirc.util.io.InvalidConfigFileException;
 
-import com.google.common.eventbus.EventBus;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -56,6 +54,8 @@ import javax.swing.text.StyleConstants;
 
 import net.miginfocom.swing.MigLayout;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Loads the addon data feed into the addon browser.
  */
@@ -86,7 +86,7 @@ public class DataLoaderWorker
     /** Downloader to download files. */
     private final Downloader downloader;
     /** The event bus to post errors to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new data loader worker.
@@ -110,7 +110,7 @@ public class DataLoaderWorker
             final InstallWorkerFactory workerFactory,
             final UpdateManager updateManager,
             @Directory(DirectoryType.TEMPORARY) final String tempDirectory,
-            final EventBus eventBus,
+            final MBassador eventBus,
             final AddonTable table,
             final boolean download,
             final BrowserWindow browserWindow,
@@ -180,7 +180,7 @@ public class DataLoaderWorker
         } catch (final InterruptedException ex) {
             data = Collections.<AddonInfo>emptyList();
         } catch (final ExecutionException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, ex, ex.getMessage(), ""));
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, ex, ex.getMessage(), ""));
             data = Collections.<AddonInfo>emptyList();
         }
         final int selectedRow;

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

@@ -29,7 +29,7 @@ import com.dmdirc.updater.manager.UpdateManager;
 import com.dmdirc.util.URLBuilder;
 import com.dmdirc.util.io.Downloader;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import javax.inject.Inject;
 import javax.swing.JScrollPane;
@@ -45,7 +45,7 @@ public class DataLoaderWorkerFactory {
     private final InstallWorkerFactory workerFactory;
     private final UpdateManager updateManager;
     private final String tempDirectory;
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     @Inject
     public DataLoaderWorkerFactory(final Downloader downloader,
@@ -53,7 +53,7 @@ public class DataLoaderWorkerFactory {
             final URLBuilder urlBuilder,
             final InstallWorkerFactory workerFactory,
             final UpdateManager updateManager,
-            final EventBus eventBus,
+            final MBassador eventBus,
             @CommandLineOptionsModule.Directory(CommandLineOptionsModule.DirectoryType.TEMPORARY) final String tempDirectory) {
         this.downloader = downloader;
         this.globalConfig = globalConfig;

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

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

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

@@ -26,7 +26,7 @@ import com.dmdirc.commandline.CommandLineOptionsModule;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.util.io.Downloader;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import javax.inject.Inject;
 
@@ -40,14 +40,14 @@ public class InstallWorkerFactory {
     private final String pluginDirectory;
     private final String themeDirectory;
     private final PluginManager pluginManager;
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     @Inject
     public InstallWorkerFactory(final Downloader downloader,
             @CommandLineOptionsModule.Directory(CommandLineOptionsModule.DirectoryType.TEMPORARY) final String tempDirectory,
             @CommandLineOptionsModule.Directory(CommandLineOptionsModule.DirectoryType.PLUGINS) final String pluginDirectory,
             @CommandLineOptionsModule.Directory(CommandLineOptionsModule.DirectoryType.THEMES) final String themeDirectory,
-            final PluginManager pluginManager, final EventBus eventBus) {
+            final PluginManager pluginManager, final MBassador eventBus) {
         this.downloader = downloader;
         this.tempDirectory = tempDirectory;
         this.pluginDirectory = pluginDirectory;

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

@@ -30,7 +30,7 @@ import com.dmdirc.addons.ui_swing.components.renderers.AddonCellRenderer;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 import com.dmdirc.config.prefs.PreferencesInterface;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import java.awt.Window;
 
@@ -63,7 +63,7 @@ public abstract class AddonPanel extends JPanel implements AddonToggleListener,
     /** The factory to use to produce data loader workers. */
     private final DataLoaderWorkerFactory workerFactory;
     /** The event bus to post errors to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     /** Addon list scroll pane. */
     private JScrollPane scrollPane;
     /** Blurb label. */
@@ -83,7 +83,7 @@ public abstract class AddonPanel extends JPanel implements AddonToggleListener,
      * @param eventBus      The event bus to post errors to.
      */
     public AddonPanel(final Window parentWindow, final DataLoaderWorkerFactory workerFactory,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         this.parentWindow = parentWindow;
         this.workerFactory = workerFactory;
         this.eventBus = eventBus;

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

@@ -34,9 +34,6 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.updater.manager.CachingUpdateManager;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import java.awt.Window;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -46,6 +43,9 @@ import javax.inject.Inject;
 import javax.swing.JTable;
 import javax.swing.table.DefaultTableModel;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+
 /**
  * Lists known plugins, enabling the end user to enable/disable these as well as download new ones.
  */
@@ -75,7 +75,7 @@ public class PluginPanel extends AddonPanel {
      */
     @Inject
     public PluginPanel(
-            final EventBus eventBus,
+            final MBassador eventBus,
             @MainWindow final Window parentWindow,
             final PluginManager pluginManager,
             final DataLoaderWorkerFactory workerFactory,
@@ -87,7 +87,7 @@ public class PluginPanel extends AddonPanel {
         this.iconManager = iconManager;
         this.updateManager = updateManager;
         this.userConfig = userConfig;
-        eventBus.register(this);
+        eventBus.subscribe(this);
         pluginManager.refreshPlugins();
         load();
     }
@@ -133,7 +133,7 @@ public class PluginPanel extends AddonPanel {
         return table;
     }
 
-    @Subscribe
+    @Handler
     public void handlePluginRefresh(final PluginRefreshEvent event) {
         populateList(addonList);
     }

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

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

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

@@ -39,9 +39,6 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityFactory;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import java.awt.Dimension;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -53,6 +50,9 @@ import javax.swing.JSplitPane;
 
 import net.miginfocom.swing.MigLayout;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+
 /**
  * The channel frame is the GUI component that represents a channel to the user.
  */
@@ -71,7 +71,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
     /** Topic bar. */
     private TopicBar topicBar;
     /** Event bus to dispatch events on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     /** Config to read settings from. */
     private final AggregateConfigProvider globalConfig;
     /** The domain to read settings from. */
@@ -113,7 +113,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
 
         globalConfig.addChangeListener("ui", "channelSplitPanePosition", this);
         globalConfig.addChangeListener(domain, "shownicklist", this);
-        eventBus.register(this);
+        eventBus.subscribe(this);
 
         identity = identityFactory.createChannelConfig(owner.getConnection().getNetwork(),
                 owner.getChannelInfo().getName());
@@ -217,7 +217,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
         }
     }
 
-    @Subscribe
+    @Handler
     public void handleClientClosing(final ClientClosingEvent event) {
         saveSplitPanePosition();
     }
@@ -284,7 +284,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
 
     @Override
     public void dispose() {
-        eventBus.unregister(this);
+        eventBus.unsubscribe(this);
         globalConfig.removeListener(this);
         super.dispose();
     }

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

@@ -32,13 +32,13 @@ import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.util.SimpleInjector;
 import com.dmdirc.util.URLBuilder;
 
-import com.google.common.eventbus.EventBus;
-
 import java.util.HashSet;
 import java.util.Set;
 
 import javax.swing.JComponent;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Utility class to create frame components.
  *
@@ -64,7 +64,7 @@ public class ComponentCreator {
     public Set<JComponent> initFrameComponents(
             final Object frame,
             final SwingController controller,
-            final EventBus eventBus,
+            final MBassador eventBus,
             final URLBuilder urlBuilder,
             final FrameContainer owner) {
         final SimpleInjector injector = new SimpleInjector();
@@ -93,7 +93,7 @@ public class ComponentCreator {
                 object = injector.createInstance(clazz);
             } catch (ClassNotFoundException | IllegalArgumentException ex) {
                 object = null;
-                eventBus.post(new UserErrorEvent(ErrorLevel.HIGH, ex,
+                eventBus.publishAsync(new UserErrorEvent(ErrorLevel.HIGH, ex,
                         "Unable to create component: " + ex.getMessage(), ""));
             }
             if (object instanceof JComponent) {

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

@@ -28,7 +28,7 @@ import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.util.URLBuilder;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import javax.swing.JComponent;
 import javax.swing.JPopupMenu;
@@ -49,7 +49,7 @@ public class ComponentFrame extends TextFrame {
     /** Parent controller. */
     private final SwingController controller;
     /** The global event bus. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of CustomFrame.
@@ -61,7 +61,7 @@ public class ComponentFrame extends TextFrame {
      * @param commandParser The parser to use to process commands.
      */
     public ComponentFrame(
-            final EventBus eventBus,
+            final MBassador eventBus,
             final TextFrameDependencies deps,
             final URLBuilder urlBuilder,
             final FrameContainer owner,

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

@@ -26,7 +26,7 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 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;
@@ -39,13 +39,13 @@ import static com.dmdirc.addons.ui_swing.components.frames.TextFrame.TextFrameDe
 @Singleton
 public class ComponentFrameFactory {
 
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     private final TextFrameDependencies dependencies;
     private final URLBuilder urlBuilder;
 
     @Inject
     public ComponentFrameFactory(
-            final EventBus eventBus,
+            final MBassador eventBus,
             final TextFrameDependencies dependencies,
             final URLBuilder urlBuilder) {
         this.eventBus = eventBus;

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

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

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

@@ -28,7 +28,7 @@ import com.dmdirc.events.FrameIconChangedEvent;
 import com.dmdirc.events.FrameTitleChangedEvent;
 import com.dmdirc.interfaces.FrameCloseListener;
 
-import com.google.common.eventbus.Subscribe;
+import net.engio.mbassy.listener.Handler;
 
 import java.awt.Point;
 import java.awt.event.WindowAdapter;
@@ -96,7 +96,7 @@ public class DesktopWindowFrame extends JFrame implements FrameCloseListener {
         });
     }
 
-    @Subscribe
+    @Handler
     public void iconChanged(final FrameIconChangedEvent event) {
         UIUtilities.invokeLater(new Runnable() {
 
@@ -109,7 +109,7 @@ public class DesktopWindowFrame extends JFrame implements FrameCloseListener {
         });
     }
 
-    @Subscribe
+    @Handler
     public void titleChanged(final FrameTitleChangedEvent event) {
         UIUtilities.invokeLater(new Runnable() {
 

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

@@ -42,8 +42,6 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.messages.ColourManager;
 
-import com.google.common.eventbus.EventBus;
-
 import java.awt.BorderLayout;
 import java.awt.Point;
 import java.awt.Toolkit;
@@ -63,6 +61,8 @@ import javax.swing.KeyStroke;
 
 import net.miginfocom.layout.PlatformDefaults;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Frame with an input field.
  */
@@ -100,7 +100,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
     /** The controller to use to retrieve command information. */
     private final CommandController commandController;
     /** The bus to dispatch input events on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of InputFrame.
@@ -282,7 +282,7 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
                 return;
             }
         } catch (final IllegalStateException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
                     "Unable to past from clipboard.", ""));
             return;
         }
@@ -293,10 +293,10 @@ public abstract class InputTextFrame extends TextFrame implements InputWindow,
             doPaste((String) Toolkit.getDefaultToolkit()
                     .getSystemClipboard().getData(DataFlavor.stringFlavor));
         } catch (final IOException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
                     "Unable to get clipboard contents: " + ex.getMessage(), ""));
         } catch (final UnsupportedFlavorException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex,
                     "Unsupported clipboard type", ""));
         }
     }

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

@@ -63,8 +63,6 @@ import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.ColourManager;
 
-import com.google.common.eventbus.EventBus;
-
 import java.awt.Point;
 import java.awt.Window;
 import java.awt.datatransfer.Clipboard;
@@ -84,6 +82,8 @@ import javax.swing.SwingUtilities;
 
 import net.miginfocom.swing.MigLayout;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Implements a generic (internal) frame.
  */
@@ -105,7 +105,7 @@ public abstract class TextFrame extends JPanel implements com.dmdirc.interfaces.
     /** Manager to use for building popups. */
     private final PopupManager popupManager;
     /** Bus to despatch events on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     /** Clipboard to copy and paste from. */
     private final Clipboard clipboard;
     /** Boolean to determine if this frame should be popped out of main client. */
@@ -167,12 +167,12 @@ public abstract class TextFrame extends JPanel implements com.dmdirc.interfaces.
         if (popout) {
             popoutPlaceholder = new DesktopPlaceHolderFrame();
             popoutFrame = new DesktopWindowFrame(this);
-            eventBus.register(popoutFrame);
+            eventBus.subscribe(popoutFrame);
             popoutFrame.display();
         } else if (popoutFrame != null) {
             popoutPlaceholder = null;
             popoutFrame.dispose();
-            eventBus.unregister(popoutFrame);
+            eventBus.unsubscribe(popoutFrame);
             popoutFrame = null;
         }
         // Call setActiveFrame again so the contents of the frame manager are updated.
@@ -308,13 +308,13 @@ public abstract class TextFrame extends JPanel implements com.dmdirc.interfaces.
         if (eventType == MouseEventType.CLICK && event.getButton() == MouseEvent.BUTTON1) {
             switch (clicktype.getType()) {
                 case CHANNEL:
-                    eventBus.post(new LinkChannelClickedEvent(this, clicktype.getValue()));
+                    eventBus.publishAsync(new LinkChannelClickedEvent(this, clicktype.getValue()));
                     break;
                 case NICKNAME:
-                    eventBus.post(new LinkNicknameClickedEvent(this, clicktype.getValue()));
+                    eventBus.publishAsync(new LinkNicknameClickedEvent(this, clicktype.getValue()));
                     break;
                 case HYPERLINK:
-                    eventBus.post(new LinkUrlClickedEvent(this, clicktype.getValue()));
+                    eventBus.publishAsync(new LinkUrlClickedEvent(this, clicktype.getValue()));
                     break;
             }
         }
@@ -546,7 +546,7 @@ public abstract class TextFrame extends JPanel implements com.dmdirc.interfaces.
         final SwingController controller;
         final Provider<Window> mainWindow;
         final PopupManager popupManager;
-        final EventBus eventBus;
+        final MBassador eventBus;
         final AggregateConfigProvider globalConfig;
         final PasteDialogFactory pasteDialog;
         final PluginManager pluginManager;
@@ -561,7 +561,7 @@ public abstract class TextFrame extends JPanel implements com.dmdirc.interfaces.
                 final SwingController controller,
                 @MainWindow final Provider<Window> mainWindow,
                 final PopupManager popupManager,
-                final EventBus eventBus,
+                final MBassador eventBus,
                 final PasteDialogFactory pasteDialog,
                 final PluginManager pluginManager,
                 @GlobalConfig final IconManager iconManager,

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

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

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

@@ -37,8 +37,8 @@ import com.dmdirc.interfaces.InviteListener;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
 import com.dmdirc.ui.IconManager;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
 
 import java.awt.Window;
 import java.awt.event.ActionEvent;
@@ -82,7 +82,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements StatusBa
      */
     @Inject
     public InviteLabel(
-            final EventBus eventBus,
+            final MBassador eventBus,
             @GlobalConfig final IconManager iconManager,
             final ServerManager serverManager,
             final MainFrame mainFrame) {
@@ -106,7 +106,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements StatusBa
         }
 
         mainFrame.addSelectionListener(this);
-        eventBus.register(this);
+        eventBus.subscribe(this);
 
         update();
     }
@@ -160,17 +160,17 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements StatusBa
         update();
     }
 
-    @Subscribe
+    @Handler
     public void handleServerConnected(final ServerConnectedEvent event) {
         event.getConnection().addInviteListener(this);
     }
 
-    @Subscribe
+    @Handler
     public void handleServerDisconnected(final ServerDisconnectedEvent event) {
         handleServerRemoved(event.getConnection());
     }
 
-    @Subscribe
+    @Handler
     public void handleServerConnectError(final ServerConnectErrorEvent event) {
         handleServerRemoved(event.getConnection());
     }

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

@@ -13,8 +13,6 @@ import com.dmdirc.events.LinkUrlClickedEvent;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.ui.messages.IRCTextAttribute;
 
-import com.google.common.eventbus.EventBus;
-
 import java.awt.Cursor;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
@@ -27,6 +25,8 @@ import javax.swing.text.StyledDocument;
 import javax.swing.text.StyledEditorKit;
 import javax.swing.text.ViewFactory;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * @author Stanislav Lapitsky
  * @version 1.0
@@ -46,7 +46,7 @@ public class WrapEditorKit extends StyledEditorKit implements MouseListener, Mou
     /** Associated Component. */
     private JEditorPane editorPane;
     /** Event bus to fire link click events on. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     /** The window this editor kit is used in. */
     private final Window window;
 
@@ -57,7 +57,7 @@ public class WrapEditorKit extends StyledEditorKit implements MouseListener, Mou
      * @param eventBus Event bus to raise hyperlink events on
      * @param window   Window as source for hyperlink events
      */
-    public WrapEditorKit(final boolean wrapping, final EventBus eventBus, final Window window) {
+    public WrapEditorKit(final boolean wrapping, final MBassador eventBus, final Window window) {
         this.window = window;
         this.eventBus = eventBus;
         wrap = wrapping;
@@ -124,15 +124,15 @@ public class WrapEditorKit extends StyledEditorKit implements MouseListener, Mou
             Object target = characterElementAt(e).getAttributes().getAttribute(
                     IRCTextAttribute.HYPERLINK);
             if (target != null) {
-                eventBus.post(new LinkUrlClickedEvent(window, (String) target));
+                eventBus.publishAsync(new LinkUrlClickedEvent(window, (String) target));
             }
             target = characterElementAt(e).getAttributes().getAttribute(IRCTextAttribute.CHANNEL);
             if (target != null) {
-                eventBus.post(new LinkChannelClickedEvent(window, (String) target));
+                eventBus.publishAsync(new LinkChannelClickedEvent(window, (String) target));
             }
             target = characterElementAt(e).getAttributes().getAttribute(IRCTextAttribute.NICKNAME);
             if (target != null) {
-                eventBus.post(new LinkNicknameClickedEvent(window, (String) target));
+                eventBus.publishAsync(new LinkNicknameClickedEvent(window, (String) target));
             }
         }
     }

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

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

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

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

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

@@ -46,9 +46,6 @@ import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.validators.FileNameValidator;
 import com.dmdirc.util.validators.ValidatorChain;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.HashMap;
@@ -69,6 +66,9 @@ import javax.swing.event.ListSelectionListener;
 
 import net.miginfocom.swing.MigLayout;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+
 /**
  * Allows the user to manage actions.
  */
@@ -86,7 +86,7 @@ public class ActionsManagerDialog extends StandardDialog implements
     /** Duplicate action group validator. */
     private final ValidatorChain<String> validator;
     /** Event bus to post events to and subscribe to events on. */
-    private final EventBus eventbus;
+    private final MBassador eventbus;
     /** Info label. */
     private TextLabel infoLabel;
     /** Group list. */
@@ -125,7 +125,7 @@ public class ActionsManagerDialog extends StandardDialog implements
      */
     @Inject
     public ActionsManagerDialog(
-            final EventBus eventBus,
+            final MBassador eventBus,
             final Apple apple,
             final MainFrame parentWindow,
             @UserConfig final ConfigProvider config,
@@ -206,7 +206,7 @@ public class ActionsManagerDialog extends StandardDialog implements
         edit.addActionListener(this);
         delete.addActionListener(this);
         groups.getSelectionModel().addListSelectionListener(this);
-        eventbus.register(this);
+        eventbus.subscribe(this);
     }
 
     /**
@@ -433,12 +433,12 @@ public class ActionsManagerDialog extends StandardDialog implements
         }
     }
 
-    @Subscribe
+    @Handler
     public void handleActionCreated(final ActionCreatedEvent event) {
         handleActionCreatedOrUpdated(event.getAction());
     }
 
-    @Subscribe
+    @Handler
     public void handleActionUpdated(final ActionUpdatedEvent event) {
         handleActionCreatedOrUpdated(event.getAction());
     }
@@ -449,7 +449,7 @@ public class ActionsManagerDialog extends StandardDialog implements
         }
     }
 
-    @Subscribe
+    @Handler
     public void handleActionDeleted(final ActionDeletedEvent event) {
         if (event.getGroup().getName().equals(groups.getSelectedValue().getName())) {
             actions.actionDeleted(event.getName());

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

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

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

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

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

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

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

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

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

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

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

@@ -29,7 +29,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import java.awt.Window;
 
@@ -46,7 +46,7 @@ public class PasteDialogFactory {
     private final AggregateConfigProvider config;
     private final PluginManager pluginManager;
     private final CommandController commandController;
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     @Inject
     public PasteDialogFactory(
@@ -54,7 +54,7 @@ public class PasteDialogFactory {
             @ClientModule.GlobalConfig final AggregateConfigProvider config,
             final PluginManager pluginManager,
             final CommandController commandController,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         this.iconManager = iconManager;
         this.config = config;
         this.pluginManager = pluginManager;

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

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

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

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

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

@@ -27,12 +27,12 @@ import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.ui.IconManager;
 
-import com.google.common.eventbus.EventBus;
-
 import java.util.concurrent.ExecutionException;
 
 import javax.swing.Icon;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Loads an icon in the background and uses it for a category label once it has been loaded.
  */
@@ -41,7 +41,7 @@ public class IconLoader extends LoggingSwingWorker<Icon, Void> {
     /** Category this icon will be used for. */
     private final CategoryLabel label;
     /** The event bus to post errors to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     /** Icon to load. */
     private final String icon;
     /** Icon manager. */
@@ -56,7 +56,7 @@ public class IconLoader extends LoggingSwingWorker<Icon, Void> {
      * @param label       Label to load category for
      * @param icon        Icon to load
      */
-    public IconLoader(final IconManager iconManager, final EventBus eventBus,
+    public IconLoader(final IconManager iconManager, final MBassador eventBus,
             final CategoryLabel label, final String icon) {
         super(eventBus);
         this.iconManager = iconManager;
@@ -77,7 +77,7 @@ public class IconLoader extends LoggingSwingWorker<Icon, Void> {
         } catch (InterruptedException ex) {
             //Ignore
         } catch (ExecutionException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, ex, ex.getMessage(), ""));
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, ex, ex.getMessage(), ""));
         }
 
     }

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

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

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

@@ -33,8 +33,6 @@ import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 
-import com.google.common.eventbus.EventBus;
-
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 
@@ -47,6 +45,8 @@ import javax.swing.UIManager;
 import net.miginfocom.layout.PlatformDefaults;
 import net.miginfocom.swing.MigLayout;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Loads a preferences panel for a specified preferences category in the background.
  */
@@ -70,7 +70,7 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
     /** Prefs component factory instance. */
     private final PrefsComponentFactory factory;
     /** The event bus to post the errors to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Instantiates a new preferences category loader.
@@ -81,7 +81,7 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
      * @param category      Preferences Category to load
      */
     public PrefsCategoryLoader(final PrefsComponentFactory factory,
-            final EventBus eventBus,
+            final MBassador eventBus,
             final CategoryPanel categoryPanel,
             final PreferencesCategory category) {
         super(eventBus);
@@ -125,7 +125,7 @@ public class PrefsCategoryLoader extends LoggingSwingWorker<JPanel, Object> {
         } catch (InterruptedException ex) {
             panel = errorCategory;
         } catch (ExecutionException ex) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, ex,
                     "Error loading prefs panel", ""));
             panel = errorCategory;
         }

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

@@ -37,8 +37,6 @@ import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.ui.IconManager;
 
-import com.google.common.eventbus.EventBus;
-
 import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -60,6 +58,8 @@ import javax.swing.event.ListSelectionListener;
 
 import net.miginfocom.swing.MigLayout;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Allows the user to modify global client preferences.
  */
@@ -85,7 +85,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
     /** Icon manager to retrieve icons from. */
     private final IconManager iconManager;
     /** The event bus to post errors to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of SwingPreferencesDialog.
@@ -104,7 +104,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
             @ForSettings final DialogProvider<SwingRestartDialog> restartDialogProvider,
             final Provider<PreferencesDialogModel> dialogModelProvider,
             final Provider<CategoryPanel> categoryPanelProvider,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         super(parentWindow, ModalityType.MODELESS);
 
         this.iconManager = iconManager;
@@ -124,7 +124,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
                     prefsManager = dialogModelProvider.get();
                 } catch (IllegalArgumentException ex) {
                     mainPanel.setError(ex.getMessage());
-                    eventBus.post(new UserErrorEvent(ErrorLevel.HIGH, ex,
+                    eventBus.publishAsync(new UserErrorEvent(ErrorLevel.HIGH, ex,
                             "Unable to load the preferences dialog", ""));
                 }
                 return prefsManager;
@@ -141,7 +141,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
                     } catch (InterruptedException ex) {
                         //Ignore
                     } catch (ExecutionException ex) {
-                        eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM, ex, ex.getMessage(), ""));
+                        eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM, ex, ex.getMessage(), ""));
                     }
                 }
             }

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

@@ -36,8 +36,6 @@ import com.dmdirc.updater.UpdateChannel;
 import com.dmdirc.updater.UpdateChecker;
 import com.dmdirc.updater.manager.CachingUpdateManager;
 
-import com.google.common.eventbus.EventBus;
-
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -52,6 +50,8 @@ import javax.swing.JScrollPane;
 
 import net.miginfocom.swing.MigLayout;
 
+import net.engio.mbassy.bus.MBassador;
+
 /**
  * Updates configuration UI.
  */
@@ -79,7 +79,7 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
     /** Controller to pass to the update checker. */
     private final IdentityController identityController;
     /** The event bus to post errors to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Instantiates a new update config panel.
@@ -96,7 +96,7 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final CachingUpdateManager updateManager,
             final IdentityController identityController,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         this.userConfig = userConfig;
         this.globalConfig = globalConfig;
         this.updateManager = updateManager;
@@ -141,7 +141,7 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
         try {
             channel = UpdateChannel.valueOf(globalConfig.getOption("updater", "channel"));
         } catch (IllegalArgumentException e) {
-            eventBus.post(new UserErrorEvent(ErrorLevel.LOW, e,
+            eventBus.publishAsync(new UserErrorEvent(ErrorLevel.LOW, e,
                     "Invalid setting for update channel, defaulting to none.", ""));
         }
         updateChannel.setSelectedItem(channel);

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

@@ -39,7 +39,7 @@ import com.dmdirc.updater.manager.UpdateManagerListener;
 import com.dmdirc.updater.manager.UpdateManagerStatus;
 import com.dmdirc.updater.manager.UpdateStatus;
 
-import com.google.common.eventbus.EventBus;
+import net.engio.mbassy.bus.MBassador;
 
 import java.awt.Dimension;
 import java.awt.Window;
@@ -82,7 +82,7 @@ public class SwingUpdaterDialog extends StandardDialog implements
     /** Provider of restart dialogs. */
     private final DialogProvider<SwingRestartDialog> restartDialogProvider;
     /** The event bus to post errors to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new instance of the updater dialog.
@@ -97,7 +97,7 @@ public class SwingUpdaterDialog extends StandardDialog implements
             final CachingUpdateManager updateManager,
             @MainWindow final Window parentWindow,
             @ForUpdates final DialogProvider<SwingRestartDialog> restartDialogProvider,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         super(parentWindow, ModalityType.MODELESS);
 
         this.updateManager = updateManager;

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

@@ -44,8 +44,6 @@ import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.WindowManager;
 
 import com.google.common.base.Optional;
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
 
 import java.awt.Dimension;
 import java.awt.Insets;
@@ -74,6 +72,9 @@ import javax.swing.SwingUtilities;
 import net.miginfocom.layout.PlatformDefaults;
 import net.miginfocom.swing.MigLayout;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+
 /**
  * The button bar manager is a grid of buttons that presents a manager similar to that used by mIRC.
  */
@@ -130,13 +131,13 @@ public final class ButtonBar implements FrameManager, ActionListener,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final WindowManager windowManager,
             final ActiveFrameManager activeFrameManager,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         this.windowFactory = windowFactory;
         this.globalConfig = globalConfig;
         this.windowManager = windowManager;
         this.activeFrameManager = activeFrameManager;
 
-        eventBus.register(this);
+        eventBus.subscribe(this);
 
         scrollPane = new JScrollPane();
         scrollPane.setBorder(null);
@@ -332,7 +333,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
         return true;
     }
 
-    @Subscribe
+    @Handler
     public void windowAdded(final SwingWindowAddedEvent event) {
         final TextFrame window = event.getChildWindow();
         UIUtilities.invokeLater(new Runnable() {
@@ -346,7 +347,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
         });
     }
 
-    @Subscribe
+    @Handler
     public void windowDeleted(final SwingWindowDeletedEvent event) {
         final TextFrame window = event.getChildWindow();
         UIUtilities.invokeLater(new Runnable() {
@@ -447,7 +448,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
         });
     }
 
-    @Subscribe
+    @Handler
     public void iconChanged(final FrameIconChangedEvent event) {
         UIUtilities.invokeLater(new Runnable() {
 
@@ -461,7 +462,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
         });
     }
 
-    @Subscribe
+    @Handler
     public void nameChanged(final FrameNameChangedEvent event) {
         UIUtilities.invokeLater(new Runnable() {
 

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

@@ -41,9 +41,6 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.logger.ErrorLevel;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import java.awt.event.KeyEvent;
 import java.util.HashMap;
 import java.util.Map;
@@ -57,6 +54,9 @@ import javax.swing.tree.TreeNode;
 import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+
 /**
  * A Window manager to handle ctrl[+shift]+tab switching between windows.
  */
@@ -72,7 +72,7 @@ public class CtrlTabWindowManager implements SelectionListener {
     /** Selection model for the tree scroller. */
     private final TreeSelectionModel selectionModel;
     /** The event bus to post errors to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
 
     /**
      * Creates a new ctrl tab window manager.
@@ -89,7 +89,7 @@ public class CtrlTabWindowManager implements SelectionListener {
             final SwingWindowFactory windowFactory,
             final ActiveFrameManager activeFrameManager,
             final MainFrame mainFrame,
-            final EventBus eventBus) {
+            final MBassador eventBus) {
         this.eventBus = eventBus;
         nodes = new HashMap<>();
         model = new TreeViewModel(globalConfig, new TreeViewNode(null, null));
@@ -119,7 +119,7 @@ public class CtrlTabWindowManager implements SelectionListener {
                                 KeyEvent.CTRL_DOWN_MASK), "nextFrameAction");
     }
 
-    @Subscribe
+    @Handler
     public void windowAdded(final SwingWindowAddedEvent event) {
         final TextFrame parent = event.getParentWindow().orNull();
         final TextFrame window = event.getChildWindow();
@@ -144,7 +144,7 @@ public class CtrlTabWindowManager implements SelectionListener {
         });
     }
 
-    @Subscribe
+    @Handler
     public void windowDeleted(final SwingWindowDeletedEvent event) {
         final TextFrame parent = event.getParentWindow().orNull();
         final TextFrame window = event.getChildWindow();
@@ -157,7 +157,7 @@ public class CtrlTabWindowManager implements SelectionListener {
                 }
                 final TreeViewNode node = nodes.get(window);
                 if (node.getLevel() == 0) {
-                    eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM,
+                    eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM,
                             new IllegalArgumentException(),
                             "delServer triggered for root node" + node.toString(), ""));
                 } else {

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

@@ -33,7 +33,7 @@ import com.dmdirc.interfaces.NotificationListener;
 import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.messages.Styliser;
 
-import com.google.common.eventbus.Subscribe;
+import net.engio.mbassy.listener.Handler;
 
 import java.awt.Color;
 import java.awt.Font;
@@ -124,14 +124,14 @@ public class NodeLabel extends JPanel implements SelectionListener,
         }
     }
 
-    @Subscribe
+    @Handler
     public void iconChanged(final FrameIconChangedEvent event) {
         if (equals(window)) {
             icon.setIcon(window.getIconManager().getIcon(event.getIcon()));
         }
     }
 
-    @Subscribe
+    @Handler
     public void nameChanged(final FrameNameChangedEvent event) {
         if (equals(window)) {
             text.setText(event.getName());

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

@@ -45,9 +45,6 @@ import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.ColourManager;
 
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
-
 import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
 import java.io.Serializable;
@@ -68,6 +65,9 @@ import javax.swing.tree.TreePath;
 
 import net.miginfocom.swing.MigLayout;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+
 /**
  * Manages open windows in the application in a tree style view.
  */
@@ -95,9 +95,9 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
     /** Active frame manager. */
     private final ActiveFrameManager activeFrameManager;
     /** The event bus to post errors to. */
-    private final EventBus eventBus;
+    private final MBassador eventBus;
     /** Swing event bus. */
-    private final EventBus swingEventBus;
+    private final MBassador swingEventBus;
 
     /**
      * Creates a new instance of the TreeFrameManager.
@@ -119,8 +119,8 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
             final ActiveFrameManager activeFrameManager,
             final SwingWindowFactory windowFactory,
             @PluginDomain(SwingController.class) final String domain,
-            final EventBus eventBus,
-            @SwingEventBus final EventBus swingEventBus) {
+            final MBassador eventBus,
+            @SwingEventBus final MBassador swingEventBus) {
         this.windowFactory = windowFactory;
         this.windowManager = windowManager;
         this.nodes = new HashMap<>();
@@ -178,13 +178,13 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
 
                 setColours();
 
-                swingEventBus.register(TreeFrameManager.this);
+                swingEventBus.subscribe(TreeFrameManager.this);
                 redoTreeView();
             }
         });
     }
 
-    @Subscribe
+    @Handler
     public void doAddWindow(final SwingWindowAddedEvent event) {
         final TextFrame parent = event.getParentWindow().orNull();
         final TextFrame window = event.getChildWindow();
@@ -198,7 +198,7 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
         }
     }
 
-    @Subscribe
+    @Handler
     public void doDeleteWindow(final SwingWindowDeletedEvent event) {
         final TextFrame window = event.getChildWindow();
         UIUtilities.invokeAndWait(new Runnable() {
@@ -210,14 +210,14 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
                 }
                 final DefaultMutableTreeNode node = nodes.get(window.getContainer());
                 if (node.getLevel() == 0) {
-                    eventBus.post(new UserErrorEvent(ErrorLevel.MEDIUM,
+                    eventBus.publishAsync(new UserErrorEvent(ErrorLevel.MEDIUM,
                             new IllegalArgumentException(),
                             "delServer triggered for root node" + node.toString(), ""));
                 } else {
                     model.removeNodeFromParent(nodes.get(window.getContainer()));
                 }
                 synchronized (nodes) {
-                    eventBus.unregister(nodes.get(window.getContainer()).getLabel());
+                    eventBus.unsubscribe(nodes.get(window.getContainer()).getLabel());
                     nodes.remove(window.getContainer());
                 }
                 window.getContainer().removeNotificationListener(
@@ -239,7 +239,7 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
             @Override
             public void run() {
                 final NodeLabel label = new NodeLabel(window);
-                eventBus.register(label);
+                eventBus.subscribe(label);
                 final TreeViewNode node = new TreeViewNode(label, window);
                 synchronized (nodes) {
                     nodes.put(window, node);

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

@@ -38,8 +38,6 @@ import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.IconManager;
 
 import com.google.common.base.Optional;
-import com.google.common.eventbus.EventBus;
-import com.google.common.eventbus.Subscribe;
 
 import java.awt.Component;
 import java.awt.event.ActionEvent;
@@ -60,6 +58,9 @@ import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
 import javax.swing.JSeparator;
 
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.listener.Handler;
+
 /**
  * Manages the window menu window list.
  */
@@ -102,11 +103,11 @@ public class WindowMenuFrameManager extends JMenu implements ActionListener, Sel
             @GlobalConfig final AggregateConfigProvider globalConfig,
             @PluginDomain(SwingController.class) final String domain,
             final ActiveFrameManager activeFrameManager,
-            @SwingEventBus final EventBus swingEventBus) {
+            @SwingEventBus final MBassador swingEventBus) {
         this.globalConfig = globalConfig;
         this.domain = domain;
         this.activeFrameManager = activeFrameManager;
-        swingEventBus.register(this);
+        swingEventBus.subscribe(this);
 
         menus = Collections.synchronizedMap(
                 new HashMap<FrameContainer, FrameContainerMenu>());
@@ -145,7 +146,7 @@ public class WindowMenuFrameManager extends JMenu implements ActionListener, Sel
         closeMenuItem.setEnabled(enabledMenuItems.get());
     }
 
-    @Subscribe
+    @Handler
     public void windowAdded(final SwingWindowAddedEvent event) {
         final TextFrame parent = event.getParentWindow().orNull();
         final TextFrame window = event.getChildWindow();
@@ -218,7 +219,7 @@ public class WindowMenuFrameManager extends JMenu implements ActionListener, Sel
         checkMenuItems();
     }
 
-    @Subscribe
+    @Handler
     public void windowDeleted(final SwingWindowDeletedEvent event) {
         final TextFrame parent = event.getParentWindow().orNull();
         final TextFrame window = event.getChildWindow();