Use active window frame manager.

Change-Id: I9b37249813c03941cdd410a5b225f3d710a72244
Reviewed-on: http://gerrit.dmdirc.com/3323
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/activewindow/ActiveCommand.java

@@ -24,8 +24,8 @@ package com.dmdirc.addons.activewindow;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.commandparser.BaseCommandInfo;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandInfo;
@@ -48,26 +48,27 @@ public class ActiveCommand extends Command implements IntelligentCommand {
     public static final CommandInfo INFO = new BaseCommandInfo("active",
             "active <command> - executes the command as though it had been "
             + "executed in the active window", CommandType.TYPE_GLOBAL);
-    /** Parent MainFrame. */
-    private final MainFrame mainFrame;
+    /** Active frame manager. */
+    private final ActiveFrameManager activeFrameManager;
 
     /**
      * Creates a new active command.
      *
-     * @param controller The controller to use for command information.
-     * @param mainFrame  Parent MainFrame
+     * @param controller          The controller to use for command information.
+     * @param activeFrameManager The active window manager
      */
     @Inject
-    public ActiveCommand(final CommandController controller, final MainFrame mainFrame) {
+    public ActiveCommand(final CommandController controller,
+            final ActiveFrameManager activeFrameManager) {
         super(controller);
 
-        this.mainFrame = mainFrame;
+        this.activeFrameManager = activeFrameManager;
     }
 
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        final TextFrame frame = mainFrame.getActiveFrame();
+        final TextFrame frame = activeFrameManager.getActiveFrame();
         if (frame.getContainer() instanceof WritableFrameContainer) {
             ((WritableFrameContainer) frame.getContainer()).getCommandParser()
                     .parseCommand(frame.getContainer(),

src/com/dmdirc/addons/activewindow/ActiveWindowMessageSink.java

@@ -23,8 +23,8 @@
 package com.dmdirc.addons.activewindow;
 
 import com.dmdirc.WritableFrameContainer;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.messages.MessageSink;
 import com.dmdirc.messages.MessageSinkManager;
 
@@ -40,17 +40,17 @@ public class ActiveWindowMessageSink implements MessageSink {
 
     /** The pattern to use to match this sink. */
     private static final Pattern PATTERN = Pattern.compile("active");
-    /** The main frame to use to get the currently active frame. */
-    private final MainFrame mainFrame;
+    /** Active frame manager. */
+    private final ActiveFrameManager activeFrameManager;
 
     /**
      * Creates a new ActiveWindowMessageSink for the specified mainframe.
      *
-     * @param mainFrame The mainframe to use to retrieve active windows
+     * @param activeFrameManager Active frame manager.
      */
     @Inject
-    public ActiveWindowMessageSink(final MainFrame mainFrame) {
-        this.mainFrame = mainFrame;
+    public ActiveWindowMessageSink(final ActiveFrameManager activeFrameManager) {
+        this.activeFrameManager = activeFrameManager;
     }
 
     @Override
@@ -62,7 +62,7 @@ public class ActiveWindowMessageSink implements MessageSink {
     public void handleMessage(final MessageSinkManager despatcher,
             final WritableFrameContainer source, final String[] patternMatches,
             final Date date, final String messageType, final Object... args) {
-        final TextFrame frame = mainFrame.getActiveFrame();
+        final TextFrame frame = activeFrameManager.getActiveFrame();
         if (frame.getContainer() instanceof WritableFrameContainer) {
             frame.getContainer().addLine(messageType, date, args);
         }

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

@@ -27,10 +27,10 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.actions.ActionType;
@@ -54,9 +54,8 @@ import javax.inject.Singleton;
 @Singleton
 public class LagDisplayManager implements ActionListener, ConfigChangeListener, SelectionListener {
 
-    /** Frame to listen to selection events on. */
-    // TODO: Selection/focus management should be behind an interface
-    private final MainFrame mainFrame;
+    /** Active frame manager. */
+    private final ActiveFrameManager activeFrameManager;
     /** Status bar to add panels to. */
     private final SwingStatusBar statusBar;
     private final Provider<LagDisplayPanel> panelProvider;
@@ -79,12 +78,12 @@ public class LagDisplayManager implements ActionListener, ConfigChangeListener,
 
     @Inject
     public LagDisplayManager(
-            final MainFrame mainFrame,
+            final ActiveFrameManager activeFrameManager,
             final SwingStatusBar statusBar,
             final Provider<LagDisplayPanel> panelProvider,
             @PluginDomain(LagDisplayPlugin.class) final String domain,
             @GlobalConfig final AggregateConfigProvider globalConfig) {
-        this.mainFrame = mainFrame;
+        this.activeFrameManager = activeFrameManager;
         this.statusBar = statusBar;
         this.panelProvider = panelProvider;
         this.domain = domain;
@@ -94,7 +93,7 @@ public class LagDisplayManager implements ActionListener, ConfigChangeListener,
     public void load() {
         panel = panelProvider.get();
         statusBar.addComponent(panel);
-        mainFrame.addSelectionListener(this);
+        activeFrameManager.addSelectionListener(this);
         globalConfig.addChangeListener(domain, this);
         readConfig();
         ActionManager.getActionManager().registerListener(this,
@@ -105,7 +104,7 @@ public class LagDisplayManager implements ActionListener, ConfigChangeListener,
 
     public void unload() {
         statusBar.removeComponent(panel);
-        mainFrame.removeSelectionListener(this);
+        activeFrameManager.removeSelectionListener(this);
         globalConfig.removeListener(this);
         ActionManager.getActionManager().unregisterListener(this);
         panel = null;
@@ -179,7 +178,7 @@ public class LagDisplayManager implements ActionListener, ConfigChangeListener,
             }
         }
 
-        final TextFrame activeFrame = mainFrame.getActiveFrame();
+        final TextFrame activeFrame = activeFrameManager.getActiveFrame();
         final FrameContainer active = activeFrame == null ? null
                 : activeFrame.getContainer();
         final boolean isActive = active != null

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.lagdisplay;
 
-import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.util.collections.RollingList;
 
 import java.awt.Color;
@@ -41,11 +41,7 @@ import javax.swing.JPanel;
  */
 public class PingHistoryPanel extends JPanel {
 
-    /**
-     * A version number for this class. It should be changed whenever the class structure is changed
-     * (or anything else that would prevent serialized objects being unserialized with the new
-     * class).
-     */
+    /** A version number for this class. */
     private static final long serialVersionUID = 1;
     /** The manager that this panel is for. */
     protected final LagDisplayManager manager;
@@ -57,19 +53,18 @@ public class PingHistoryPanel extends JPanel {
     /**
      * Creates a new history panel for the specified plugin.
      *
-     * @param manager   The manager that owns this panel
-     * @param mainFrame Swing main frame
+     * @param manager            The manager that owns this panel
+     * @param activeFrameManager Active frame manager.
      */
     public PingHistoryPanel(final LagDisplayManager manager,
-            final MainFrame mainFrame) {
-        super();
-
+            final ActiveFrameManager activeFrameManager) {
         setMinimumSize(new Dimension(50, 100));
         setMaximumSize(new Dimension(Integer.MAX_VALUE, 100));
         setOpaque(false);
 
         this.manager = manager;
-        history = manager.getHistory(mainFrame.getActiveFrame().getContainer().getConnection());
+        history = manager.getHistory(activeFrameManager.getActiveFrame().getContainer().
+                getConnection());
 
         for (Long value : history.getList()) {
             maximum = Math.max(value, maximum);

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.FrameContainer;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.events.LinkChannelClickedEvent;
 import com.dmdirc.events.LinkNicknameClickedEvent;
 import com.dmdirc.events.LinkUrlClickedEvent;
@@ -33,7 +34,6 @@ import com.dmdirc.ui.core.util.URLHandler;
 import com.google.common.eventbus.Subscribe;
 
 import javax.inject.Inject;
-import javax.inject.Provider;
 import javax.inject.Singleton;
 
 /**
@@ -43,16 +43,16 @@ import javax.inject.Singleton;
 public class SwingLinkHandler {
 
     private final URLHandler urlHandler;
-    private final Provider<MainFrame> mainFrame;
+    private final ActiveFrameManager activeFrameManager;
     private final SwingWindowFactory windowFactory;
 
     @Inject
     public SwingLinkHandler(
-            final Provider<MainFrame> mainFrame,
+            final ActiveFrameManager activeFrameManager,
             final URLHandler urlHandler,
             final SwingWindowFactory windowFactory) {
         this.urlHandler = urlHandler;
-        this.mainFrame = mainFrame;
+        this.activeFrameManager = activeFrameManager;
         this.windowFactory = windowFactory;
     }
 
@@ -75,7 +75,7 @@ public class SwingLinkHandler {
         final FrameContainer container = event.getWindow().getContainer();
         final Connection connection = container.getConnection();
         if (connection != null) {
-            mainFrame.get().setActiveFrame(
+            activeFrameManager.setActiveFrame(
                     windowFactory.getSwingWindow(connection.getQuery(event.getTarget())));
         }
     }

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

@@ -31,6 +31,7 @@ import com.dmdirc.addons.ui_swing.components.frames.CustomFrameFactory;
 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.interfaces.ActiveFrameManager;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
 import com.dmdirc.interfaces.ui.FrameListener;
 import com.dmdirc.logger.ErrorLevel;
@@ -61,15 +62,15 @@ public class SwingWindowFactory implements FrameListener {
     private final Map<Collection<String>, WindowProvider> implementations = new HashMap<>();
     /** A map of frame containers to their Swing windows. */
     private final Map<FrameContainer, TextFrame> windows = new HashMap<>();
-    /** The provider to get the main frame to focus frames. */
-    private final Provider<MainFrame> mainFrameProvider;
+    /** Active window manager. */
+    private final Provider<ActiveFrameManager> activeFrameManager;
     /** Our list of listeners. */
     private final ListenerList listeners = new ListenerList();
 
     /**
      * Creates a new window factory for the specified controller.
      *
-     * @param mainFrameProvider       The provider to get the main frame to focus frames.
+     * @param activeFrameManager      The provider for the active frame manager.
      * @param customFrameFactory      The factory to use to produce custom frames.
      * @param customInputFrameFactory The factory to use to produce custom input frames.
      * @param serverFrameFactory      The factory to use to produce server frames.
@@ -78,13 +79,13 @@ public class SwingWindowFactory implements FrameListener {
      */
     @Inject
     public SwingWindowFactory(
-            final Provider<MainFrame> mainFrameProvider,
+            final Provider<ActiveFrameManager> activeFrameManager,
             final CustomFrameFactory customFrameFactory,
             final CustomInputFrameFactory customInputFrameFactory,
             final ServerFrameFactory serverFrameFactory,
             final ChannelFrameFactory channelFrameFactory,
             final GlobalCommandParser commandParser) {
-        this.mainFrameProvider = mainFrameProvider;
+        this.activeFrameManager = activeFrameManager;
 
         // TODO: Allow auto-factories to implement an interface and simplify this a bit.
         registerImplementation(
@@ -229,7 +230,7 @@ public class SwingWindowFactory implements FrameListener {
                 }
 
                 if (focus) {
-                    mainFrameProvider.get().setActiveFrame(childWindow);
+                    activeFrameManager.get().setActiveFrame(childWindow);
                 }
             }
         });

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

@@ -23,12 +23,12 @@
 package com.dmdirc.addons.ui_swing.components;
 
 import com.dmdirc.ClientModule.GlobalConfig;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.SwingWindowListener;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.plugins.PluginDomain;
@@ -61,8 +61,8 @@ public class MDIBar extends JPanel implements SwingWindowListener,
     private static final int ICON_SIZE = 12;
     /** Button to close frames. */
     private final NoFocusButton closeButton;
-    /** Main frame component bieng shown in. */
-    private final MainFrame mainFrame;
+    /** Active frame manager. */
+    private final ActiveFrameManager activeFrameManager;
     /** Config manager to get settings from. */
     private final AggregateConfigProvider config;
     /** Option domain. */
@@ -73,11 +73,11 @@ public class MDIBar extends JPanel implements SwingWindowListener,
     /**
      * Instantiates a new MDI bar.
      *
-     * @param globalConfig  The config to read settings from.
-     * @param iconManager   The manager to use to retrieve icons.
-     * @param domain        The domain to read settings from under.
-     * @param windowFactory The window factory to use to create and listen for windows.
-     * @param mainFrame     Main frame instance
+     * @param globalConfig       The config to read settings from.
+     * @param iconManager        The manager to use to retrieve icons.
+     * @param domain             The domain to read settings from under.
+     * @param windowFactory      The window factory to use to create and listen for windows.
+     * @param activeFrameManager Active frame manager.
      */
     @Inject
     public MDIBar(
@@ -85,10 +85,10 @@ public class MDIBar extends JPanel implements SwingWindowListener,
             @GlobalConfig final IconManager iconManager,
             @PluginDomain(SwingController.class) final String domain,
             final SwingWindowFactory windowFactory,
-            final MainFrame mainFrame) {
+            final ActiveFrameManager activeFrameManager) {
         super();
 
-        this.mainFrame = mainFrame;
+        this.activeFrameManager = activeFrameManager;
         this.config = globalConfig;
         this.configDomain = domain;
         visibility = config.getOptionBool(configDomain, "mdiBarVisibility");
@@ -101,7 +101,7 @@ public class MDIBar extends JPanel implements SwingWindowListener,
 
         windowFactory.addWindowListener(this);
 
-        mainFrame.addSelectionListener(this);
+        activeFrameManager.addSelectionListener(this);
         closeButton.addActionListener(this);
         config.addChangeListener(configDomain, "mdiBarVisibility", this);
 
@@ -121,7 +121,7 @@ public class MDIBar extends JPanel implements SwingWindowListener,
             @Override
             public void run() {
                 setVisible(visibility);
-                setEnabled(mainFrame.getActiveFrame() != null);
+                setEnabled(activeFrameManager.getActiveFrame() != null);
             }
         });
     }
@@ -143,11 +143,11 @@ public class MDIBar extends JPanel implements SwingWindowListener,
      */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        if (mainFrame.getActiveFrame() == null) {
+        if (activeFrameManager.getActiveFrame() == null) {
             return;
         }
         if (closeButton.equals(e.getSource())) {
-            mainFrame.getActiveFrame().getContainer().close();
+            activeFrameManager.getActiveFrame().getContainer().close();
         }
     }
 

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

@@ -35,6 +35,7 @@ import com.dmdirc.addons.ui_swing.actions.NicknameCopyAction;
 import com.dmdirc.addons.ui_swing.actions.SearchAction;
 import com.dmdirc.addons.ui_swing.components.SwingSearchBar;
 import com.dmdirc.addons.ui_swing.dialogs.paste.PasteDialogFactory;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.addons.ui_swing.textpane.ClickTypeValue;
 import com.dmdirc.addons.ui_swing.textpane.MouseEventType;
 import com.dmdirc.addons.ui_swing.textpane.TextPane;
@@ -87,11 +88,7 @@ import net.miginfocom.swing.MigLayout;
 public abstract class TextFrame extends JPanel implements Window,
         ConfigChangeListener, TextPaneListener, FrameCloseListener {
 
-    /**
-     * A version number for this class. It should be changed whenever the class structure is changed
-     * (or anything else that would prevent serialized objects being unserialized with the new
-     * class).
-     */
+    /** A version number for this class. */
     private static final long serialVersionUID = 5;
     /** The channel object that owns this frame. */
     protected final FrameContainer frameParent;
@@ -101,17 +98,15 @@ public abstract class TextFrame extends JPanel implements Window,
     private SwingSearchBar searchBar;
     /** Command parser for popup commands. */
     private final CommandParser commandParser;
-    /** Main frame to use to activate/deactivate windows. */
-    private final Provider<MainFrame> mainFrame;
+    /** Manager used to activate/deactivate windows. */
+    private final ActiveFrameManager activeFrameManager;
     /** Manager to use for building popups. */
     private final PopupManager popupManager;
     /** Bus to despatch events on. */
     private final EventBus eventBus;
     /** Boolean to determine if this frame should be popped out of main client. */
     private boolean popout;
-    /**
-     * DesktopWindowFrame to use for this TextFrame if it is to be popped out of the client.
-     */
+    /** DesktopWindowFrame to use for this TextFrame if it is to be popped out of the client. */
     private DesktopWindowFrame popoutFrame;
     /** Desktop place holder object used if this frame is popped out. */
     private DesktopPlaceHolderFrame popoutPlaceholder;
@@ -129,7 +124,7 @@ public abstract class TextFrame extends JPanel implements Window,
             final FrameContainer owner,
             final CommandParser commandParser,
             final TextFrameDependencies deps) {
-        this.mainFrame = deps.mainFrame;
+        this.activeFrameManager = deps.activeFrameManager;
         this.popupManager = deps.popupManager;
         this.frameParent = owner;
         this.iconManager = deps.iconManager;
@@ -175,8 +170,8 @@ public abstract class TextFrame extends JPanel implements Window,
             popoutFrame = null;
         }
         // Call setActiveFrame again so the contents of the frame manager are updated.
-        if (equals(mainFrame.get().getActiveFrame())) {
-            mainFrame.get().setActiveFrame(this);
+        if (equals(activeFrameManager.getActiveFrame())) {
+            activeFrameManager.setActiveFrame(this);
         }
     }
 
@@ -544,6 +539,7 @@ public abstract class TextFrame extends JPanel implements Window,
         final PasteDialogFactory pasteDialog;
         final PluginManager pluginManager;
         final IconManager iconManager;
+        final ActiveFrameManager activeFrameManager;
 
         @Inject
         public TextFrameDependencies(
@@ -555,7 +551,8 @@ public abstract class TextFrame extends JPanel implements Window,
                 final PasteDialogFactory pasteDialog,
                 final PluginManager pluginManager,
                 @GlobalConfig final IconManager iconManager,
-                @GlobalConfig final AggregateConfigProvider globalConfig) {
+                @GlobalConfig final AggregateConfigProvider globalConfig,
+                final ActiveFrameManager activeFrameManager) {
             this.textPaneFactory = textPaneFactory;
             this.controller = controller;
             this.mainFrame = mainFrame;
@@ -565,6 +562,7 @@ public abstract class TextFrame extends JPanel implements Window,
             this.pasteDialog = pasteDialog;
             this.pluginManager = pluginManager;
             this.iconManager = iconManager;
+            this.activeFrameManager = activeFrameManager;
         }
 
     }

src/com/dmdirc/addons/ui_swing/components/menubar/ChannelMenu.java

@@ -25,13 +25,13 @@ package com.dmdirc.addons.ui_swing.components.menubar;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.ServerState;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.dialogs.ChannelJoinDialogFactory;
 import com.dmdirc.addons.ui_swing.dialogs.channellist.ChannelListDialog;
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -58,8 +58,8 @@ public class ChannelMenu extends JMenu implements ActionListener,
     private final DialogProvider<ChannelListDialog> channelListDialogProvider;
     /** Channel join dialog factory. */
     private final ChannelJoinDialogFactory channelJoinDialogFactory;
-    /** Main frame. */
-    private final MainFrame mainFrame;
+    /** Active frame manager. */
+    private final ActiveFrameManager activeFrameManager;
     /** Menu items to be disabled/enabled. */
     private JMenuItem csd;
     private JMenuItem join;
@@ -68,19 +68,19 @@ public class ChannelMenu extends JMenu implements ActionListener,
     /**
      * Creates a new channel menu.
      *
-     * @param mainFrame                 Parent mainframe
+     * @param activeFrameManager        Active frame manager.
      * @param dialogProvider            Channel settings dialog provider
      * @param channelJoinDialogFactory  Channel join dialog factory
      * @param channelListDialogProvider Channel list dialog provider
      */
     @Inject
     public ChannelMenu(
-            final MainFrame mainFrame,
+            final ActiveFrameManager activeFrameManager,
             final KeyedDialogProvider<Channel, ChannelSettingsDialog> dialogProvider,
             final ChannelJoinDialogFactory channelJoinDialogFactory,
             final DialogProvider<ChannelListDialog> channelListDialogProvider) {
         super("Channel");
-        this.mainFrame = mainFrame;
+        this.activeFrameManager = activeFrameManager;
         this.dialogProvider = dialogProvider;
         this.channelJoinDialogFactory = channelJoinDialogFactory;
         this.channelListDialogProvider = channelListDialogProvider;
@@ -124,7 +124,8 @@ public class ChannelMenu extends JMenu implements ActionListener,
                         "Enter the name of the channel to join.").displayOrRequestFocus();
                 break;
             case "ChannelSettings":
-                final FrameContainer activeWindow = mainFrame.getActiveFrame().getContainer();
+                final FrameContainer activeWindow = activeFrameManager.getActiveFrame().
+                        getContainer();
                 if (activeWindow instanceof Channel) {
                     dialogProvider.displayOrRequestFocus(((Channel) activeWindow));
                 }
@@ -137,7 +138,7 @@ public class ChannelMenu extends JMenu implements ActionListener,
 
     @Override
     public final void menuSelected(final MenuEvent e) {
-        final TextFrame activeFrame = mainFrame.getActiveFrame();
+        final TextFrame activeFrame = activeFrameManager.getActiveFrame();
         final FrameContainer activeWindow = activeFrame == null ? null
                 : activeFrame.getContainer();
 

src/com/dmdirc/addons/ui_swing/components/menubar/ServerMenu.java

@@ -26,12 +26,13 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.Apple;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.dialogs.NewServerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
+import com.dmdirc.interfaces.LifecycleController;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -52,8 +53,10 @@ public class ServerMenu extends JMenu implements ActionListener,
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
-    /** Main frame. */
-    private final MainFrame mainFrame;
+    /** Active frame manager. */
+    private final ActiveFrameManager activeFrameManager;
+    /** Lifecycle controller. */
+    private final LifecycleController lifecycleController;
     /** Menu items which can be enabled/disabled. */
     private JMenuItem ssd;
     private JMenuItem disconnect;
@@ -65,17 +68,20 @@ public class ServerMenu extends JMenu implements ActionListener,
     /**
      * Creates a new Server menu.
      *
-     * @param mainFrame         Parent main frame
-     * @param newServerProvider Provider to use to retrieve NSD instances.
-     * @param ssdProvider       Provider to get SSD instances
+     * @param activeFrameManager  Active frame manager.
+     * @param lifecycleController Lifecycle controller
+     * @param newServerProvider   Provider to use to retrieve NSD instances.
+     * @param ssdProvider         Provider to get SSD instances
      */
     @Inject
     public ServerMenu(
-            final MainFrame mainFrame,
+            final ActiveFrameManager activeFrameManager,
+            final LifecycleController lifecycleController,
             final DialogProvider<NewServerDialog> newServerProvider,
             final KeyedDialogProvider<Server, ServerSettingsDialog> ssdProvider) {
         super("Server");
-        this.mainFrame = mainFrame;
+        this.activeFrameManager = activeFrameManager;
+        this.lifecycleController = lifecycleController;
         this.newServerProvider = newServerProvider;
         this.ssdProvider = ssdProvider;
 
@@ -127,21 +133,21 @@ public class ServerMenu extends JMenu implements ActionListener,
                 newServerProvider.displayOrRequestFocus();
                 break;
             case "Exit":
-                mainFrame.quit();
+                lifecycleController.quit();
                 break;
             case "ServerSettings":
                 ssdProvider.displayOrRequestFocus(
-                        (Server) mainFrame.getActiveFrame().getContainer().getConnection());
+                        (Server) activeFrameManager.getActiveFrame().getContainer().getConnection());
                 break;
             case "Disconnect":
-                mainFrame.getActiveFrame().getContainer().getConnection().disconnect();
+                activeFrameManager.getActiveFrame().getContainer().getConnection().disconnect();
                 break;
         }
     }
 
     @Override
     public final void menuSelected(final MenuEvent e) {
-        final TextFrame activeFrame = mainFrame.getActiveFrame();
+        final TextFrame activeFrame = activeFrameManager.getActiveFrame();
         final FrameContainer activeWindow = activeFrame == null ? null
                 : activeFrame.getContainer();
 

src/com/dmdirc/addons/ui_swing/dialogs/ChannelJoinDialog.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.dialogs;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.parser.common.ChannelJoinRequest;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.util.annotations.factory.Factory;
@@ -37,30 +38,32 @@ public class ChannelJoinDialog extends StandardInputDialog {
 
     /** Serial version UID. */
     private static final long serialVersionUID = 1;
-    /** The main frame that owns this dialog. */
-    private final MainFrame mainFrame;
+    /** Active frame manager. */
+    private final ActiveFrameManager activeFrameManager;
 
     /**
      * Creates a new dialog which prompts a user and then joins the channel they specify.
      *
      * @param mainFrame   Main frame
+     * @param activeFrameManager The active window manager
      * @param iconManager The icon manager to use for validating text fields.
      * @param title       Window title
      * @param message     Window message
      */
     public ChannelJoinDialog(
             final MainFrame mainFrame,
+            final ActiveFrameManager activeFrameManager,
             @SuppressWarnings("qualifiers") @GlobalConfig final IconManager iconManager,
             @Unbound final String title,
             @Unbound final String message) {
         super(mainFrame, ModalityType.APPLICATION_MODAL, iconManager, title, message);
 
-        this.mainFrame = mainFrame;
+        this.activeFrameManager = activeFrameManager;
     }
 
     @Override
     public boolean save() {
-        mainFrame.getActiveFrame().getContainer().getConnection()
+        activeFrameManager.getActiveFrame().getContainer().getConnection()
                 .join(new ChannelJoinRequest(getText()));
         return true;
     }

src/com/dmdirc/addons/ui_swing/dialogs/NewServerDialog.java

@@ -33,6 +33,7 @@ import com.dmdirc.addons.ui_swing.components.vetoable.VetoableComboBoxModel;
 import com.dmdirc.addons.ui_swing.components.vetoable.VetoableComboBoxSelectionListener;
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
@@ -81,8 +82,8 @@ public class NewServerDialog extends StandardDialog implements
     private final IconManager iconManager;
     /** Config. */
     private final AggregateConfigProvider config;
-    /** Main frame. */
-    private final MainFrame mainFrame;
+    /** Active frame manager. */
+    private final ActiveFrameManager activeFrameManager;
     /** checkbox. */
     private JCheckBox newServerWindowCheck;
     /** checkbox. */
@@ -106,6 +107,7 @@ public class NewServerDialog extends StandardDialog implements
      * Creates a new instance of the dialog.
      *
      * @param mainFrame             Main frame
+     * @param activeFrameManager    The active window manager
      * @param config                Config
      * @param iconManager           Icon manager
      * @param identityController    Identity controller
@@ -115,6 +117,7 @@ public class NewServerDialog extends StandardDialog implements
     @Inject
     public NewServerDialog(
             final MainFrame mainFrame,
+            final ActiveFrameManager activeFrameManager,
             @GlobalConfig final AggregateConfigProvider config,
             @GlobalConfig final IconManager iconManager,
             final IdentityController identityController,
@@ -123,7 +126,7 @@ public class NewServerDialog extends StandardDialog implements
         super(mainFrame, ModalityType.MODELESS);
         this.identityController = identityController;
         this.serverManager = serverManager;
-        this.mainFrame = mainFrame;
+        this.activeFrameManager = activeFrameManager;
         this.iconManager = iconManager;
         this.config = config;
         this.profileDialogProvider = profileDialogProvider;
@@ -155,7 +158,7 @@ public class NewServerDialog extends StandardDialog implements
 
         serverField.requestFocusInWindow();
 
-        if (serverManager.numServers() == 0 || mainFrame.getActiveFrame() == null) {
+        if (serverManager.numServers() == 0 || activeFrameManager.getActiveFrame() == null) {
             newServerWindowCheck.setSelected(true);
             newServerWindowCheck.setEnabled(false);
         } else {
@@ -275,7 +278,7 @@ public class NewServerDialog extends StandardDialog implements
             // Open in a new window?
             if (newServerWindowCheck.isSelected()
                     || serverManager.numServers() == 0
-                    || mainFrame.getActiveFrame() == null) {
+                    || activeFrameManager.getActiveFrame() == null) {
 
                 new LoggingSwingWorker<Void, Void>() {
                     @Override
@@ -285,7 +288,7 @@ public class NewServerDialog extends StandardDialog implements
                     }
                 }.executeInExecutor();
             } else {
-                final Connection connection = mainFrame.getActiveFrame().getContainer().
+                final Connection connection = activeFrameManager.getActiveFrame().getContainer().
                         getConnection();
 
                 new LoggingSwingWorker<Void, Void>() {

src/com/dmdirc/addons/ui_swing/dialogs/channellist/ChannelListDialog.java

@@ -25,6 +25,7 @@ package com.dmdirc.addons.ui_swing.dialogs.channellist;
 import com.dmdirc.Server;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -47,11 +48,12 @@ public class ChannelListDialog extends StandardDialog implements ActionListener
     private final JLabel total;
 
     @Inject
-    public ChannelListDialog(final MainFrame mainFrame) {
+    public ChannelListDialog(final MainFrame mainFrame,
+            final ActiveFrameManager activeFrameManager) {
         super(mainFrame, ModalityType.MODELESS);
         setTitle("Channel List");
         total = new JLabel("No results.");
-        list = new ChannelListPanel((Server) mainFrame.getActiveFrame().getContainer()
+        list = new ChannelListPanel((Server) activeFrameManager.getActiveFrame().getContainer()
                 .getConnection(), total);
         layoutComponents();
         getCancelButton().setText("Close");

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

@@ -25,13 +25,13 @@ package com.dmdirc.addons.ui_swing.framemanager.buttonbar;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.FrameContainerComparator;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.CloseFrameContainerAction;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
 import com.dmdirc.addons.ui_swing.framemanager.FramemanagerPosition;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.NotificationListener;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -56,7 +56,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import javax.inject.Inject;
-import javax.inject.Provider;
 import javax.swing.JComponent;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
@@ -107,8 +106,8 @@ public final class ButtonBar implements FrameManager, ActionListener,
     private final WindowManager windowManager;
     /** Global configuration to read settings from. */
     private final AggregateConfigProvider globalConfig;
-    /** Provider to use to retrieve the current main frame. */
-    private final Provider<MainFrame> mainFrameProvider;
+    /** Active frame manager. */
+    private final ActiveFrameManager activeFrameManager;
 
     /**
      * Creates a new instance of ButtonBar.
@@ -116,18 +115,18 @@ public final class ButtonBar implements FrameManager, ActionListener,
      * @param windowFactory     The factory to use to retrieve window information.
      * @param windowManager     The window manager to use to read window state.
      * @param globalConfig      Global configuration to read settings from.
-     * @param mainFrameProvider The provider to use to retrieve the current main frame.
+     * @param activeFrameManager The active window manager
      */
     @Inject
     public ButtonBar(
             final SwingWindowFactory windowFactory,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final WindowManager windowManager,
-            final Provider<MainFrame> mainFrameProvider) {
+            final ActiveFrameManager activeFrameManager) {
         this.windowFactory = windowFactory;
         this.globalConfig = globalConfig;
         this.windowManager = windowManager;
-        this.mainFrameProvider = mainFrameProvider;
+        this.activeFrameManager = activeFrameManager;
 
         scrollPane = new JScrollPane();
         scrollPane.setBorder(null);
@@ -141,10 +140,10 @@ public final class ButtonBar implements FrameManager, ActionListener,
                 globalConfig.getOption("ui", "framemanagerPosition"));
 
         if (position.isHorizontal()) {
-            buttonPanel = new ButtonPanel(mainFrameProvider,
+            buttonPanel = new ButtonPanel(activeFrameManager,
                     new MigLayout("ins rel, fill, flowx"), this);
         } else {
-            buttonPanel = new ButtonPanel(mainFrameProvider,
+            buttonPanel = new ButtonPanel(activeFrameManager,
                     new MigLayout("ins rel, fill, flowy"), this);
         }
         scrollPane.getViewport().addMouseWheelListener(buttonPanel);
@@ -195,7 +194,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
                         ? 150 : (parent.getWidth() / NUM_CELLS);
                 initButtons(windowManager.getRootWindows());
 
-                final TextFrame activeFrame = mainFrameProvider.get().getActiveFrame();
+                final TextFrame activeFrame = activeFrameManager.getActiveFrame();
                 if (activeFrame != null) {
                     selectionChanged(activeFrame);
                 }
@@ -371,7 +370,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
             button.setSelected(true);
         }
 
-        mainFrameProvider.get().setActiveFrame(frame);
+        activeFrameManager.setActiveFrame(frame);
     }
 
     /**

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.framemanager.buttonbar;
 
-import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 
 import java.awt.Component;
 import java.awt.Dimension;
@@ -30,7 +30,6 @@ import java.awt.Rectangle;
 import java.awt.event.MouseWheelEvent;
 import java.awt.event.MouseWheelListener;
 
-import javax.inject.Provider;
 import javax.swing.JPanel;
 import javax.swing.Scrollable;
 
@@ -44,23 +43,23 @@ public class ButtonPanel extends JPanel implements Scrollable,
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
-    /** The provider to get the main frame to set the active frame. */
-    private final Provider<MainFrame> mainFrameProvider;
+    /** Active frame manager. */
+    private final ActiveFrameManager activeFrameManager;
     /** The ButtonBar that created this Panel. */
     private final ButtonBar buttonBar;
 
     /**
      * Constructor for ButtonPanel.
      *
-     * @param mainFrameProvider The provider to get the main frame to set the active frame.
-     * @param layout            Layout settings for this ButtonPanel
-     * @param buttonBar         the buttonBar that created this Panel
+     * @param activeFrameManager The active window manager
+     * @param layout             Layout settings for this ButtonPanel
+     * @param buttonBar          the buttonBar that created this Panel
      */
-    public ButtonPanel(final Provider<MainFrame> mainFrameProvider, final MigLayout layout,
+    public ButtonPanel(final ActiveFrameManager activeFrameManager, final MigLayout layout,
             final ButtonBar buttonBar) {
         super(layout);
 
-        this.mainFrameProvider = mainFrameProvider;
+        this.activeFrameManager = activeFrameManager;
         this.buttonBar = buttonBar;
     }
 
@@ -105,8 +104,8 @@ public class ButtonPanel extends JPanel implements Scrollable,
             newIndex = (selectedIndex + 1) % getComponentCount();
         }
 
-        mainFrameProvider.get().setActiveFrame(
-                ((FrameToggleButton) getComponent(newIndex)).getTextFrame());
+        activeFrameManager.setActiveFrame(((FrameToggleButton) getComponent(newIndex)).
+                getTextFrame());
     }
 
     /**

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

@@ -34,6 +34,7 @@ import com.dmdirc.addons.ui_swing.components.TreeScroller;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeViewModel;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeViewNode;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.logger.ErrorLevel;
@@ -71,14 +72,16 @@ public class CtrlTabWindowManager implements SwingWindowListener,
     /**
      * 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 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.
      */
     @Inject
     public CtrlTabWindowManager(
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final SwingWindowFactory windowFactory,
+            final ActiveFrameManager activeFrameManager,
             final MainFrame mainFrame) {
         nodes = new HashMap<>();
         model = new TreeViewModel(globalConfig, new TreeViewNode(null, null));
@@ -88,13 +91,13 @@ public class CtrlTabWindowManager implements SwingWindowListener,
             @Override
             protected void setPath(final TreePath path) {
                 super.setPath(path);
-                mainFrame.setActiveFrame(windowFactory.getSwingWindow(
+                activeFrameManager.setActiveFrame(windowFactory.getSwingWindow(
                         ((TreeViewNode) path.getLastPathComponent()).getWindow()));
             }
         };
 
         windowFactory.addWindowListener(this);
-        mainFrame.addSelectionListener(this);
+        activeFrameManager.addSelectionListener(this);
 
         mainFrame.getRootPane().getActionMap().put("prevFrameAction",
                 new PreviousFrameAction(treeScroller));

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

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.ui_swing.framemanager.tree;
 
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.CloseFrameContainerAction;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 
@@ -37,7 +37,6 @@ import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 import java.awt.event.MouseMotionListener;
 
-import javax.inject.Provider;
 import javax.swing.BorderFactory;
 import javax.swing.JComponent;
 import javax.swing.JMenuItem;
@@ -60,8 +59,8 @@ public class Tree extends JTree implements MouseMotionListener,
     private static final long serialVersionUID = 1;
     /** Tree frame manager. */
     private final TreeFrameManager manager;
-    /** The provider to use to retrieve the current main frame.. */
-    private final Provider<MainFrame> mainFrameProvider;
+    /** Active frame manager. */
+    private final ActiveFrameManager activeFrameManager;
     /** Config manager. */
     private final AggregateConfigProvider config;
     /** Drag selection enabled? */
@@ -78,7 +77,7 @@ public class Tree extends JTree implements MouseMotionListener,
      *
      * @param manager           Frame manager
      * @param model             tree model.
-     * @param mainFrameProvider The provider to use to retrieve the current main frame.
+     * @param activeFrameManager The active window manager
      * @param globalConfig      The config to read settings from.
      * @param domain            The domain to read settings from.
      * @param windowFactory     The factory to use to get swing windows.
@@ -86,7 +85,7 @@ public class Tree extends JTree implements MouseMotionListener,
     public Tree(
             final TreeFrameManager manager,
             final TreeModel model,
-            final Provider<MainFrame> mainFrameProvider,
+            final ActiveFrameManager activeFrameManager,
             final AggregateConfigProvider globalConfig,
             final SwingWindowFactory windowFactory,
             final String domain) {
@@ -95,7 +94,7 @@ public class Tree extends JTree implements MouseMotionListener,
         this.manager = manager;
         this.config = globalConfig;
         this.windowFactory = windowFactory;
-        this.mainFrameProvider = mainFrameProvider;
+        this.activeFrameManager = activeFrameManager;
 
         putClientProperty("JTree.lineStyle", "Angled");
         getInputMap().setParent(null);
@@ -188,7 +187,7 @@ public class Tree extends JTree implements MouseMotionListener,
         if (dragSelect && dragButton) {
             final TreeViewNode node = getNodeForLocation(e.getX(), e.getY());
             if (node != null) {
-                mainFrameProvider.get().setActiveFrame(windowFactory.getSwingWindow(
+                activeFrameManager.setActiveFrame(windowFactory.getSwingWindow(
                         ((TreeViewNode) new TreePath(node.getPath()).getLastPathComponent())
                         .getWindow()));
             }
@@ -228,7 +227,7 @@ public class Tree extends JTree implements MouseMotionListener,
             final TreePath selectedPath = getPathForLocation(e.getX(),
                     e.getY());
             if (selectedPath != null) {
-                mainFrameProvider.get().setActiveFrame(windowFactory.getSwingWindow(
+                activeFrameManager.setActiveFrame(windowFactory.getSwingWindow(
                         ((TreeViewNode) selectedPath.getLastPathComponent()).getWindow()));
             }
         }

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

@@ -24,13 +24,13 @@ package com.dmdirc.addons.ui_swing.framemanager.tree;
 
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.FrameContainer;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 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.framemanager.FrameManager;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.NotificationListener;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -51,7 +51,6 @@ import java.util.HashMap;
 import java.util.Map;
 
 import javax.inject.Inject;
-import javax.inject.Provider;
 import javax.swing.JComponent;
 import javax.swing.JScrollPane;
 import javax.swing.JTree;
@@ -88,25 +87,25 @@ public class TreeFrameManager implements FrameManager,
     private final SwingWindowFactory windowFactory;
     /** Window manage. */
     private final WindowManager windowManager;
-    /** Provider to use to retrieve the current main frame. */
-    private final Provider<MainFrame> mainFrameProvider;
+    /** Active frame manager. */
+    private final ActiveFrameManager activeFrameManager;
 
     /**
      * Creates a new instance of the TreeFrameManager.
      *
-     * @param windowManager     The window manager to use to read window state.
-     * @param globalConfig      The provider to read config settings from.
-     * @param colourManager     The colour manager to use to retrieve colours.
-     * @param mainFrameProvider The provider to use to retrieve the current main frame.
-     * @param windowFactory     The factory to use to retrieve swing windows.
-     * @param domain            The domain to read settings from.
+     * @param windowManager      The window manager to use to read window state.
+     * @param globalConfig       The provider to read config settings from.
+     * @param colourManager      The colour manager to use to retrieve colours.
+     * @param activeFrameManager The active window manager
+     * @param windowFactory      The factory to use to retrieve swing windows.
+     * @param domain             The domain to read settings from.
      */
     @Inject
     public TreeFrameManager(
             final WindowManager windowManager,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final ColourManager colourManager,
-            final Provider<MainFrame> mainFrameProvider,
+            final ActiveFrameManager activeFrameManager,
             final SwingWindowFactory windowFactory,
             @PluginDomain(SwingController.class) final String domain) {
         this.windowFactory = windowFactory;
@@ -114,12 +113,13 @@ public class TreeFrameManager implements FrameManager,
         this.nodes = new HashMap<>();
         this.config = globalConfig;
         this.colourManager = colourManager;
+        this.activeFrameManager = activeFrameManager;
 
         UIUtilities.invokeLater(new Runnable() {
             @Override
             public void run() {
                 model = new TreeViewModel(config, new TreeViewNode(null, null));
-                tree = new Tree(TreeFrameManager.this, model, mainFrameProvider, globalConfig,
+                tree = new Tree(TreeFrameManager.this, model, activeFrameManager, globalConfig,
                         windowFactory, domain);
                 tree.setCellRenderer(new TreeViewTreeCellRenderer(config, colourManager,
                         TreeFrameManager.this));
@@ -132,7 +132,6 @@ public class TreeFrameManager implements FrameManager,
                 config.addChangeListener("ui", "foregroundcolour", TreeFrameManager.this);
             }
         });
-        this.mainFrameProvider = mainFrameProvider;
     }
 
     @Override
@@ -317,7 +316,7 @@ public class TreeFrameManager implements FrameManager,
                 if (scroller != null) {
                     scroller.unregister();
                 }
-                scroller = new TreeTreeScroller(mainFrameProvider, windowFactory, tree);
+                scroller = new TreeTreeScroller(activeFrameManager, windowFactory, tree);
 
                 for (FrameContainer window : windowManager.getRootWindows()) {
                     addWindow(null, window);
@@ -328,9 +327,8 @@ public class TreeFrameManager implements FrameManager,
                     }
                 }
 
-                final MainFrame mainFrame = mainFrameProvider.get();
-                if (mainFrame != null && mainFrame.getActiveFrame() != null) {
-                    selectionChanged(mainFrame.getActiveFrame());
+                if (activeFrameManager.getActiveFrame() != null) {
+                    selectionChanged(activeFrameManager.getActiveFrame());
                 }
             }
         });

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

@@ -22,13 +22,12 @@
 
 package com.dmdirc.addons.ui_swing.framemanager.tree;
 
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.components.TreeScroller;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 
-import javax.inject.Provider;
 import javax.swing.tree.TreePath;
 
 /**
@@ -36,25 +35,25 @@ import javax.swing.tree.TreePath;
  */
 public class TreeTreeScroller extends TreeScroller {
 
-    /** Main frame provider. */
-    private final Provider<MainFrame> mainFrameProvider;
+    /** Active frame manager. */
+    private final ActiveFrameManager activeFrameManager;
     /** Factory to use to retrieve swing windows. */
     private final SwingWindowFactory windowFactory;
 
     /**
      * Creates a new Tree scroller for the tree view.
      *
-     * @param mainFrameProvider Main frame provider.
+     * @param activeFrameManager The active window manager
      * @param windowFactory     Factory to use to retrieve swing windows.
      * @param tree              Tree view tree
      */
     public TreeTreeScroller(
-            final Provider<MainFrame> mainFrameProvider,
+            final ActiveFrameManager activeFrameManager,
             final SwingWindowFactory windowFactory,
             final Tree tree) {
         super(tree);
 
-        this.mainFrameProvider = mainFrameProvider;
+        this.activeFrameManager = activeFrameManager;
         this.windowFactory = windowFactory;
     }
 
@@ -77,7 +76,7 @@ public class TreeTreeScroller extends TreeScroller {
         }
         super.setPath(path);
 
-        mainFrameProvider.get().setActiveFrame(windowFactory.getSwingWindow(
+        activeFrameManager.setActiveFrame(windowFactory.getSwingWindow(
                 ((TreeViewNode) path.getLastPathComponent()).getWindow()));
     }
 

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

@@ -23,9 +23,9 @@
 package com.dmdirc.addons.ui_swing.framemanager.windowmenu;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 
@@ -33,7 +33,6 @@ import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-import javax.inject.Provider;
 import javax.swing.JMenu;
 import javax.swing.SwingUtilities;
 
@@ -45,8 +44,8 @@ public class FrameContainerMenu extends JMenu implements FrameInfoListener,
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
-    /** The provider to get the main frame to set the active frame. */
-    private final Provider<MainFrame> mainFrameProvider;
+    /** Active frame manager. */
+    private final ActiveFrameManager activeFrameManager;
     /** The swing frame. */
     private final TextFrame window;
     /** Wrapped frame. */
@@ -55,21 +54,21 @@ public class FrameContainerMenu extends JMenu implements FrameInfoListener,
     /**
      * Instantiates a new FrameContainer menu item wrapping the specified frame.
      *
-     * @param mainFrameProvider   The provider to get the main frame to set the active frame.
-     * @param globalConfig The config to read settings from
-     * @param domain       The domain to read settings from
-     * @param window       The swing window being wrapped
-     * @param frame        Wrapped frame
+     * @param activeFrameManager The active window manager
+     * @param globalConfig       The config to read settings from
+     * @param domain             The domain to read settings from
+     * @param window             The swing window being wrapped
+     * @param frame              Wrapped frame
      */
     public FrameContainerMenu(
-            final Provider<MainFrame> mainFrameProvider,
+            final ActiveFrameManager activeFrameManager,
             final AggregateConfigProvider globalConfig,
             final String domain,
             final TextFrame window,
             final FrameContainer frame) {
         super(frame.getName());
 
-        this.mainFrameProvider = mainFrameProvider;
+        this.activeFrameManager = activeFrameManager;
         this.window = window;
         this.frame = frame;
 
@@ -118,7 +117,7 @@ public class FrameContainerMenu extends JMenu implements FrameInfoListener,
      */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        mainFrameProvider.get().setActiveFrame(window);
+        activeFrameManager.setActiveFrame(window);
     }
 
     @Override

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

@@ -23,9 +23,9 @@
 package com.dmdirc.addons.ui_swing.framemanager.windowmenu;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.ui.messages.Styliser;
 
@@ -33,7 +33,6 @@ import java.awt.Font;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-import javax.inject.Provider;
 import javax.swing.JMenuItem;
 import javax.swing.SwingUtilities;
 
@@ -45,8 +44,8 @@ public class FrameContainerMenuItem extends JMenuItem implements FrameInfoListen
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
-    /** The provider to retrieve the mainframe to set active frames. */
-    private final Provider<MainFrame> mainFrameProvider;
+    /** Active frame manager. */
+    private final ActiveFrameManager activeFrameManager;
     /** Wrapped frame. */
     private final FrameContainer frame;
     /** Swing window. */
@@ -57,19 +56,19 @@ public class FrameContainerMenuItem extends JMenuItem implements FrameInfoListen
     /**
      * Instantiates a new FrameContainer menu item wrapping the specified frame.
      *
-     * @param mainFrameProvider The provider to retrieve the mainframe to set active frames.
-     * @param frame             Wrapped frame
-     * @param window            The window this menu item corresponds to.
-     * @param manager           Parent window menu frame manager.
+     * @param activeFrameManager The active window manager
+     * @param frame              Wrapped frame
+     * @param window             The window this menu item corresponds to.
+     * @param manager            Parent window menu frame manager.
      */
     public FrameContainerMenuItem(
-            final Provider<MainFrame> mainFrameProvider,
+            final ActiveFrameManager activeFrameManager,
             final FrameContainer frame,
             final TextFrame window,
             final WindowMenuFrameManager manager) {
         super(frame.getName(), frame.getIconManager().getIcon(frame.getIcon()));
 
-        this.mainFrameProvider = mainFrameProvider;
+        this.activeFrameManager = activeFrameManager;
         this.frame = frame;
         this.window = window;
         this.manager = manager;
@@ -111,7 +110,7 @@ public class FrameContainerMenuItem extends JMenuItem implements FrameInfoListen
 
     @Override
     public void actionPerformed(final ActionEvent e) {
-        mainFrameProvider.get().setActiveFrame(window);
+        activeFrameManager.setActiveFrame(window);
     }
 
     @Override

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

@@ -25,13 +25,13 @@ package com.dmdirc.addons.ui_swing.framemanager.windowmenu;
 import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.FrameContainerComparator;
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.SwingWindowListener;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.IconManager;
@@ -48,7 +48,6 @@ import java.util.concurrent.Callable;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.inject.Inject;
-import javax.inject.Provider;
 import javax.inject.Singleton;
 import javax.swing.AbstractButton;
 import javax.swing.JMenu;
@@ -75,26 +74,24 @@ public class WindowMenuFrameManager extends JMenu implements
     private final JSeparator separator;
     /** Enabled menu items? */
     private final AtomicBoolean enabledMenuItems = new AtomicBoolean(false);
-    /** Swing controller. */
-    private final SwingController controller;
     /** Window to menu map. */
     private final Map<FrameContainer, FrameContainerMenu> menus;
     private final Map<FrameContainer, FrameContainerMenuItem> items;
     private final Map<FrameContainer, FrameContainerMenuItem> menuItems;
-
-    private final Provider<MainFrame> mainFrame;
+    /** Active frame manager. */
+    private final ActiveFrameManager activeFrameManager;
     private final AggregateConfigProvider globalConfig;
     private final String domain;
 
     /**
      * Creates a new instance of WindowMenuFrameManager.
      *
-     * @param controller    Swing controller
-     * @param iconManager   Icon manager to use for window icons.
-     * @param globalConfig  Config to read settings from.
-     * @param domain        Domain to read settings from.
-     * @param windowFactory The window factory to use to create and listen for windows.
-     * @param mainFrame     The frame that owns this manager
+     * @param controller         Swing controller
+     * @param iconManager        Icon manager to use for window icons.
+     * @param globalConfig       Config to read settings from.
+     * @param domain             Domain to read settings from.
+     * @param windowFactory      The window factory to use to create and listen for windows.
+     * @param activeFrameManager The active window manager
      */
     @Inject
     public WindowMenuFrameManager(
@@ -103,11 +100,10 @@ public class WindowMenuFrameManager extends JMenu implements
             @GlobalConfig final AggregateConfigProvider globalConfig,
             @PluginDomain(SwingController.class) final String domain,
             final SwingWindowFactory windowFactory,
-            final Provider<MainFrame> mainFrame) {
-        this.controller = controller;
+            final ActiveFrameManager activeFrameManager) {
         this.globalConfig = globalConfig;
         this.domain = domain;
-        this.mainFrame = mainFrame;
+        this.activeFrameManager = activeFrameManager;
 
         menus = Collections.synchronizedMap(
                 new HashMap<FrameContainer, FrameContainerMenu>());
@@ -132,7 +128,7 @@ public class WindowMenuFrameManager extends JMenu implements
 
         itemCount = getMenuComponentCount();
 
-        mainFrame.get().addSelectionListener(this);
+        activeFrameManager.addSelectionListener(this);
 
         new WindowMenuScroller(this, globalConfig, domain, itemCount);
         checkMenuItems();
@@ -156,7 +152,7 @@ public class WindowMenuFrameManager extends JMenu implements
                         @Override
                         public FrameContainerMenuItem call() {
                             return new FrameContainerMenuItem(
-                                    mainFrame,
+                                    activeFrameManager,
                                     window.getContainer(),
                                     window,
                                     WindowMenuFrameManager.this);
@@ -178,7 +174,7 @@ public class WindowMenuFrameManager extends JMenu implements
                         @Override
                         public FrameContainerMenuItem call() {
                             return new FrameContainerMenuItem(
-                                    mainFrame,
+                                    activeFrameManager,
                                     window.getContainer(),
                                     window,
                                     WindowMenuFrameManager.this);
@@ -192,7 +188,7 @@ public class WindowMenuFrameManager extends JMenu implements
                             @Override
                             public FrameContainerMenu call() {
                                 return new FrameContainerMenu(
-                                        mainFrame,
+                                        activeFrameManager,
                                         globalConfig,
                                         domain,
                                         parent,
@@ -254,7 +250,7 @@ public class WindowMenuFrameManager extends JMenu implements
                                     getContainer()),
                                     menus.get(parent.getContainer()),
                                     new FrameContainerMenuItem(
-                                            mainFrame,
+                                            activeFrameManager,
                                             parent.getContainer(),
                                             parent,
                                             WindowMenuFrameManager.this));
@@ -311,7 +307,7 @@ public class WindowMenuFrameManager extends JMenu implements
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (enabledMenuItems.get() && e.getActionCommand().equals("Close")) {
-            mainFrame.get().getActiveFrame().getContainer().close();
+            activeFrameManager.getActiveFrame().getContainer().close();
         }
     }
 

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

@@ -51,6 +51,7 @@ import com.dmdirc.addons.ui_swing.dialogs.prefs.UpdateConfigPanel;
 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;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -138,6 +139,12 @@ public class SwingModule {
         });
     }
 
+    @Provides
+    @Singleton
+    public ActiveFrameManager getActiveFrameManager(final MainFrame mainFrame) {
+        return mainFrame;
+    }
+
     @Provides
     @Singleton
     public SwingStatusBar getSwingStatusBar(

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

@@ -25,11 +25,11 @@ package com.dmdirc.addons.windowstatus;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Query;
-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.components.statusbar.SwingStatusBar;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.config.IdentityController;
@@ -49,8 +49,8 @@ import javax.inject.Inject;
  */
 public class WindowStatusManager implements ConfigChangeListener, SelectionListener {
 
-    /** Main frame. */
-    private final MainFrame mainFrame;
+    /** Active frame manager. */
+    private final ActiveFrameManager activeFrameManager;
     /** Status bar we're adding to. */
     private final SwingStatusBar statusBar;
     /** Identity controller to read settings from. */
@@ -67,11 +67,12 @@ public class WindowStatusManager implements ConfigChangeListener, SelectionListe
     private String nonePrefix;
 
     @Inject
-    public WindowStatusManager(final MainFrame mainFrame, final SwingStatusBar statusBar,
+    public WindowStatusManager(final ActiveFrameManager activeFrameManager,
+            final SwingStatusBar statusBar,
             final IdentityController identityController,
             @PluginDomain(WindowStatusPlugin.class) final String domain) {
         this.domain = domain;
-        this.mainFrame = mainFrame;
+        this.activeFrameManager = activeFrameManager;
         this.statusBar = statusBar;
         this.identityController = identityController;
     }
@@ -88,7 +89,7 @@ public class WindowStatusManager implements ConfigChangeListener, SelectionListe
             }
         });
         statusBar.addComponent(panel);
-        mainFrame.addSelectionListener(this);
+        activeFrameManager.addSelectionListener(this);
         identityController.getGlobalConfiguration().addChangeListener(domain, this);
         updateCache();
     }
@@ -97,7 +98,7 @@ public class WindowStatusManager implements ConfigChangeListener, SelectionListe
      * Unloads the plugin.
      */
     public void onUnload() {
-        mainFrame.removeSelectionListener(this);
+        activeFrameManager.removeSelectionListener(this);
         statusBar.removeComponent(panel);
         panel = null;
     }
@@ -122,7 +123,7 @@ public class WindowStatusManager implements ConfigChangeListener, SelectionListe
 
     /** Update the window status using the current active window. */
     public void updateStatus() {
-        final TextFrame active = mainFrame.getActiveFrame();
+        final TextFrame active = activeFrameManager.getActiveFrame();
 
         if (active != null) {
             updateStatus(active.getContainer());