Switch to SwingEventBus

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

 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
-import com.dmdirc.addons.ui_swing.injection.SwingEventBus;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.events.ServerDisconnectedEvent;
 import com.dmdirc.events.ServerGotpingEvent;
     /** Event bus to receive events on. */
     private final DMDircMBassador eventBus;
     /** Swing event bus to receive events from. */
-    private final DMDircMBassador swingEventBus;
+    private final SwingEventBus swingEventBus;
     /** Active frame manager. */
     private final ActiveFrameManager activeFrameManager;
     private final Provider<LagDisplayPanel> panelProvider;
 
     @Inject
     public LagDisplayManager(final DMDircMBassador eventBus,
-            @SwingEventBus final DMDircMBassador swingEventBus,
+            final SwingEventBus swingEventBus,
             final ActiveFrameManager activeFrameManager,
             final Provider<LagDisplayPanel> panelProvider,
             @PluginDomain(LagDisplayPlugin.class) final String domain,

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

 import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
 import com.dmdirc.addons.ui_swing.dialogs.ConfirmQuitDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
+import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.events.SwingWindowAddedEvent;
 import com.dmdirc.addons.ui_swing.events.SwingWindowDeletedEvent;
 import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
     /** The bus to despatch events on. */
     private final DMDircMBassador eventBus;
     /** Swing event bus to post events to. */
-    private final DMDircMBassador swingEventBus;
+    private final SwingEventBus swingEventBus;
     /** The main application icon. */
     private ImageIcon imageIcon;
     /** The frame manager that's being used. */
             final IconManager iconManager,
             final Provider<FrameManager> frameManagerProvider,
             final DMDircMBassador eventBus,
-            final DMDircMBassador swingEventBus) {
+            final SwingEventBus swingEventBus) {
         checkOnEDT();
         this.apple = apple;
         this.lifecycleController = lifecycleController;

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

 import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
 import com.dmdirc.addons.ui_swing.dialogs.error.ErrorListDialog;
 import com.dmdirc.addons.ui_swing.dialogs.url.URLDialogFactory;
+import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.framemanager.ctrltab.CtrlTabWindowManager;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeFrameManagerProvider;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
-import com.dmdirc.addons.ui_swing.injection.SwingEventBus;
 import com.dmdirc.addons.ui_swing.wizard.SwingWindowManager;
 import com.dmdirc.addons.ui_swing.wizard.firstrun.FirstRunWizardExecutor;
 import com.dmdirc.events.FeedbackNagEvent;
     /** Bus to listen on for events. */
     private final DMDircMBassador eventBus;
     /** The event bus for this plugin. */
-    private final DMDircMBassador swingEventBus;
+    private final SwingEventBus swingEventBus;
     /** The provider to use to create tree-based frame managers. */
     private final TreeFrameManagerProvider treeProvider;
     /** The provider to use to create new main frames. */
             final URLDialogFactory urlDialogFactory,
             final SwingLinkHandler linkHandler,
             final DMDircMBassador eventBus,
-            @SwingEventBus final DMDircMBassador swingEventBus,
+            final SwingEventBus swingEventBus,
             final TreeFrameManagerProvider treeProvider,
             final Provider<SwingWindowManager> swingWindowManager,
             final DialogProvider<ErrorListDialog> errorListDialogProvider,

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

 import com.dmdirc.addons.ui_swing.components.frames.CustomInputFrameFactory;
 import com.dmdirc.addons.ui_swing.components.frames.ServerFrameFactory;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.events.SwingWindowAddedEvent;
 import com.dmdirc.addons.ui_swing.events.SwingWindowDeletedEvent;
-import com.dmdirc.addons.ui_swing.injection.SwingEventBus;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.ui.FrameListener;
     /** The event bus to post errors to. */
     private final DMDircMBassador eventBus;
     /** The swing event bus. */
-    private final DMDircMBassador swingEventBus;
+    private final SwingEventBus swingEventBus;
 
     /**
      * Creates a new window factory for the specified controller.
             final ServerFrameFactory serverFrameFactory,
             final ChannelFrameFactory channelFrameFactory,
             final DMDircMBassador eventBus,
-            @SwingEventBus final DMDircMBassador swingEventBus) {
+            final SwingEventBus swingEventBus) {
         this.activeFrameManager = activeFrameManager;
         this.eventBus = eventBus;
         this.swingEventBus = swingEventBus;

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

 package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.events.SwingWindowAddedEvent;
 import com.dmdirc.addons.ui_swing.events.SwingWindowDeletedEvent;
 import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
-import com.dmdirc.addons.ui_swing.injection.SwingEventBus;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
             @GlobalConfig final IconManager iconManager,
             @PluginDomain(SwingController.class) final String domain,
             final ActiveFrameManager activeFrameManager,
-            @SwingEventBus final DMDircMBassador eventBus) {
+            final SwingEventBus eventBus) {
         this.activeFrameManager = activeFrameManager;
         config = globalConfig;
         configDomain = domain;

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

 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
-import com.dmdirc.addons.ui_swing.injection.SwingEventBus;
 import com.dmdirc.events.ServerConnectErrorEvent;
 import com.dmdirc.events.ServerConnectedEvent;
 import com.dmdirc.events.ServerDisconnectedEvent;
             @GlobalConfig final IconManager iconManager,
             final ConnectionManager connectionManager,
             final MainFrame mainFrame,
-            @SwingEventBus final DMDircMBassador swingEventBus) {
+            final SwingEventBus swingEventBus) {
         super(new JLabel());
 
         this.parentWindow = mainFrame;

ui_swing/src/com/dmdirc/addons/ui_swing/injection/SwingEventBus.java → ui_swing/src/com/dmdirc/addons/ui_swing/events/SwingEventBus.java

  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing.injection;
+package com.dmdirc.addons.ui_swing.events;
 
-import javax.inject.Qualifier;
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import net.engio.mbassy.bus.MBassador;
+import net.engio.mbassy.bus.config.BusConfiguration;
+import net.engio.mbassy.bus.config.Feature;
 
 /**
- * Qualifier for the Swing plugin's event bus.
+ * Event bus for the Swing UI, only allows {@link SwingEvent}s.
  */
-@Qualifier
-public @interface SwingEventBus {
-}
+@Singleton
+public class SwingEventBus extends MBassador<SwingEvent> {
+
+    @Inject
+    public SwingEventBus() {
+        super(new BusConfiguration()
+                .addFeature(Feature.SyncPubSub.Default())
+                .addFeature(Feature.AsynchronousHandlerInvocation.Default())
+                .addFeature(Feature.AsynchronousMessageDispatch.Default()));
+    }
+}

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

 import com.dmdirc.addons.ui_swing.actions.PreviousFrameAction;
 import com.dmdirc.addons.ui_swing.components.TreeScroller;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.events.SwingWindowAddedEvent;
 import com.dmdirc.addons.ui_swing.events.SwingWindowDeletedEvent;
 import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeViewModel;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeViewNode;
-import com.dmdirc.addons.ui_swing.injection.SwingEventBus;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
             final ActiveFrameManager activeFrameManager,
             final MainFrame mainFrame,
             final DMDircMBassador eventBus,
-            @SwingEventBus final DMDircMBassador swingEventBus) {
+            final SwingEventBus swingEventBus) {
         this.eventBus = eventBus;
         nodes = new HashMap<>();
         model = new TreeViewModel(globalConfig, new TreeViewNode(null, null));

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

 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.TreeScroller;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.events.SwingWindowAddedEvent;
 import com.dmdirc.addons.ui_swing.events.SwingWindowDeletedEvent;
 import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
 import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
-import com.dmdirc.addons.ui_swing.injection.SwingEventBus;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.events.FrameIconChangedEvent;
 import com.dmdirc.events.NotificationClearedEvent;
     /** The event bus to post errors to. */
     private final DMDircMBassador eventBus;
     /** Swing event bus. */
-    private final DMDircMBassador swingEventBus;
+    private final SwingEventBus swingEventBus;
     /** Icon manager. */
     private final IconManager iconManager;
     /** display tree. */
             final SwingWindowFactory windowFactory,
             @PluginDomain(SwingController.class) final String domain,
             final DMDircMBassador eventBus,
-            @SwingEventBus final DMDircMBassador swingEventBus,
+            final SwingEventBus swingEventBus,
             @GlobalConfig final IconManager iconManager) {
         this.windowFactory = windowFactory;
         this.windowManager = windowManager;

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

 package com.dmdirc.addons.ui_swing.framemanager.windowmenu;
 
 import com.dmdirc.ClientModule;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
+import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.events.SwingWindowAddedEvent;
 import com.dmdirc.addons.ui_swing.events.SwingWindowDeletedEvent;
-import com.dmdirc.addons.ui_swing.injection.SwingEventBus;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.WindowManager;
 public class CloseActiveWindowMenuItem extends JMenuItem implements ActionListener {
 
     private final ActiveFrameManager activeFrameManager;
-    private final DMDircMBassador eventBus;
+    private final SwingEventBus eventBus;
     private final WindowManager windowManager;
 
     @Inject
     public CloseActiveWindowMenuItem(final ActiveFrameManager activeFrameManager,
             @ClientModule.GlobalConfig final IconManager iconManager,
-            @SwingEventBus final DMDircMBassador eventBus,
+            final SwingEventBus eventBus,
             final WindowManager windowManager) {
         super(iconManager.getIcon("close"));
         this.activeFrameManager = activeFrameManager;

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

 package com.dmdirc.addons.ui_swing.framemanager.windowmenu;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.events.SwingWindowAddedEvent;
 import com.dmdirc.addons.ui_swing.events.SwingWindowDeletedEvent;
-import com.dmdirc.addons.ui_swing.injection.SwingEventBus;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.plugins.PluginDomain;
     /** Window to item mapping. */
     private final Map<Window, AbstractButton> menuItems;
     /** Swing event bus. */
-    private final DMDircMBassador swingEventBus;
+    private final SwingEventBus swingEventBus;
     /** Close menu item. */
     private final CloseActiveWindowMenuItem closeMenuItem;
     /** Global config. */
     @Inject
     public WindowMenuFrameManager(@GlobalConfig final AggregateConfigProvider globalConfig,
             @PluginDomain(SwingController.class) final String domain,
-            @SwingEventBus final DMDircMBassador swingEventBus,
+            final SwingEventBus swingEventBus,
             final CloseActiveWindowMenuItem closeMenuItem,
             final WindowActionFactory windowActionFactory,
             final WindowSelectionFontChangerFactory windowSelectionFontChanger,

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

 
 package com.dmdirc.addons.ui_swing.framemanager.windowmenu;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
+import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.events.SwingWindowAddedEvent;
 import com.dmdirc.addons.ui_swing.events.SwingWindowDeletedEvent;
-import com.dmdirc.addons.ui_swing.injection.SwingEventBus;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.ui.WindowManager;
 
 public class WindowMenuSeparator extends JPopupMenu.Separator implements ActionListener {
 
     private final ActiveFrameManager activeFrameManager;
-    private final DMDircMBassador eventBus;
+    private final SwingEventBus eventBus;
     private final WindowManager windowManager;
 
     @Inject
     public WindowMenuSeparator(final ActiveFrameManager activeFrameManager,
-            @SwingEventBus final DMDircMBassador eventBus,
+            final SwingEventBus eventBus,
             final WindowManager windowManager) {
         this.activeFrameManager = activeFrameManager;
         this.eventBus = eventBus;

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

 
 package com.dmdirc.addons.ui_swing.framemanager.windowmenu;
 
-import com.dmdirc.DMDircMBassador;
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
+import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.interfaces.ui.Window;
     }
 
     public void init(final ActiveFrameManager activeFrameMaanger,
-            final DMDircMBassador eventBus) {
+            final SwingEventBus eventBus) {
         eventBus.subscribe(this);
         selectionChanged(new SwingWindowSelectedEvent(
                 Optional.ofNullable((Window) activeFrameMaanger.getActiveFrame())));

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

 
 package com.dmdirc.addons.ui_swing.framemanager.windowmenu;
 
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.addons.ui_swing.injection.SwingEventBus;
+import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.interfaces.ui.Window;
 
 public class WindowSelectionFontChangerFactory {
 
     private final ActiveFrameManager activeFrameManager;
-    private final DMDircMBassador swingEventBus;
+    private final SwingEventBus swingEventBus;
 
     @Inject
     public WindowSelectionFontChangerFactory(final ActiveFrameManager activeFrameManager,
-            @SwingEventBus final DMDircMBassador swingEventBus) {
+            final SwingEventBus swingEventBus) {
         this.activeFrameManager = activeFrameManager;
         this.swingEventBus = swingEventBus;
     }

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

 import com.dmdirc.addons.ui_swing.components.statusbar.UpdaterLabel;
 import com.dmdirc.addons.ui_swing.dialogs.prefs.URLConfigPanel;
 import com.dmdirc.addons.ui_swing.dialogs.prefs.UpdateConfigPanel;
+import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
 import com.dmdirc.addons.ui_swing.framemanager.FrameManagerProvider;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeFrameManagerProvider;
         this.domain = domain;
     }
 
-    @Provides
-    @Singleton
-    @SwingEventBus
-    public DMDircMBassador getSwingEventBus() {
-        return new DMDircMBassador();
-    }
-
     @Provides
     @PluginDomain(SwingController.class)
     public String getSettingsDomain() {
             final URLBuilder urlBuilder,
             final Provider<FrameManager> frameManagerProvider,
             final DMDircMBassador eventBus,
-            @SwingEventBus final DMDircMBassador swingEventBus) {
+            final SwingEventBus swingEventBus) {
         return UIUtilities.invokeAndWait(new Callable<MainFrame>() {
 
             @Override

windowstatus/src/com/dmdirc/addons/windowstatus/WindowStatusManager.java

 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
-import com.dmdirc.addons.ui_swing.injection.SwingEventBus;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.events.StatusBarComponentAddedEvent;
 import com.dmdirc.events.StatusBarComponentRemovedEvent;
     /** The event bus to post events to. */
     private final DMDircMBassador eventBus;
     /** The swing event bus to register for events on. */
-    private final DMDircMBassador swingEventBus;
+    private final SwingEventBus swingEventBus;
     /** The panel we use in the status bar. */
     private WindowStatusPanel panel;
     /** Should we show the real name in queries? */
             final IdentityController identityController,
             @PluginDomain(WindowStatusPlugin.class) final String domain,
             final DMDircMBassador eventBus,
-            @SwingEventBus final DMDircMBassador swingEventBus) {
+            final SwingEventBus swingEventBus) {
         this.domain = domain;
         this.activeFrameManager = activeFrameManager;
         this.identityController = identityController;