Split ActiveFrameManager out of MainFrame

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

@@ -37,7 +37,6 @@ 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;
-import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
 import com.dmdirc.events.ClientFocusGainedEvent;
 import com.dmdirc.events.ClientFocusLostEvent;
 import com.dmdirc.events.ClientMinimisedEvent;
@@ -75,8 +74,7 @@ import static com.dmdirc.addons.ui_swing.SwingPreconditions.checkOnEDT;
 /**
  * The main application frame.
  */
-public class MainFrame extends JFrame implements WindowListener, ConfigChangeListener,
-        ActiveFrameManager {
+public class MainFrame extends JFrame implements WindowListener, ConfigChangeListener {
 
     /** A version number for this class. */
     private static final long serialVersionUID = 9;
@@ -485,11 +483,6 @@ public class MainFrame extends JFrame implements WindowListener, ConfigChangeLis
         }
     }
 
-    @Override
-    public TextFrame getActiveFrame() {
-        return activeFrame;
-    }
-
     @Handler(invocation = EdtHandlerInvocation.class)
     public void setActiveFrame(final SwingActiveWindowChangeRequestEvent event) {
         focusOrder.offerAndMove(activeFrame);

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

@@ -0,0 +1,57 @@
+/*
+ * 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;
+import com.dmdirc.addons.ui_swing.events.SwingActiveWindowChangeRequestEvent;
+import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
+import com.dmdirc.interfaces.ui.Window;
+
+import java.util.Optional;
+
+import javax.inject.Inject;
+
+import net.engio.mbassy.listener.Handler;
+
+/**
+ * Simple active frame manager used only to keep track of the active frame.
+ */
+public class SimpleActiveFrameManager implements ActiveFrameManager {
+
+    private Optional<Window> window;
+
+    @Inject
+    public SimpleActiveFrameManager() {
+        window = Optional.empty();
+    }
+
+    @Handler(invocation = EdtHandlerInvocation.class)
+    public void setActiveFrame(final SwingActiveWindowChangeRequestEvent event) {
+        this.window = event.getWindow();
+    }
+
+    @Override
+    public TextFrame getActiveFrame() {
+        return (TextFrame) window.orElse(null);
+    }
+}

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

@@ -31,6 +31,7 @@ import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.NoopClipboard;
 import com.dmdirc.addons.ui_swing.QuitWorker;
+import com.dmdirc.addons.ui_swing.SimpleActiveFrameManager;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.SwingManager;
 import com.dmdirc.addons.ui_swing.UIUtilities;
@@ -160,8 +161,10 @@ public class SwingModule {
 
     @Provides
     @Singleton
-    public ActiveFrameManager getActiveFrameManager(final MainFrame mainFrame) {
-        return mainFrame;
+    public ActiveFrameManager getActiveFrameManager(final SimpleActiveFrameManager frameManager,
+            final SwingEventBus eventBus) {
+        eventBus.subscribe(frameManager);
+        return frameManager;
     }
 
     @Provides