Remove most singleton uses of WindowManager.

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

src/com/dmdirc/addons/dcc/ChatContainer.java

@@ -52,20 +52,21 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
      * @param title The title of this window
      * @param nick My Current Nickname
      * @param targetNick Nickname of target
+     * @param windowManager Window Management
      */
     public ChatContainer(final DCCPlugin plugin, final DCCChat dcc,
             final AggregateConfigProvider configManager, final String title,
-            final String nick, final String targetNick) {
+            final String nick, final String targetNick, final WindowManager windowManager) {
         super(title, "dcc-chat-inactive", configManager,
                 DCCCommandParser.getDCCCommandParser(configManager),
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
-                WindowComponent.INPUTFIELD.getIdentifier()));
+                        WindowComponent.INPUTFIELD.getIdentifier()), windowManager);
         dccChat = dcc;
         dcc.setHandler(this);
         nickname = nick;
         otherNickname = targetNick;
 
-        WindowManager.getWindowManager().addWindow(plugin.getContainer(), this);
+        windowManager.addWindow(plugin.getContainer(), this);
     }
 
     /**

src/com/dmdirc/addons/dcc/DCCCommand.java

@@ -42,6 +42,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.parser.interfaces.Parser;
+import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
 
@@ -65,6 +66,8 @@ public class DCCCommand extends Command implements IntelligentCommand {
     private final DCCPlugin myPlugin;
     /** Main frame instance used as the parent for dialogs. */
     private final MainFrame mainFrame;
+    /** Window management. */
+    private final WindowManager windowManager;
 
     /**
      * Creates a new instance of DCCCommand.
@@ -72,11 +75,14 @@ public class DCCCommand extends Command implements IntelligentCommand {
      * @param controller The controller to use for command information.
      * @param mainFrame mainFrame instance to use
      * @param plugin The DCC Plugin that this command belongs to
+     * @param windowManager Window management
      */
-    public DCCCommand(final CommandController controller, final MainFrame mainFrame, final DCCPlugin plugin) {
+    public DCCCommand(final CommandController controller, final MainFrame mainFrame,
+            final DCCPlugin plugin, final WindowManager windowManager) {
         super(controller);
         this.mainFrame = mainFrame;
         myPlugin = plugin;
+        this.windowManager = windowManager;
     }
 
     /** {@inheritDoc} */
@@ -144,7 +150,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
         if (myPlugin.listen(chat)) {
             final ChatContainer window = new ChatContainer(myPlugin, chat,
                     origin.getConfigManager(),
-                    "*Chat: " + target, myNickname, target);
+                    "*Chat: " + target, myNickname, target, windowManager);
             parser.sendCTCP(target, "DCC", "CHAT chat " + DCC.ipToLong(
                     myPlugin.getListenIP(parser)) + " " + chat.getPort());
             ActionManager.getActionManager().triggerEvent(
@@ -222,7 +228,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
                     final Parser parser = server.getParser();
                     new TransferContainer(myPlugin, send,
                             origin.getConfigManager(), "Send: " + target,
-                            target, server);
+                            target, server, windowManager);
                     parser.sendCTCP(target, "DCC", "SEND \""
                             + selectedFile.getName() + "\" "
                             + DCC.ipToLong(myPlugin.getListenIP(parser))
@@ -234,7 +240,7 @@ public class DCCCommand extends Command implements IntelligentCommand {
                     if (myPlugin.listen(send)) {
                         new TransferContainer(myPlugin, send,
                                 origin.getConfigManager(), "*Send: "
-                                + target, target, server);
+                                + target, target, server, windowManager);
                         parser.sendCTCP(target, "DCC", "SEND \""
                                 + selectedFile.getName() + "\" "
                                 + DCC.ipToLong(myPlugin.getListenIP(parser))

src/com/dmdirc/addons/dcc/DCCFrameContainer.java

@@ -26,6 +26,7 @@ import com.dmdirc.Server;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.TabCompleter;
 
 import java.util.Collection;
@@ -46,11 +47,12 @@ public abstract class DCCFrameContainer extends WritableFrameContainer {
      * @param configManager Config manager
      * @param parser Command parser to use for this window
      * @param components The UI components that this frame requires
+     * @param windowManager Window management
      */
     public DCCFrameContainer(final String title, final String icon,
             final AggregateConfigProvider configManager, final CommandParser parser,
-            final Collection<String> components) {
-        super(icon, title, title, configManager, parser, components);
+            final Collection<String> components, final WindowManager windowManager) {
+        super(icon, title, title, configManager, parser, components, windowManager);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/dcc/DCCPlugin.java

@@ -77,6 +77,8 @@ public class DCCPlugin extends BaseCommandPlugin implements ActionListener {
     private final SwingController controller;
     /** Identity controller to read settings from. */
     private final IdentityController identityController;
+    /** Window Management. */
+    private final WindowManager windowManager;
 
     /**
      * Creates a new instance of this plugin.
@@ -85,18 +87,21 @@ public class DCCPlugin extends BaseCommandPlugin implements ActionListener {
      * @param pluginInfo This plugin's plugin info
      * @param identityController The Identity controller that provides the current config
      * @param commandController Command controller to register commands
+     * @param windowManager Window Management
      */
     public DCCPlugin(final SwingController controller,
             final PluginInfo pluginInfo,
             final IdentityController identityController,
-            final CommandController commandController) {
+            final CommandController commandController,
+            final WindowManager windowManager) {
         super(commandController);
         this.identityController = identityController;
         this.controller = controller;
+        this.windowManager = windowManager;
         config = controller.getGlobalConfig();
         this.pluginInfo = pluginInfo;
-        registerCommand(new DCCCommand(commandController, controller.getMainFrame(), this),
-                DCCCommand.INFO);
+        registerCommand(new DCCCommand(commandController, controller.getMainFrame(), this,
+                windowManager), DCCCommand.INFO);
         final SwingWindowFactory factory = controller.getWindowFactory();
         factory.registerImplementation(new HashSet<>(Arrays.asList(
                 "com.dmdirc.addons.dcc.ui.PlaceholderPanel")),
@@ -172,7 +177,7 @@ public class DCCPlugin extends BaseCommandPlugin implements ActionListener {
                 final boolean resume = handleResume(jc);
                 if (reverse && !token.isEmpty()) {
                     new TransferContainer(DCCPlugin.this, send, config,
-                            "*Receive: " + nickname, nickname, null);
+                            "*Receive: " + nickname, nickname, null, windowManager);
                     send.setToken(token);
                     if (resume) {
                         if (config.getOptionBool(getDomain(),
@@ -197,7 +202,7 @@ public class DCCPlugin extends BaseCommandPlugin implements ActionListener {
                     }
                 } else {
                     new TransferContainer(DCCPlugin.this, send, config,
-                            "Receive: " + nickname, nickname, null);
+                            "Receive: " + nickname, nickname, null, windowManager);
                     if (resume) {
                         parser.sendCTCP(nickname, "DCC", "RESUME "
                                 + send.getShortFileName() + " "
@@ -381,7 +386,7 @@ public class DCCPlugin extends BaseCommandPlugin implements ActionListener {
             final String myNickname = ((Server) arguments[0]).getParser()
                     .getLocalClient().getNickname();
             final DCCFrameContainer f = new ChatContainer(this, chat, config,
-                    "Chat: " + nickname, myNickname, nickname);
+                    "Chat: " + nickname, myNickname, nickname, windowManager);
             f.addLine("DCCChatStarting", nickname, chat.getHost(),
                     chat.getPort());
             chat.connect();
@@ -629,8 +634,8 @@ public class DCCPlugin extends BaseCommandPlugin implements ActionListener {
      * Create the container window.
      */
     protected void createContainer() {
-        container = new PlaceholderContainer(this, config, controller);
-        WindowManager.getWindowManager().addWindow(container);
+        container = new PlaceholderContainer(this, config, controller, windowManager);
+        windowManager.addWindow(container);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/dcc/PlaceholderContainer.java

@@ -27,6 +27,7 @@ import com.dmdirc.Server;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.ui.WindowManager;
 
 import java.awt.Dialog.ModalityType;
 import java.util.Arrays;
@@ -47,11 +48,13 @@ public class PlaceholderContainer extends FrameContainer {
      * @param plugin The plugin which owns this placeholder
      * @param config Config manager
      * @param controller Swing controller
+     * @param windowManager Window manager
      */
     public PlaceholderContainer(final DCCPlugin plugin,
-            final AggregateConfigProvider config, final SwingController controller) {
+            final AggregateConfigProvider config, final SwingController controller,
+            final WindowManager windowManager) {
         super("dcc", "DCCs", "DCCs", config, Arrays.asList(
-                "com.dmdirc.addons.dcc.ui.PlaceholderPanel"));
+                "com.dmdirc.addons.dcc.ui.PlaceholderPanel"), windowManager);
         this.plugin = plugin;
         this.controller = controller;
     }

src/com/dmdirc/addons/dcc/TransferContainer.java

@@ -91,14 +91,16 @@ public class TransferContainer extends FrameContainer implements
      * @param title The title of this window
      * @param targetNick Nickname of target
      * @param server The server that initiated this send
+     * @param windowManager Window Management
      */
     public TransferContainer(final DCCPlugin plugin, final DCCTransfer dcc,
             final AggregateConfigProvider config, final String title,
-            final String targetNick, final Server server) {
+            final String targetNick, final Server server,
+            final WindowManager windowManager) {
         super(dcc.getType() == DCCTransfer.TransferType.SEND
                 ? "dcc-send-inactive" : "dcc-receive-inactive",
                 title, title, config,
-                Arrays.asList("com.dmdirc.addons.dcc.ui.TransferPanel"));
+                Arrays.asList("com.dmdirc.addons.dcc.ui.TransferPanel"), windowManager);
         this.plugin = plugin;
         this.dcc = dcc;
         this.server = server;
@@ -114,7 +116,7 @@ public class TransferContainer extends FrameContainer implements
 
         otherNickname = targetNick;
 
-        WindowManager.getWindowManager().addWindow(plugin.getContainer(), this);
+        windowManager.addWindow(plugin.getContainer(), this);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/logging/HistoryWindow.java

@@ -22,11 +22,10 @@
 
 package com.dmdirc.addons.logging;
 
-import com.dmdirc.util.io.ReverseFileReader;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
-import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.WindowComponent;
+import com.dmdirc.util.io.ReverseFileReader;
 
 import java.util.Arrays;
 
@@ -46,9 +45,9 @@ public class HistoryWindow extends FrameContainer {
     public HistoryWindow(final String title, final ReverseFileReader reader,
                          final FrameContainer parent, final int numLines) {
         super("raw", title, title, parent.getConfigManager(),
-                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()), parent.getWindowManager());
 
-        WindowManager.getWindowManager().addWindow(parent, this);
+        parent.getWindowManager().addWindow(parent, this);
 
         final int frameBufferSize = parent.getConfigManager().getOptionInt(
                 "ui", "frameBufferSize");

src/com/dmdirc/addons/parserdebug/DebugPlugin.java

@@ -31,6 +31,7 @@ import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
+import com.dmdirc.ui.WindowManager;
 
 import java.util.ArrayList;
 import java.util.Date;
@@ -54,14 +55,16 @@ public final class DebugPlugin extends BaseCommandPlugin implements
      *
      * @param actionController The action controller to register listeners with
      * @param commandController Command controller to register commands
+     * @param windowManager Window Manager
      */
     public DebugPlugin(final ActionController actionController,
-            final CommandController commandController) {
+            final CommandController commandController,
+            final WindowManager windowManager) {
         super(commandController);
 
         this.actionController = actionController;
 
-        registerCommand(new ParserDebugCommand(commandController, this), ParserDebugCommand.INFO);
+        registerCommand(new ParserDebugCommand(commandController, this, windowManager), ParserDebugCommand.INFO);
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/parserdebug/DebugWindow.java

@@ -50,15 +50,16 @@ public class DebugWindow extends FrameContainer {
      * @param title The title of this window
      * @param parser The parser this plugin is debugging
      * @param server The Server window this is a child of
+     * @param windowManager Window management
      */
-    public DebugWindow(final DebugPlugin plugin, final String title, final Parser parser, final Server server) {
+    public DebugWindow(final DebugPlugin plugin, final String title, final Parser parser, final Server server, final WindowManager windowManager) {
         super("raw", "Parser Debug", title, server.getConfigManager(),
-                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()), windowManager);
         this.plugin = plugin;
         this.parser = parser;
         this.server = server;
 
-        WindowManager.getWindowManager().addWindow(server, this);
+        windowManager.addWindow(server, this);
     }
 
     /**

src/com/dmdirc/addons/parserdebug/ParserDebugCommand.java

@@ -33,6 +33,7 @@ import com.dmdirc.commandparser.commands.context.ServerCommandContext;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
+import com.dmdirc.ui.WindowManager;
 
 /**
  * The ParserDebug Command allows controlling of which parsers spam debug info.
@@ -47,16 +48,20 @@ public final class ParserDebugCommand extends Command {
             CommandType.TYPE_SERVER);
     /** My Plugin */
     final DebugPlugin myPlugin;
+    /** Window management. */
+    private final WindowManager windowManager;
 
     /**
      * Creates a new instance of ParserDebugCommand.
      *
      * @param controller The controller to use for command information.
      * @param plugin Plugin that owns this command
+     * @param windowManager Window management
      */
-    public ParserDebugCommand(final CommandController controller, final DebugPlugin plugin) {
+    public ParserDebugCommand(final CommandController controller, final DebugPlugin plugin, final WindowManager windowManager) {
         super(controller);
         myPlugin = plugin;
+        this.windowManager = windowManager;
     }
 
     /**
@@ -93,7 +98,7 @@ public final class ParserDebugCommand extends Command {
             try {
                 parser.getCallbackManager().addCallback(DebugInfoListener.class, myPlugin);
                 final DebugWindow window = new DebugWindow(myPlugin,
-                        "Parser Debug", parser, origin.getServer());
+                        "Parser Debug", parser, origin.getServer(), windowManager);
                 myPlugin.registeredParsers.put(parser, window);
                 sendLine(origin, isSilent, FORMAT_OUTPUT, "Adding callback ok");
                 window.addLine("======================", true);

src/com/dmdirc/addons/redirect/FakeWriteableFrameContainer.java

@@ -48,7 +48,7 @@ public class FakeWriteableFrameContainer extends WritableFrameContainer {
     public FakeWriteableFrameContainer(final MessageTarget target) {
         super(target.getIcon(), target.getName(), target.getTitle(),
                 target.getConfigManager(), target.getCommandParser(),
-                Collections.<String>emptyList());
+                Collections.<String>emptyList(), target.getWindowManager());
         this.target = target;
     }
 

src/com/dmdirc/addons/swingdebug/SwingDebugPlugin.java

@@ -26,6 +26,7 @@ import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.CheckBoxMenuItem;
 import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.plugins.implementations.BasePlugin;
+import com.dmdirc.ui.WindowManager;
 
 import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
@@ -43,10 +44,12 @@ import lombok.RequiredArgsConstructor;
 @RequiredArgsConstructor
 public class SwingDebugPlugin extends BasePlugin implements ActionListener {
 
-    /** Swing controller. */
-    private final SwingController controller;
     /** The controller to read/write settings with. */
     private final IdentityController identityController;
+    /** Swing controller. */
+    private final SwingController controller;
+    /** Window Management. */
+    private final WindowManager windowManager;
     /** Debug menu. */
     private JMenu debugMenu;
     /** Debug EDT menu item. */
@@ -101,7 +104,7 @@ public class SwingDebugPlugin extends BasePlugin implements ActionListener {
         if (e.getSource() == showSysOut) {
             if (showSysOut.isSelected()) {
                 sysoutFrame = new SystemStreamContainer(SystemStreamType.Out,
-                        controller.getGlobalConfig(), this);
+                        controller.getGlobalConfig(), this, windowManager);
             } else {
                 sysoutFrame.close();
             }
@@ -110,7 +113,7 @@ public class SwingDebugPlugin extends BasePlugin implements ActionListener {
         if (e.getSource() == showSysErr) {
             if (showSysErr.isSelected()) {
                 syserrFrame = new SystemStreamContainer(SystemStreamType.Error,
-                        controller.getGlobalConfig(), this);
+                        controller.getGlobalConfig(), this, windowManager);
             } else {
                 syserrFrame.close();
             }

src/com/dmdirc/addons/swingdebug/SystemStreamContainer.java

@@ -47,19 +47,20 @@ public class SystemStreamContainer extends FrameContainer {
      * @param stream Stream to wrap
      * @param config Config to wrap
      * @param plugin Parent plugin
+     * @param windowManager Window management
      */
     public SystemStreamContainer(final SystemStreamType stream,
             final AggregateConfigProvider config,
-            final SwingDebugPlugin plugin) {
+            final SwingDebugPlugin plugin, final WindowManager windowManager) {
         super("dmdirc", stream.toString(), stream.toString(), config,
-                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()), windowManager);
         this.plugin = plugin;
         try {
             thread = new SystemStreamRedirectThread(stream, getDocument());
             thread.start();
         } catch (IOException ex) {
         }
-        WindowManager.getWindowManager().addWindow(this);
+        windowManager.addWindow(this);
     }
 
     /** {@inheritDoc} */

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

@@ -36,14 +36,15 @@ 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.framemanager.tree.TreeFrameManager;
-import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.NotificationListener;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.CoreUIUtils;
+import com.dmdirc.ui.WindowManager;
 import com.dmdirc.util.collections.ListenerList;
 import com.dmdirc.util.collections.QueuedLinkedHashSet;
 
@@ -58,7 +59,6 @@ import javax.swing.ImageIcon;
 import javax.swing.JFrame;
 import javax.swing.JPanel;
 import javax.swing.JSplitPane;
-import javax.swing.MenuSelectionManager;
 import javax.swing.SwingUtilities;
 import javax.swing.WindowConstants;
 
@@ -71,7 +71,7 @@ import net.miginfocom.swing.MigLayout;
  * The main application frame.
  */
 @Slf4j
-public final class MainFrame extends JFrame implements WindowListener,
+public class MainFrame extends JFrame implements WindowListener,
         ConfigChangeListener, SwingWindowListener, FrameInfoListener,
         NotificationListener {
 
@@ -93,6 +93,8 @@ public final class MainFrame extends JFrame implements WindowListener,
     private final CtrlTabWindowManager frameManager;
     /** The listeners registered with this class. */
     private final ListenerList listeners = new ListenerList();
+    /** Window management. */
+    private final WindowManager windowManager;
     /** The main application icon. */
     private ImageIcon imageIcon;
     /** The frame manager that's being used. */
@@ -122,14 +124,17 @@ public final class MainFrame extends JFrame implements WindowListener,
      *
      * @param controller Swing controller
      * @param lifecycleController Controller to use to end the application.
+     * @param windowManager Window management
      */
     public MainFrame(
             final SwingController controller,
-            final LifecycleController lifecycleController) {
+            final LifecycleController lifecycleController,
+            final WindowManager windowManager) {
         super();
 
         this.controller = controller;
         this.lifecycleController = lifecycleController;
+        this.windowManager = windowManager;
 
         focusOrder = new QueuedLinkedHashSet<>();
         initComponents();
@@ -359,7 +364,7 @@ public final class MainFrame extends JFrame implements WindowListener,
                             + "manager, falling back to default.", ex);
                 } finally {
                     if (mainFrameManager == null) {
-                        mainFrameManager = new TreeFrameManager();
+                        mainFrameManager = new TreeFrameManager(windowManager);
                     }
                 }
                 mainFrameManager.setController(controller);

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

@@ -184,6 +184,8 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     /** Apple handler, deals with Mac specific code. */
     @Getter
     private final Apple apple;
+    /** Window Management. */
+    private final WindowManager windowManager;
 
     /**
      * Instantiates a new SwingController.
@@ -202,6 +204,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
      * @param aliasWrapper Alias wrapper to use for aliases.
      * @param themeManager Theme manager to use.
      * @param urlBuilder URL builder to use to resolve icons etc.
+     * @param windowManager Window management
      */
     public SwingController(
             final PluginInfo pluginInfo,
@@ -217,7 +220,8 @@ public class SwingController extends BaseCommandPlugin implements UIController {
             final PerformWrapper performWrapper,
             final AliasWrapper aliasWrapper,
             final ThemeManager themeManager,
-            final URLBuilder urlBuilder) {
+            final URLBuilder urlBuilder,
+            final WindowManager windowManager) {
         super(commandController);
         this.pluginInfo = pluginInfo;
         this.identityManager = identityManager;
@@ -231,6 +235,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         this.performWrapper = performWrapper;
         this.aliasWrapper = aliasWrapper;
         this.themeManager = themeManager;
+        this.windowManager = windowManager;
 
         globalConfig = identityManager.getGlobalConfiguration();
         globalIdentity = identityManager.getUserSettings();
@@ -531,7 +536,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
             @Override
             public void run() {
                 initUISettings();
-                mainFrame = new MainFrame(SwingController.this, lifecycleController);
+                mainFrame = new MainFrame(SwingController.this, lifecycleController, windowManager);
                 getMainFrame().setVisible(true);
                 mainFrameCreated.set(true);
                 swingStatusBar = getMainFrame().getStatusBar();
@@ -545,7 +550,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
             throw new IllegalStateException(
                     "Main frame not created. Unable to continue.");
         }
-        WindowManager.getWindowManager().addListenerAndSync(windowFactory);
+        windowManager.addListenerAndSync(windowFactory);
         super.onLoad();
     }
 
@@ -553,7 +558,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     @Override
     public void onUnload() {
         errorDialog.dispose();
-        WindowManager.getWindowManager().removeListener(windowFactory);
+        windowManager.removeListener(windowFactory);
         mainFrameCreated.set(false);
         getMainFrame().dispose();
         windowFactory.dispose();

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

@@ -31,9 +31,9 @@ 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.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.NotificationListener;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.WindowManager;
@@ -102,9 +102,16 @@ public final class ButtonBar implements FrameManager, ActionListener,
     private SwingWindowFactory windowFactory;
     /** UI Controller. */
     private SwingController controller;
+    /** Window management. */
+    private final WindowManager windowManager;
 
-    /** Creates a new instance of ButtonBar. */
-    public ButtonBar() {
+    /**
+     * Creates a new instance of ButtonBar.
+     *
+     * @param windowManager Window management
+     */
+    public ButtonBar(final WindowManager windowManager) {
+        this.windowManager = windowManager;
         scrollPane = new JScrollPane();
         scrollPane.setBorder(null);
         scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants
@@ -153,7 +160,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
                 parent.addComponentListener(ButtonBar.this);
                 ButtonBar.this.buttonWidth = position.isHorizontal()
                         ? 150 : (parent.getWidth() / NUM_CELLS);
-                initButtons(WindowManager.getWindowManager().getRootWindows());
+                initButtons(windowManager.getRootWindows());
                 if (controller.getMainFrame().getActiveFrame() != null) {
                     selectionChanged(controller.getMainFrame()
                             .getActiveFrame());
@@ -283,7 +290,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
         buttonPanel.removeAll();
 
         final ArrayList<FrameContainer> windowList = new
-                ArrayList<FrameContainer>(WindowManager.getWindowManager().getRootWindows());
+ ArrayList<FrameContainer>(windowManager.getRootWindows());
         if (sortRootWindows) {
             Collections.sort(windowList, new FrameContainerComparator());
         }

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

@@ -28,10 +28,10 @@ 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.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.NotificationListener;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.Colour;
@@ -59,7 +59,7 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Manages open windows in the application in a tree style view.
  */
-public final class TreeFrameManager implements FrameManager,
+public class TreeFrameManager implements FrameManager,
         Serializable, ConfigChangeListener, NotificationListener,
         FrameInfoListener {
 
@@ -77,9 +77,16 @@ public final class TreeFrameManager implements FrameManager,
     private TreeScroller scroller;
     /** Configuration manager. */
     private AggregateConfigProvider config;
+    /** Window manage. */
+    private final WindowManager windowManager;
 
-    /** creates a new instance of the TreeFrameManager. */
-    public TreeFrameManager() {
+    /**
+     * Creates a new instance of the TreeFrameManager.
+     *
+     * @param windowManager Window Management
+     */
+    public TreeFrameManager(final WindowManager windowManager) {
+        this.windowManager = windowManager;
         nodes = new HashMap<>();
     }
 
@@ -310,8 +317,7 @@ public final class TreeFrameManager implements FrameManager,
                 }
                 scroller = new TreeTreeScroller(controller, tree);
 
-                for (FrameContainer window
-                        : WindowManager.getWindowManager().getRootWindows()) {
+                for (FrameContainer window : windowManager.getRootWindows()) {
                     addWindow(null, window);
                     final Collection<FrameContainer> childWindows = window
                             .getChildren();

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

@@ -27,6 +27,7 @@ import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.implementations.BasePlugin;
+import com.dmdirc.ui.WindowManager;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -51,6 +52,9 @@ public class WebInterfacePlugin extends BasePlugin {
     /** This plugin's information object. */
     private final PluginInfo pluginInfo;
 
+    /** Window management. */
+    private final WindowManager windowManager;
+
     /** The UI that we're using. */
     @Getter
     private WebInterfaceUI controller;
@@ -61,7 +65,7 @@ public class WebInterfacePlugin extends BasePlugin {
         if (controller == null) {
             controller = new WebInterfaceUI(getDomain(),
                     identityController, serverManager,
-                    pluginManager, pluginInfo);
+                    pluginManager, pluginInfo, windowManager);
         }
     }
 
@@ -73,7 +77,7 @@ public class WebInterfacePlugin extends BasePlugin {
     public void addWebHandler(final Handler newHandler) {
         if (controller == null) {
             controller = new WebInterfaceUI(getDomain(), identityController,
-                    serverManager, pluginManager, pluginInfo);
+                    serverManager, pluginManager, pluginInfo, windowManager);
         }
 
         controller.addWebHandler(newHandler);

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

@@ -32,6 +32,7 @@ import com.dmdirc.interfaces.ui.UIController;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
 
 import java.net.URI;
@@ -76,13 +77,15 @@ public class WebInterfaceUI implements UIController {
      * @param serverManager The manager to use to find and create servers
      * @param pluginManager The manager to use to find other plugins
      * @param pluginInfo The information object for this UI's plugin.
+     * @param coreWindowManager Window management
      */
     public WebInterfaceUI(
             final String domain,
             final IdentityController identityController,
             final ServerManager serverManager,
             final PluginManager pluginManager,
-            final PluginInfo pluginInfo) {
+            final PluginInfo pluginInfo,
+            final WindowManager coreWindowManager) {
         super();
 
         this.pluginManager = pluginManager;
@@ -119,7 +122,7 @@ public class WebInterfaceUI implements UIController {
             // Break horribly!
         }
 
-        windowManager = new WebWindowManager(this);
+        windowManager = new WebWindowManager(this, coreWindowManager);
 
         StatusBarManager.getStatusBarManager().registerStatusBar(new WebStatusBar(handler));
     }

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

@@ -88,10 +88,10 @@ public class WebWindowManager implements FrameListener {
      *
      * @param controller The Web UI controller that owns this manager
      */
-    public WebWindowManager(final WebInterfaceUI controller) {
+    public WebWindowManager(final WebInterfaceUI controller, final WindowManager windowManager) {
         this.controller = controller;
 
-        WindowManager.getWindowManager().addListenerAndSync(this);
+        windowManager.addListenerAndSync(this);
     }
 
     /**

test/com/dmdirc/addons/redirect/RedirectCommandTest.java

@@ -32,6 +32,7 @@ import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.ui.InputWindow;
+import com.dmdirc.ui.WindowManager;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -52,6 +53,7 @@ public class RedirectCommandTest {
     @Mock private WritableFrameContainer frameContainer;
     @Mock private AggregateConfigProvider configProvider;
     @Mock private CommandParser commandParser;
+    @Mock private WindowManager windowManager;
 
     @Before
     public void setup() {
@@ -65,7 +67,7 @@ public class RedirectCommandTest {
         doAnswer(new Answer<Void>() {
             @Override
             public Void answer(final InvocationOnMock invocation) throws Throwable {
-                new Echo(commandController).execute(
+                new Echo(commandController, windowManager).execute(
                         ((FrameContainer) invocation.getArguments()[0]),
                         new CommandArguments(commandController, "/echo test"),
                         null);