Remove deprecated methods.

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

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

@@ -28,7 +28,6 @@ import com.dmdirc.addons.ui_swing.commands.Input;
 import com.dmdirc.addons.ui_swing.commands.PopInCommand;
 import com.dmdirc.addons.ui_swing.commands.PopOutCommand;
 import com.dmdirc.addons.ui_swing.commands.ServerSettings;
-import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.dialogs.error.ErrorListDialog;
 import com.dmdirc.addons.ui_swing.framemanager.FrameManagerProvider;
 import com.dmdirc.addons.ui_swing.injection.SwingModule;
@@ -41,7 +40,6 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.ui.UIController;
-import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.Exported;
@@ -629,13 +627,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         getMainFrame().getJMenuBar().addMenuItem(parentMenu, menuItem);
     }
 
-    @Override
-    public void requestWindowFocus(final Window window) {
-        if (window instanceof TextFrame) {
-            getMainFrame().setActiveFrame((TextFrame) window);
-        }
-    }
-
     /**
      * Returns the version of this swing UI.
      *

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

@@ -33,6 +33,7 @@ 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;
 
 /**
@@ -42,16 +43,16 @@ import javax.inject.Singleton;
 public class SwingLinkHandler {
 
     private final URLHandler urlHandler;
-    private final SwingController controller;
+    private final Provider<MainFrame> mainFrame;
     private final SwingWindowFactory windowFactory;
 
     @Inject
     public SwingLinkHandler(
-            final SwingController controller,
+            final Provider<MainFrame> mainFrame,
             final URLHandler urlHandler,
             final SwingWindowFactory windowFactory) {
         this.urlHandler = urlHandler;
-        this.controller = controller;
+        this.mainFrame = mainFrame;
         this.windowFactory = windowFactory;
     }
 
@@ -74,7 +75,7 @@ public class SwingLinkHandler {
         final FrameContainer container = event.getWindow().getContainer();
         final Connection connection = container.getConnection();
         if (connection != null) {
-            controller.requestWindowFocus(
+            mainFrame.get().setActiveFrame(
                     windowFactory.getSwingWindow(connection.getQuery(event.getTarget())));
         }
     }

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

@@ -46,6 +46,7 @@ import java.util.Map;
 import java.util.Set;
 
 import javax.inject.Inject;
+import javax.inject.Provider;
 import javax.inject.Singleton;
 
 /**
@@ -60,15 +61,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 controller that owns this window factory. */
-    private final SwingController controller;
+    /** The provider to get the main frame to focus frames. */
+    private final Provider<MainFrame> mainFrameProvider;
     /** Our list of listeners. */
     private final ListenerList listeners = new ListenerList();
 
     /**
      * Creates a new window factory for the specified controller.
      *
-     * @param controller              The controller this factory is for
+     * @param mainFrameProvider       The provider to get the main frame to focus frames.
      * @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.
@@ -77,13 +78,13 @@ public class SwingWindowFactory implements FrameListener {
      */
     @Inject
     public SwingWindowFactory(
-            final SwingController controller,
+            final Provider<MainFrame> mainFrameProvider,
             final CustomFrameFactory customFrameFactory,
             final CustomInputFrameFactory customInputFrameFactory,
             final ServerFrameFactory serverFrameFactory,
             final ChannelFrameFactory channelFrameFactory,
             final GlobalCommandParser commandParser) {
-        this.controller = controller;
+        this.mainFrameProvider = mainFrameProvider;
 
         // TODO: Allow auto-factories to implement an interface and simplify this a bit.
         registerImplementation(
@@ -228,7 +229,7 @@ public class SwingWindowFactory implements FrameListener {
                 }
 
                 if (focus) {
-                    controller.requestWindowFocus(childWindow);
+                    mainFrameProvider.get().setActiveFrame(childWindow);
                 }
             }
         });

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

@@ -26,7 +26,6 @@ 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.SwingController;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.CloseFrameContainerAction;
@@ -114,7 +113,6 @@ public final class ButtonBar implements FrameManager, ActionListener,
     /**
      * Creates a new instance of ButtonBar.
      *
-     * @param controller        The controller to use to change window focus.
      * @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.
@@ -122,7 +120,6 @@ public final class ButtonBar implements FrameManager, ActionListener,
      */
     @Inject
     public ButtonBar(
-            final SwingController controller,
             final SwingWindowFactory windowFactory,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final WindowManager windowManager,
@@ -144,10 +141,10 @@ public final class ButtonBar implements FrameManager, ActionListener,
                 globalConfig.getOption("ui", "framemanagerPosition"));
 
         if (position.isHorizontal()) {
-            buttonPanel = new ButtonPanel(controller,
+            buttonPanel = new ButtonPanel(mainFrameProvider,
                     new MigLayout("ins rel, fill, flowx"), this);
         } else {
-            buttonPanel = new ButtonPanel(controller,
+            buttonPanel = new ButtonPanel(mainFrameProvider,
                     new MigLayout("ins rel, fill, flowy"), this);
         }
         scrollPane.getViewport().addMouseWheelListener(buttonPanel);
@@ -309,7 +306,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
         final FrameToggleButton button = new FrameToggleButton(
                 source.getContainer().getName(),
                 source.getContainer().getIconManager().getIcon(source.getContainer().getIcon()),
-                source);
+                (TextFrame) source, source.getContainer());
         button.addActionListener(this);
         button.addMouseListener(this);
         button.setHorizontalAlignment(SwingConstants.LEFT);
@@ -369,7 +366,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
     @Override
     public void actionPerformed(final ActionEvent e) {
         final FrameToggleButton button = (FrameToggleButton) e.getSource();
-        final TextFrame frame = (TextFrame) button.getWindow();
+        final TextFrame frame = button.getTextFrame();
         if (frame != null && frame.equals(activeWindow)) {
             button.setSelected(true);
         }
@@ -512,7 +509,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
         if (e.isPopupTrigger()) {
             final FrameToggleButton button = (FrameToggleButton) e.getSource();
 
-            final TextFrame frame = (TextFrame) button.getWindow();
+            final TextFrame frame = button.getTextFrame();
             if (frame == null) {
                 return;
             }

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.SwingController;
+import com.dmdirc.addons.ui_swing.MainFrame;
 
 import java.awt.Component;
 import java.awt.Dimension;
@@ -30,6 +30,7 @@ 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;
 
@@ -37,35 +38,29 @@ import net.miginfocom.swing.MigLayout;
 
 /**
  * Implements scrollable onto a JPanel so we have more control over scrolling.
- *
- * @since 0.6.4
  */
 public class ButtonPanel extends JPanel implements Scrollable,
         MouseWheelListener {
 
-    /**
-     * 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 controller that owns this panel. */
-    private final SwingController controller;
+    /** The provider to get the main frame to set the active frame. */
+    private final Provider<MainFrame> mainFrameProvider;
     /** The ButtonBar that created this Panel. */
     private final ButtonBar buttonBar;
 
     /**
      * Constructor for ButtonPanel.
      *
-     * @param controller The controller that owns this panel
-     * @param layout     Layout settings for this ButtonPanel
-     * @param buttonBar  the buttonBar that created this Panel
+     * @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
      */
-    public ButtonPanel(final SwingController controller, final MigLayout layout,
+    public ButtonPanel(final Provider<MainFrame> mainFrameProvider, final MigLayout layout,
             final ButtonBar buttonBar) {
         super(layout);
 
-        this.controller = controller;
+        this.mainFrameProvider = mainFrameProvider;
         this.buttonBar = buttonBar;
     }
 
@@ -110,8 +105,8 @@ public class ButtonPanel extends JPanel implements Scrollable,
             newIndex = (selectedIndex + 1) % getComponentCount();
         }
 
-        controller.requestWindowFocus(
-                ((FrameToggleButton) getComponent(newIndex)).getWindow());
+        mainFrameProvider.get().setActiveFrame(
+                ((FrameToggleButton) getComponent(newIndex)).getTextFrame());
     }
 
     /**

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

@@ -23,38 +23,37 @@
 package com.dmdirc.addons.ui_swing.framemanager.buttonbar;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.interfaces.ui.Window;
+import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 
 import javax.swing.Icon;
 import javax.swing.JToggleButton;
 
+
 /**
  * Custom toggle button that contains Window information for this button.
- *
- * @author Simon Mott
- * @since 0.6.4
  */
 public class FrameToggleButton extends JToggleButton {
 
-    /**
-     * 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;
     /** Contains the window associated with this button. */
-    private final Window window;
+    private final TextFrame textFrame;
+    /** The frame container associated with this button. */
+    private final FrameContainer frameContainer;
 
     /**
      * Create a new instance of FrameToggleButton.
      *
-     * @param text   Text to show
-     * @param icon   Icon to show
-     * @param window Parent window
+     * @param text           Text to show
+     * @param icon           Icon to show
+     * @param textFrame      Text frame
+     * @param frameContainer Associated frame container
      */
-    public FrameToggleButton(final String text, final Icon icon, final Window window) {
+    public FrameToggleButton(final String text, final Icon icon, final TextFrame textFrame,
+            final FrameContainer frameContainer) {
         super(text, icon);
-        this.window = window;
+        this.textFrame = textFrame;
+        this.frameContainer = frameContainer;
     }
 
     /**
@@ -62,8 +61,8 @@ public class FrameToggleButton extends JToggleButton {
      *
      * @return Window associated with this button
      */
-    public Window getWindow() {
-        return window;
+    public TextFrame getTextFrame() {
+        return textFrame;
     }
 
     /**
@@ -72,7 +71,7 @@ public class FrameToggleButton extends JToggleButton {
      * @return FrameContainer associated with this button
      */
     public FrameContainer getFrameContainer() {
-        return window.getContainer();
+        return frameContainer;
     }
 
 }

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.framemanager.tree;
 
-import com.dmdirc.addons.ui_swing.SwingController;
+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;
@@ -37,6 +37,7 @@ 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;
@@ -55,16 +56,12 @@ import net.miginfocom.layout.PlatformDefaults;
 public class Tree extends JTree implements MouseMotionListener,
         ConfigChangeListener, MouseListener, ActionListener {
 
-    /**
-     * 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;
     /** Tree frame manager. */
     private final TreeFrameManager manager;
-    /** UI Controller. */
-    private final SwingController controller;
+    /** The provider to use to retrieve the current main frame.. */
+    private final Provider<MainFrame> mainFrameProvider;
     /** Config manager. */
     private final AggregateConfigProvider config;
     /** Drag selection enabled? */
@@ -79,26 +76,26 @@ public class Tree extends JTree implements MouseMotionListener,
     /**
      * Specialised JTree for frame manager.
      *
-     * @param manager       Frame manager
-     * @param model         tree model.
-     * @param controller    Swing controller
-     * @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.
+     * @param manager           Frame manager
+     * @param model             tree model.
+     * @param mainFrameProvider The provider to use to retrieve the current main frame.
+     * @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.
      */
     public Tree(
             final TreeFrameManager manager,
             final TreeModel model,
-            final SwingController controller,
+            final Provider<MainFrame> mainFrameProvider,
             final AggregateConfigProvider globalConfig,
             final SwingWindowFactory windowFactory,
             final String domain) {
         super(model);
 
         this.manager = manager;
-        this.controller = controller;
         this.config = globalConfig;
         this.windowFactory = windowFactory;
+        this.mainFrameProvider = mainFrameProvider;
 
         putClientProperty("JTree.lineStyle", "Angled");
         getInputMap().setParent(null);
@@ -191,7 +188,7 @@ public class Tree extends JTree implements MouseMotionListener,
         if (dragSelect && dragButton) {
             final TreeViewNode node = getNodeForLocation(e.getX(), e.getY());
             if (node != null) {
-                controller.requestWindowFocus(windowFactory.getSwingWindow(
+                mainFrameProvider.get().setActiveFrame(windowFactory.getSwingWindow(
                         ((TreeViewNode) new TreePath(node.getPath()).getLastPathComponent())
                         .getWindow()));
             }
@@ -231,7 +228,7 @@ public class Tree extends JTree implements MouseMotionListener,
             final TreePath selectedPath = getPathForLocation(e.getX(),
                     e.getY());
             if (selectedPath != null) {
-                controller.requestWindowFocus(windowFactory.getSwingWindow(
+                mainFrameProvider.get().setActiveFrame(windowFactory.getSwingWindow(
                         ((TreeViewNode) selectedPath.getLastPathComponent()).getWindow()));
             }
         }

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

@@ -78,8 +78,6 @@ public class TreeFrameManager implements FrameManager,
     private TreeViewModel model;
     /** node storage, used for adding and deleting nodes correctly. */
     private final Map<FrameContainer, TreeViewNode> nodes;
-    /** UI Controller. */
-    private final SwingController controller;
     /** Tree scroller. */
     private TreeScroller scroller;
     /** Configuration manager. */
@@ -96,7 +94,6 @@ public class TreeFrameManager implements FrameManager,
     /**
      * Creates a new instance of the TreeFrameManager.
      *
-     * @param controller        The controller to use to switch windows.
      * @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.
@@ -106,7 +103,6 @@ public class TreeFrameManager implements FrameManager,
      */
     @Inject
     public TreeFrameManager(
-            final SwingController controller,
             final WindowManager windowManager,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final ColourManager colourManager,
@@ -116,7 +112,6 @@ public class TreeFrameManager implements FrameManager,
         this.windowFactory = windowFactory;
         this.windowManager = windowManager;
         this.nodes = new HashMap<>();
-        this.controller = controller;
         this.config = globalConfig;
         this.colourManager = colourManager;
 
@@ -124,7 +119,7 @@ public class TreeFrameManager implements FrameManager,
             @Override
             public void run() {
                 model = new TreeViewModel(config, new TreeViewNode(null, null));
-                tree = new Tree(TreeFrameManager.this, model, controller, globalConfig,
+                tree = new Tree(TreeFrameManager.this, model, mainFrameProvider, globalConfig,
                         windowFactory, domain);
                 tree.setCellRenderer(new TreeViewTreeCellRenderer(config, colourManager,
                         TreeFrameManager.this));
@@ -322,7 +317,7 @@ public class TreeFrameManager implements FrameManager,
                 if (scroller != null) {
                     scroller.unregister();
                 }
-                scroller = new TreeTreeScroller(controller, windowFactory, tree);
+                scroller = new TreeTreeScroller(mainFrameProvider, windowFactory, tree);
 
                 for (FrameContainer window : windowManager.getRootWindows()) {
                     addWindow(null, window);

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

@@ -22,12 +22,13 @@
 
 package com.dmdirc.addons.ui_swing.framemanager.tree;
 
-import com.dmdirc.addons.ui_swing.SwingController;
+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.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 
+import javax.inject.Provider;
 import javax.swing.tree.TreePath;
 
 /**
@@ -35,25 +36,25 @@ import javax.swing.tree.TreePath;
  */
 public class TreeTreeScroller extends TreeScroller {
 
-    /** The Swing Controller that owns this scroller. */
-    private final SwingController controller;
+    /** Main frame provider. */
+    private final Provider<MainFrame> mainFrameProvider;
     /** Factory to use to retrieve swing windows. */
     private final SwingWindowFactory windowFactory;
 
     /**
      * Creates a new Tree scroller for the tree view.
      *
-     * @param controller    The Swing Controller that owns this item
-     * @param windowFactory Factory to use to retrieve swing windows.
-     * @param tree          Tree view tree
+     * @param mainFrameProvider Main frame provider.
+     * @param windowFactory     Factory to use to retrieve swing windows.
+     * @param tree              Tree view tree
      */
     public TreeTreeScroller(
-            final SwingController controller,
+            final Provider<MainFrame> mainFrameProvider,
             final SwingWindowFactory windowFactory,
             final Tree tree) {
         super(tree);
 
-        this.controller = controller;
+        this.mainFrameProvider = mainFrameProvider;
         this.windowFactory = windowFactory;
     }
 
@@ -76,7 +77,7 @@ public class TreeTreeScroller extends TreeScroller {
         }
         super.setPath(path);
 
-        controller.requestWindowFocus(windowFactory.getSwingWindow(
+        mainFrameProvider.get().setActiveFrame(windowFactory.getSwingWindow(
                 ((TreeViewNode) path.getLastPathComponent()).getWindow()));
     }
 

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

@@ -23,8 +23,8 @@
 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.SwingController;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -33,6 +33,7 @@ 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;
 
@@ -44,8 +45,8 @@ public class FrameContainerMenu extends JMenu implements FrameInfoListener,
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
-    /** The swing controller that owns this item. */
-    private final SwingController controller;
+    /** The provider to get the main frame to set the active frame. */
+    private final Provider<MainFrame> mainFrameProvider;
     /** The swing frame. */
     private final TextFrame window;
     /** Wrapped frame. */
@@ -54,21 +55,21 @@ public class FrameContainerMenu extends JMenu implements FrameInfoListener,
     /**
      * Instantiates a new FrameContainer menu item wrapping the specified frame.
      *
-     * @param controller   Controller
+     * @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
      */
     public FrameContainerMenu(
-            final SwingController controller,
+            final Provider<MainFrame> mainFrameProvider,
             final AggregateConfigProvider globalConfig,
             final String domain,
             final TextFrame window,
             final FrameContainer frame) {
         super(frame.getName());
 
-        this.controller = controller;
+        this.mainFrameProvider = mainFrameProvider;
         this.window = window;
         this.frame = frame;
 
@@ -117,7 +118,7 @@ public class FrameContainerMenu extends JMenu implements FrameInfoListener,
      */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        controller.requestWindowFocus(window);
+        mainFrameProvider.get().setActiveFrame(window);
     }
 
     @Override

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

@@ -23,8 +23,8 @@
 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.SwingController;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.ui.messages.Styliser;
@@ -33,6 +33,7 @@ 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;
 
@@ -44,8 +45,8 @@ public class FrameContainerMenuItem extends JMenuItem implements FrameInfoListen
 
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
-    /** The swing controller that owns this item. */
-    private final SwingController controller;
+    /** The provider to retrieve the mainframe to set active frames. */
+    private final Provider<MainFrame> mainFrameProvider;
     /** Wrapped frame. */
     private final FrameContainer frame;
     /** Swing window. */
@@ -56,19 +57,19 @@ public class FrameContainerMenuItem extends JMenuItem implements FrameInfoListen
     /**
      * Instantiates a new FrameContainer menu item wrapping the specified frame.
      *
-     * @param controller The Swing Controller that owns this item
-     * @param frame      Wrapped frame
-     * @param window     The window this menu item corresponds to.
-     * @param manager    Parent window menu frame manager.
+     * @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.
      */
     public FrameContainerMenuItem(
-            final SwingController controller,
+            final Provider<MainFrame> mainFrameProvider,
             final FrameContainer frame,
             final TextFrame window,
             final WindowMenuFrameManager manager) {
         super(frame.getName(), frame.getIconManager().getIcon(frame.getIcon()));
 
-        this.controller = controller;
+        this.mainFrameProvider = mainFrameProvider;
         this.frame = frame;
         this.window = window;
         this.manager = manager;
@@ -110,7 +111,7 @@ public class FrameContainerMenuItem extends JMenuItem implements FrameInfoListen
 
     @Override
     public void actionPerformed(final ActionEvent e) {
-        controller.requestWindowFocus(window);
+        mainFrameProvider.get().setActiveFrame(window);
     }
 
     @Override

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

@@ -48,6 +48,7 @@ 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;
@@ -62,11 +63,7 @@ import javax.swing.JSeparator;
 public class WindowMenuFrameManager extends JMenu implements
         SwingWindowListener, ActionListener, SelectionListener {
 
-    /**
-     * 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;
     /** Comparator. */
     private final FrameContainerComparator comparator = new FrameContainerComparator();
@@ -85,7 +82,7 @@ public class WindowMenuFrameManager extends JMenu implements
     private final Map<FrameContainer, FrameContainerMenuItem> items;
     private final Map<FrameContainer, FrameContainerMenuItem> menuItems;
 
-    private final MainFrame mainFrame;
+    private final Provider<MainFrame> mainFrame;
     private final AggregateConfigProvider globalConfig;
     private final String domain;
 
@@ -106,7 +103,7 @@ public class WindowMenuFrameManager extends JMenu implements
             @GlobalConfig final AggregateConfigProvider globalConfig,
             @PluginDomain(SwingController.class) final String domain,
             final SwingWindowFactory windowFactory,
-            final MainFrame mainFrame) {
+            final Provider<MainFrame> mainFrame) {
         this.controller = controller;
         this.globalConfig = globalConfig;
         this.domain = domain;
@@ -135,7 +132,7 @@ public class WindowMenuFrameManager extends JMenu implements
 
         itemCount = getMenuComponentCount();
 
-        mainFrame.addSelectionListener(this);
+        mainFrame.get().addSelectionListener(this);
 
         new WindowMenuScroller(this, globalConfig, domain, itemCount);
         checkMenuItems();
@@ -159,7 +156,7 @@ public class WindowMenuFrameManager extends JMenu implements
                         @Override
                         public FrameContainerMenuItem call() {
                             return new FrameContainerMenuItem(
-                                    controller,
+                                    mainFrame,
                                     window.getContainer(),
                                     window,
                                     WindowMenuFrameManager.this);
@@ -181,7 +178,7 @@ public class WindowMenuFrameManager extends JMenu implements
                         @Override
                         public FrameContainerMenuItem call() {
                             return new FrameContainerMenuItem(
-                                    controller,
+                                    mainFrame,
                                     window.getContainer(),
                                     window,
                                     WindowMenuFrameManager.this);
@@ -195,7 +192,7 @@ public class WindowMenuFrameManager extends JMenu implements
                             @Override
                             public FrameContainerMenu call() {
                                 return new FrameContainerMenu(
-                                        controller,
+                                        mainFrame,
                                         globalConfig,
                                         domain,
                                         parent,
@@ -257,7 +254,7 @@ public class WindowMenuFrameManager extends JMenu implements
                                     getContainer()),
                                     menus.get(parent.getContainer()),
                                     new FrameContainerMenuItem(
-                                            controller,
+                                            mainFrame,
                                             parent.getContainer(),
                                             parent,
                                             WindowMenuFrameManager.this));
@@ -314,7 +311,7 @@ public class WindowMenuFrameManager extends JMenu implements
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (enabledMenuItems.get() && e.getActionCommand().equals("Close")) {
-            mainFrame.getActiveFrame().getContainer().close();
+            mainFrame.get().getActiveFrame().getContainer().close();
         }
     }
 

src/com/dmdirc/addons/ui_web/WebInterfaceUI.java

@@ -26,7 +26,6 @@ import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_web.uicomponents.WebStatusBar;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.interfaces.ui.UIController;
-import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.WindowManager;
@@ -151,9 +150,4 @@ public class WebInterfaceUI implements UIController {
         // Do nothing
     }
 
-    @Override
-    public void requestWindowFocus(final Window window) {
-        // TODO: Tell clients to focus
-    }
-
 }