Switch to events for selection.

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

@@ -26,8 +26,10 @@ import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
-import com.dmdirc.addons.ui_swing.SelectionListener;
+import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+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;
@@ -52,15 +54,18 @@ import javax.inject.Provider;
 import javax.inject.Singleton;
 
 import net.engio.mbassy.listener.Handler;
+import net.engio.mbassy.listener.Invoke;
 
 /**
  * Manages the lifecycle of the lag display plugin.
  */
 @Singleton
-public class LagDisplayManager implements ConfigChangeListener, SelectionListener {
+public class LagDisplayManager implements ConfigChangeListener {
 
     /** Event bus to receive events on. */
     private final DMDircMBassador eventBus;
+    /** Swing event bus to receive events from. */
+    private final DMDircMBassador swingEventBus;
     /** Active frame manager. */
     private final ActiveFrameManager activeFrameManager;
     private final Provider<LagDisplayPanel> panelProvider;
@@ -83,11 +88,13 @@ public class LagDisplayManager implements ConfigChangeListener, SelectionListene
 
     @Inject
     public LagDisplayManager(final DMDircMBassador eventBus,
+            @SwingEventBus final DMDircMBassador swingEventBus,
             final ActiveFrameManager activeFrameManager,
             final Provider<LagDisplayPanel> panelProvider,
             @PluginDomain(LagDisplayPlugin.class) final String domain,
             @GlobalConfig final AggregateConfigProvider globalConfig) {
         this.eventBus = eventBus;
+        this.swingEventBus = swingEventBus;
         this.activeFrameManager = activeFrameManager;
         this.panelProvider = panelProvider;
         this.domain = domain;
@@ -97,16 +104,16 @@ public class LagDisplayManager implements ConfigChangeListener, SelectionListene
     public void load() {
         panel = panelProvider.get();
         eventBus.publishAsync(new StatusBarComponentAddedEvent(panel));
-        activeFrameManager.addSelectionListener(this);
         globalConfig.addChangeListener(domain, this);
         readConfig();
+        swingEventBus.subscribe(this);
         eventBus.subscribe(this);
     }
 
     public void unload() {
         eventBus.publishAsync(new StatusBarComponentRemovedEvent(panel));
-        activeFrameManager.removeSelectionListener(this);
         globalConfig.removeListener(this);
+        swingEventBus.unsubscribe(this);
         eventBus.unsubscribe(this);
         panel = null;
     }
@@ -152,15 +159,17 @@ public class LagDisplayManager implements ConfigChangeListener, SelectionListene
         return showLabels;
     }
 
-    @Override
-    public void selectionChanged(final TextFrame window) {
-        final FrameContainer source = window.getContainer();
-        if (source == null || source.getConnection() == null) {
-            panel.getComponent().setText("Unknown");
-        } else if (source.getConnection().getState() != ServerState.CONNECTED) {
-            panel.getComponent().setText("Not connected");
+    @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
+    public void selectionChanged(final SwingWindowSelectedEvent event) {
+        if (event.getWindow().isPresent()) {
+            final Connection connection = event.getWindow().get().getContainer().getConnection();
+            if (connection != null && connection.getState() != ServerState.CONNECTED) {
+                panel.getComponent().setText("Not connected");
+            } else {
+                panel.getComponent().setText(getTime(connection));
+            }
         } else {
-            panel.getComponent().setText(getTime(source.getConnection()));
+            panel.getComponent().setText("Unknown");
         }
         panel.refreshDialog();
     }

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

@@ -31,6 +31,7 @@ import com.dmdirc.addons.ui_swing.dialogs.ConfirmQuitDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 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.framemanager.FramemanagerPosition;
 import com.dmdirc.addons.ui_swing.framemanager.ctrltab.CtrlTabWindowManager;
@@ -44,11 +45,14 @@ import com.dmdirc.events.NotificationSetEvent;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.ui.CoreUIUtils;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.collections.ListenerList;
 import com.dmdirc.util.collections.QueuedLinkedHashSet;
 
+import com.google.common.base.Optional;
+
 import java.awt.Dimension;
 import java.awt.event.WindowEvent;
 import java.awt.event.WindowFocusListener;
@@ -98,6 +102,8 @@ public class MainFrame extends JFrame implements WindowListener, ConfigChangeLis
     private final Provider<FrameManager> frameManagerProvider;
     /** The bus to despatch events on. */
     private final DMDircMBassador eventBus;
+    /** Swing event bus to post events to. */
+    private final DMDircMBassador swingEventBus;
     /** The main application icon. */
     private ImageIcon imageIcon;
     /** The frame manager that's being used. */
@@ -133,6 +139,7 @@ public class MainFrame extends JFrame implements WindowListener, ConfigChangeLis
      * @param iconManager          The icon manager to use to get icons.
      * @param frameManagerProvider Provider to use to retrieve frame managers.
      * @param eventBus             The event bus to post events to.
+     * @param swingEventBus        The event bus to post swing events to.
      */
     public MainFrame(
             final Apple apple,
@@ -141,7 +148,8 @@ public class MainFrame extends JFrame implements WindowListener, ConfigChangeLis
             final Provider<QuitWorker> quitWorker,
             final IconManager iconManager,
             final Provider<FrameManager> frameManagerProvider,
-            final DMDircMBassador eventBus) {
+            final DMDircMBassador eventBus,
+            final DMDircMBassador swingEventBus) {
         checkOnEDT();
         this.apple = apple;
         this.lifecycleController = lifecycleController;
@@ -150,6 +158,7 @@ public class MainFrame extends JFrame implements WindowListener, ConfigChangeLis
         this.iconManager = iconManager;
         this.frameManagerProvider = frameManagerProvider;
         this.eventBus = eventBus;
+        this.swingEventBus = swingEventBus;
         version = globalConfig.getOption("version", "version");
         focusOrder = new QueuedLinkedHashSet<>();
     }
@@ -299,11 +308,11 @@ public class MainFrame extends JFrame implements WindowListener, ConfigChangeLis
             public void run() {
                 frameManagerPanel.removeAll();
                 if (mainFrameManager != null) {
-                    removeSelectionListener(mainFrameManager);
+                    swingEventBus.unsubscribe(mainFrameManager);
                 }
                 mainFrameManager = frameManagerProvider.get();
                 mainFrameManager.setParent(frameManagerPanel);
-                addSelectionListener(mainFrameManager);
+                swingEventBus.subscribe(mainFrameManager);
             }
         });
     }
@@ -561,24 +570,12 @@ public class MainFrame extends JFrame implements WindowListener, ConfigChangeLis
                     activeFrame.activateFrame();
                 }
 
-                for (final SelectionListener listener : listeners.get(
-                        SelectionListener.class)) {
-                    listener.selectionChanged(activeFrame);
-                }
+                swingEventBus.publish(
+                        new SwingWindowSelectedEvent(Optional.fromNullable((Window) activeFrame)));
             }
         });
     }
 
-    @Override
-    public void addSelectionListener(final SelectionListener listener) {
-        listeners.add(SelectionListener.class, listener);
-    }
-
-    @Override
-    public void removeSelectionListener(final SelectionListener listener) {
-        listeners.remove(SelectionListener.class, listener);
-    }
-
     @Handler
     public void doWindowAdded(final SwingWindowAddedEvent event) {
         final TextFrame window = event.getChildWindow();

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

@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.addons.ui_swing;
-
-import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-
-/**
- * An interface for objects interested in Swing UI window events.
- */
-public interface SwingWindowListener {
-
-    /**
-     * Called when a new window is added.
-     *
-     * @param parent The parent of the added window (may be null)
-     * @param window The window that was added
-     */
-    void windowAdded(final TextFrame parent, final TextFrame window);
-
-    /**
-     * Called when a new window was deleted.
-     *
-     * @param parent The parent of the added window (may be null)
-     * @param window The window that was deleted
-     */
-    void windowDeleted(final TextFrame parent, final TextFrame window);
-
-}

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

@@ -24,11 +24,11 @@ package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
-import com.dmdirc.addons.ui_swing.SelectionListener;
+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.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;
@@ -52,8 +52,7 @@ import net.engio.mbassy.listener.Handler;
  * Provides an MDI style bar for closing frames.
  */
 @Singleton
-public class MDIBar extends JPanel implements SelectionListener, ActionListener,
-        ConfigChangeListener {
+public class MDIBar extends JPanel implements ActionListener, ConfigChangeListener {
 
     /** A version number for this class. */
     private static final long serialVersionUID = -8028057596226636245L;
@@ -99,7 +98,6 @@ public class MDIBar extends JPanel implements SelectionListener, ActionListener,
 
         eventBus.subscribe(this);
 
-        activeFrameManager.addSelectionListener(this);
         closeButton.addActionListener(this);
         config.addChangeListener(configDomain, "mdiBarVisibility", this);
 
@@ -150,8 +148,8 @@ public class MDIBar extends JPanel implements SelectionListener, ActionListener,
         check();
     }
 
-    @Override
-    public void selectionChanged(final TextFrame window) {
+    @Handler(invocation = EdtHandlerInvocation.class)
+    public void selectionChanged(final SwingWindowSelectedEvent event) {
         check();
     }
 

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

@@ -25,10 +25,11 @@ package com.dmdirc.addons.ui_swing.components.statusbar;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.Invite;
+import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.MainFrame;
-import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.UIUtilities;
-import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+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;
@@ -51,11 +52,13 @@ import javax.swing.JPopupMenu;
 import javax.swing.JSeparator;
 
 import net.engio.mbassy.listener.Handler;
+import net.engio.mbassy.listener.Invoke;
 
 /**
  * A status bar component to show invites to the user and enable them to accept or dismiss them.
  */
-public class InviteLabel extends StatusbarPopupPanel<JLabel> implements InviteListener, ActionListener, SelectionListener {
+public class InviteLabel extends StatusbarPopupPanel<JLabel>
+        implements InviteListener, ActionListener {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
@@ -70,20 +73,13 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements InviteLi
     /** Active connection. */
     private Connection activeConnection;
 
-    /**
-     * Instantiates a new invite label.
-     *
-     * @param eventBus      The event bus to subscribe to events on
-     * @param iconManager   The manager to retrieve the invite icon from.
-     * @param connectionManager The manager to use to iterate servers.
-     * @param mainFrame     Main frame
-     */
     @Inject
     public InviteLabel(
             final DMDircMBassador eventBus,
             @GlobalConfig final IconManager iconManager,
             final ConnectionManager connectionManager,
-            final MainFrame mainFrame) {
+            final MainFrame mainFrame,
+            @SwingEventBus final DMDircMBassador swingEventBus) {
         super(new JLabel());
 
         this.parentWindow = mainFrame;
@@ -103,7 +99,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements InviteLi
             connection.addInviteListener(this);
         }
 
-        mainFrame.addSelectionListener(this);
+        swingEventBus.subscribe(this);
         eventBus.subscribe(this);
 
         update();
@@ -179,7 +175,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements InviteLi
 
     @Override
     public void mouseReleased(final MouseEvent e) {
-        super.mouseClicked(e);
+        mouseClicked(e);
         popuplateMenu();
         if (menu.getComponentCount() > 0) {
             menu.show(this, e.getX(), e.getY());
@@ -198,9 +194,13 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements InviteLi
         }
     }
 
-    @Override
-    public void selectionChanged(final TextFrame window) {
-        activeConnection = window == null ? null : window.getContainer().getConnection();
+    @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
+    public void selectionChanged(final SwingWindowSelectedEvent event) {
+        if (event.getWindow().isPresent()) {
+            activeConnection = event.getWindow().get().getContainer().getConnection();
+        } else {
+            activeConnection = null;
+        }
         update();
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/SelectionListener.java → ui_swing/src/com/dmdirc/addons/ui_swing/events/SwingWindowSelectedEvent.java

@@ -20,23 +20,24 @@
  * SOFTWARE.
  */
 
-package com.dmdirc.addons.ui_swing;
+package com.dmdirc.addons.ui_swing.events;
 
-import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.interfaces.ui.Window;
 
-import java.util.EventListener;
+import com.google.common.base.Optional;
 
 /**
- * Defines the methods that should be implemented by classes which wish to receive information about
- * Swing frame selection changes.
+ * Fired when the window selection changes.
  */
-public interface SelectionListener extends EventListener {
+public class SwingWindowSelectedEvent extends SwingEvent {
 
-    /**
-     * Called when a new window is selected.
-     *
-     * @param window The window that's now selected
-     */
-    void selectionChanged(final TextFrame window);
+    private final Optional<Window> selectedWindow;
 
+    public SwingWindowSelectedEvent(final Optional<Window> selectedWindow) {
+        this.selectedWindow = selectedWindow;
+    }
+
+    public Optional<Window> getWindow() {
+        return selectedWindow;
+    }
 }

ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/FrameManager.java

@@ -22,15 +22,13 @@
 
 package com.dmdirc.addons.ui_swing.framemanager;
 
-import com.dmdirc.addons.ui_swing.SelectionListener;
-
 import javax.swing.JComponent;
 
 /**
  * A frame manager is a widget that allows the user to navigate between the various frames that will
  * be open at any one time.
  */
-public interface FrameManager extends SelectionListener {
+public interface FrameManager {
 
     /**
      * Sets the parent component of this frame manager. The frame manager should render itself

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

@@ -33,8 +33,10 @@ import com.dmdirc.addons.ui_swing.actions.CloseFrameContainerAction;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 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.framemanager.FramemanagerPosition;
+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.FrameNameChangedEvent;
@@ -134,13 +136,15 @@ public final class ButtonBar implements FrameManager, ActionListener, ComponentL
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final WindowManager windowManager,
             final ActiveFrameManager activeFrameManager,
-            final DMDircMBassador eventBus) {
+            final DMDircMBassador eventBus,
+            @SwingEventBus final DMDircMBassador swingEventBus) {
         this.windowFactory = windowFactory;
         this.globalConfig = globalConfig;
         this.windowManager = windowManager;
         this.activeFrameManager = activeFrameManager;
 
         eventBus.subscribe(this);
+        swingEventBus.subscribe(this);
 
         scrollPane = new JScrollPane();
         scrollPane.setBorder(null);
@@ -209,7 +213,8 @@ public final class ButtonBar implements FrameManager, ActionListener, ComponentL
 
                 final TextFrame activeFrame = activeFrameManager.getActiveFrame();
                 if (activeFrame != null) {
-                    selectionChanged(activeFrame);
+                    selectionChanged(new SwingWindowSelectedEvent(
+                            Optional.fromNullable((Window) activeFrame)));
                 }
                 parent.setVisible(true);
             }
@@ -391,27 +396,20 @@ public final class ButtonBar implements FrameManager, ActionListener, ComponentL
                 event.getWindow().getNotification().or(Colour.BLACK)));
     }
 
-    @Override
-    public void selectionChanged(final TextFrame window) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                activeWindow = window;
-                final FrameToggleButton selectedButton = getButton(selected);
-                if (selected != null && selectedButton != null) {
-                    selectedButton.setSelected(false);
-                }
+    @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
+    public void selectionChanged(final SwingWindowSelectedEvent event) {
+        activeWindow = event.getWindow().orNull();
+        final FrameToggleButton selectedButton = getButton(selected);
+        if (selected != null && selectedButton != null) {
+            selectedButton.setSelected(false);
+        }
 
-                selected = window.getContainer();
-                final FrameToggleButton button = getButton(window.getContainer());
-                if (button != null) {
-                    scrollPane.getViewport().scrollRectToVisible(
-                            button.getBounds());
-                    button.setSelected(true);
-                }
-            }
-        });
+        selected = activeWindow == null ? null : activeWindow.getContainer();
+        final FrameToggleButton button = getButton(event.getWindow().get().getContainer());
+        if (button != null) {
+            scrollPane.getViewport().scrollRectToVisible(button.getBounds());
+            button.setSelected(true);
+        }
     }
 
     @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)

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

@@ -24,8 +24,8 @@ package com.dmdirc.addons.ui_swing.framemanager.ctrltab;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.DMDircMBassador;
+import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
 import com.dmdirc.addons.ui_swing.MainFrame;
-import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.NextFrameAction;
@@ -34,8 +34,10 @@ import com.dmdirc.addons.ui_swing.components.TreeScroller;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 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;
@@ -58,12 +60,13 @@ import javax.swing.tree.TreePath;
 import javax.swing.tree.TreeSelectionModel;
 
 import net.engio.mbassy.listener.Handler;
+import net.engio.mbassy.listener.Invoke;
 
 /**
  * A Window manager to handle ctrl[+shift]+tab switching between windows.
  */
 @Singleton
-public class CtrlTabWindowManager implements SelectionListener {
+public class CtrlTabWindowManager {
 
     /** Node storage, used for adding and deleting nodes correctly. */
     private final Map<Window, TreeViewNode> nodes;
@@ -76,22 +79,14 @@ public class CtrlTabWindowManager implements SelectionListener {
     /** The event bus to post errors to. */
     private final DMDircMBassador eventBus;
 
-    /**
-     * Creates a new ctrl tab window manager.
-     *
-     * @param globalConfig       The configuration to read settings from.
-     * @param windowFactory      The window factory to use to create and listen for windows.
-     * @param mainFrame          The main frame that owns this window manager
-     * @param activeFrameManager Active frame manager.
-     * @param eventBus           The eventBus to post errors to
-     */
     @Inject
     public CtrlTabWindowManager(
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final SwingWindowFactory windowFactory,
             final ActiveFrameManager activeFrameManager,
             final MainFrame mainFrame,
-            final DMDircMBassador eventBus) {
+            final DMDircMBassador eventBus,
+            @SwingEventBus final DMDircMBassador swingEventBus) {
         this.eventBus = eventBus;
         nodes = new HashMap<>();
         model = new TreeViewModel(globalConfig, new TreeViewNode(null, null));
@@ -106,7 +101,7 @@ public class CtrlTabWindowManager implements SelectionListener {
             }
         };
 
-        activeFrameManager.addSelectionListener(this);
+        swingEventBus.subscribe(this);
 
         if (mainFrame.getRootPane().getActionMap() != null) {
             mainFrame.getRootPane().getActionMap()
@@ -183,19 +178,16 @@ public class CtrlTabWindowManager implements SelectionListener {
         treeScroller.changeFocus(false);
     }
 
-    @Override
-    public void selectionChanged(final TextFrame window) {
-        UIUtilities.invokeLater(new Runnable() {
-
-            @Override
-            public void run() {
-                final TreeNode[] path = model.getPathToRoot(nodes.get(
-                        window));
-                if (path != null && path.length > 0) {
-                    selectionModel.setSelectionPath(new TreePath(path));
-                }
+    @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
+    public void selectionChanged(final SwingWindowSelectedEvent event) {
+        if (event.getWindow().isPresent()) {
+            final TreeNode[] path = model.getPathToRoot(nodes.get(event.getWindow().get()));
+            if (path != null && path.length > 0) {
+                selectionModel.setSelectionPath(new TreePath(path));
             }
-        });
+        } else {
+            selectionModel.setSelectionPath(null);
+        }
     }
 
 }

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

@@ -23,10 +23,9 @@
 package com.dmdirc.addons.ui_swing.framemanager.tree;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.ImageButton;
-import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
 import com.dmdirc.events.FrameIconChangedEvent;
 import com.dmdirc.events.FrameNameChangedEvent;
 import com.dmdirc.events.NotificationSetEvent;
@@ -48,7 +47,7 @@ import net.engio.mbassy.listener.Handler;
 /**
  * Node label.
  */
-public class NodeLabel extends JPanel implements SelectionListener {
+public class NodeLabel extends JPanel {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
@@ -100,9 +99,10 @@ public class NodeLabel extends JPanel implements SelectionListener {
         selected = false;
     }
 
-    @Override
-    public void selectionChanged(final TextFrame window) {
-        selected = this.window.equals(window.getContainer());
+    @Handler
+    public void selectionChanged(final SwingWindowSelectedEvent event) {
+        selected = event.getWindow().isPresent()
+                && window.equals(event.getWindow().get().getContainer());
     }
 
     public void notificationSet(final NotificationSetEvent event) {

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

@@ -33,6 +33,7 @@ import com.dmdirc.addons.ui_swing.components.TreeScroller;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 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;
@@ -42,16 +43,18 @@ import com.dmdirc.events.NotificationSetEvent;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
+import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.plugins.PluginDomain;
-import com.dmdirc.util.colours.Colour;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.ColourManager;
+import com.dmdirc.util.colours.Colour;
+
+import com.google.common.base.Optional;
 
 import java.awt.Rectangle;
 import java.awt.event.MouseEvent;
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -240,6 +243,7 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
             public void run() {
                 final NodeLabel label = new NodeLabel(window);
                 eventBus.subscribe(label);
+                swingEventBus.subscribe(label);
                 final TreeViewNode node = new TreeViewNode(label, window);
                 synchronized (nodes) {
                     nodes.put(window, node);
@@ -339,29 +343,22 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
                 }
 
                 if (activeFrameManager.getActiveFrame() != null) {
-                    selectionChanged(activeFrameManager.getActiveFrame());
+                    selectionChanged(new SwingWindowSelectedEvent(Optional.fromNullable((Window)
+                            activeFrameManager.getActiveFrame())));
                 }
             }
         });
     }
 
-    @Override
-    public void selectionChanged(final TextFrame window) {
-        synchronized (nodes) {
-            final Iterable<TreeViewNode> collection = new ArrayList<>(nodes.values());
-            for (TreeViewNode treeNode : collection) {
-                final NodeLabel label = treeNode.getLabel();
-                label.selectionChanged(window);
-            }
-        }
-
-        if (window != null) {
+    @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
+    public void selectionChanged(final SwingWindowSelectedEvent event) {
+        if (event.getWindow().isPresent()) {
             UIUtilities.invokeLater(new Runnable() {
 
                 @Override
                 public void run() {
                     final TreeNode[] treePath = ((DefaultTreeModel) tree.getModel())
-                            .getPathToRoot(nodes.get(window.getContainer()));
+                            .getPathToRoot(nodes.get(event.getWindow().get().getContainer()));
                     if (treePath != null && treePath.length > 0) {
                         final TreePath path = new TreePath(treePath);
                         tree.setTreePath(path);

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

@@ -22,20 +22,29 @@
 
 package com.dmdirc.addons.ui_swing.framemanager.windowmenu;
 
-import com.dmdirc.addons.ui_swing.SelectionListener;
-import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.DMDircMBassador;
+import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
+import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.interfaces.ui.Window;
 
+import com.google.common.base.Optional;
+
 import java.awt.Font;
 
 import javax.swing.JComponent;
 import javax.swing.UIManager;
 
+import net.engio.mbassy.listener.Handler;
+import net.engio.mbassy.listener.Invoke;
+import net.engio.mbassy.listener.Listener;
+import net.engio.mbassy.listener.References;
+
 /**
  * Changes the font for a JComponent on a selection change.
  */
-public class WindowSelectionFontChanger implements SelectionListener {
+@Listener(references = References.Strong)
+public class WindowSelectionFontChanger {
 
     private final JComponent component;
     private final Window window;
@@ -45,15 +54,17 @@ public class WindowSelectionFontChanger implements SelectionListener {
         this.window = window;
     }
 
-    public void init(final ActiveFrameManager activeFrameMaanger) {
-        activeFrameMaanger.addSelectionListener(this);
-        selectionChanged(activeFrameMaanger.getActiveFrame());
+    public void init(final ActiveFrameManager activeFrameMaanger,
+            final DMDircMBassador eventBus) {
+        eventBus.subscribe(this);
+        selectionChanged(new SwingWindowSelectedEvent(
+                Optional.fromNullable((Window) activeFrameMaanger.getActiveFrame())));
     }
 
-    @Override
-    public void selectionChanged(final TextFrame window) {
+    @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
+    public void selectionChanged(final SwingWindowSelectedEvent event) {
         // TODO: Check children and set italic
-        if (this.window.equals(window)) {
+        if (event.getWindow().isPresent() && window.equals(event.getWindow().get())) {
             component.setFont(UIManager.getFont("MenuItem.font").deriveFont(Font.BOLD));
         } else {
             component.setFont(UIManager.getFont("MenuItem.font").deriveFont(Font.PLAIN));

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

@@ -22,6 +22,8 @@
 
 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.interfaces.ActiveFrameManager;
 import com.dmdirc.interfaces.ui.Window;
 
@@ -34,17 +36,20 @@ import javax.swing.JComponent;
 public class WindowSelectionFontChangerFactory {
 
     private final ActiveFrameManager activeFrameManager;
+    private final DMDircMBassador swingEventBus;
 
     @Inject
-    public WindowSelectionFontChangerFactory(final ActiveFrameManager activeFrameManager) {
+    public WindowSelectionFontChangerFactory(final ActiveFrameManager activeFrameManager,
+            @SwingEventBus final DMDircMBassador swingEventBus) {
         this.activeFrameManager = activeFrameManager;
+        this.swingEventBus = swingEventBus;
     }
 
     public WindowSelectionFontChanger getWindowSelectionFontChanger(final JComponent component,
             final Window window) {
         final WindowSelectionFontChanger windowSelectionFontChanger
                 = new WindowSelectionFontChanger(component, window);
-        windowSelectionFontChanger.init(activeFrameManager);
+        windowSelectionFontChanger.init(activeFrameManager, swingEventBus);
         return windowSelectionFontChanger;
     }
 }

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

@@ -140,7 +140,8 @@ public class SwingModule {
             final Provider<QuitWorker> quitWorker,
             final URLBuilder urlBuilder,
             final Provider<FrameManager> frameManagerProvider,
-            final DMDircMBassador eventBus) {
+            final DMDircMBassador eventBus,
+            @SwingEventBus final DMDircMBassador swingEventBus) {
         return UIUtilities.invokeAndWait(new Callable<MainFrame>() {
 
             @Override
@@ -152,7 +153,8 @@ public class SwingModule {
                         quitWorker,
                         new IconManager(globalConfig, urlBuilder),
                         frameManagerProvider,
-                        eventBus);
+                        eventBus,
+                        swingEventBus);
             }
         });
     }

ui_swing/src/com/dmdirc/addons/ui_swing/interfaces/ActiveFrameManager.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.interfaces;
 
-import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 
 /**
@@ -44,24 +43,4 @@ public interface ActiveFrameManager {
      */
     void setActiveFrame(TextFrame activeFrame);
 
-    /**
-     * Registers a new selection listener with this frame. The listener will be notified whenever
-     * the currently selected frame is changed.
-     *
-     * @param listener The listener to be added
-     *
-     * @see #setActiveFrame(com.dmdirc.addons.ui_swing.components.frames.TextFrame)
-     * @see #getActiveFrame()
-     */
-    void addSelectionListener(SelectionListener listener);
-
-    /**
-     * Removes a previously registered selection listener.
-     *
-     * @param listener The listener to be removed
-     *
-     * @see #addSelectionListener(com.dmdirc.addons.ui_swing.SelectionListener)
-     */
-    void removeSelectionListener(SelectionListener listener);
-
 }

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

@@ -26,9 +26,11 @@ import com.dmdirc.Channel;
 import com.dmdirc.DMDircMBassador;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
-import com.dmdirc.addons.ui_swing.SelectionListener;
+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.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;
@@ -44,10 +46,13 @@ import java.util.concurrent.Callable;
 
 import javax.inject.Inject;
 
+import net.engio.mbassy.listener.Handler;
+import net.engio.mbassy.listener.Invoke;
+
 /**
  * Displays information related to the current window in the status bar.
  */
-public class WindowStatusManager implements ConfigChangeListener, SelectionListener {
+public class WindowStatusManager implements ConfigChangeListener {
 
     /** Active frame manager. */
     private final ActiveFrameManager activeFrameManager;
@@ -57,6 +62,8 @@ public class WindowStatusManager implements ConfigChangeListener, SelectionListe
     private final String domain;
     /** The event bus to post events to. */
     private final DMDircMBassador eventBus;
+    /** The swing event bus to register for events on. */
+    private final DMDircMBassador swingEventBus;
     /** The panel we use in the status bar. */
     private WindowStatusPanel panel;
     /** Should we show the real name in queries? */
@@ -70,11 +77,13 @@ public class WindowStatusManager implements ConfigChangeListener, SelectionListe
     public WindowStatusManager(final ActiveFrameManager activeFrameManager,
             final IdentityController identityController,
             @PluginDomain(WindowStatusPlugin.class) final String domain,
-            final DMDircMBassador eventBus) {
+            final DMDircMBassador eventBus,
+            @SwingEventBus final DMDircMBassador swingEventBus) {
         this.domain = domain;
         this.activeFrameManager = activeFrameManager;
         this.identityController = identityController;
         this.eventBus = eventBus;
+        this.swingEventBus = swingEventBus;
     }
 
     /**
@@ -89,7 +98,7 @@ public class WindowStatusManager implements ConfigChangeListener, SelectionListe
             }
         });
         eventBus.publishAsync(new StatusBarComponentAddedEvent(panel));
-        activeFrameManager.addSelectionListener(this);
+        swingEventBus.subscribe(this);
         identityController.getGlobalConfiguration().addChangeListener(domain, this);
         updateCache();
     }
@@ -98,15 +107,15 @@ public class WindowStatusManager implements ConfigChangeListener, SelectionListe
      * Unloads the plugin.
      */
     public void onUnload() {
-        activeFrameManager.removeSelectionListener(this);
+        swingEventBus.unsubscribe(this);
         eventBus.publishAsync(new StatusBarComponentRemovedEvent(panel));
         panel = null;
     }
 
-    @Override
-    public void selectionChanged(final TextFrame window) {
-        if (window != null) {
-            updateStatus(window.getContainer());
+    @Handler(invocation = EdtHandlerInvocation.class, delivery = Invoke.Asynchronously)
+    public void selectionChanged(final SwingWindowSelectedEvent event) {
+        if (event.getWindow().isPresent()) {
+            updateStatus(event.getWindow().get().getContainer());
         }
     }