Don't pass WindowManagers to FrameContainers.

Change-Id: I0f60ac23438313cab49cdb86c089938f5ee44abc
Depends-On: Iadbca8a28f7ef3372df7fda722a3cbba2a0fbad6
Reviewed-on: http://gerrit.dmdirc.com/2843
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

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

@@ -27,7 +27,6 @@ import com.dmdirc.addons.dcc.actions.DCCActions;
 import com.dmdirc.addons.dcc.io.DCCChat;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.messages.MessageSinkManager;
-import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.WindowComponent;
 
 import java.util.Arrays;
@@ -47,22 +46,20 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
     /**
      * Creates a new instance of DCCChatWindow with a given DCCChat object.
      *
-     * @param plugin the DCC Plugin responsible for this window
      * @param dcc The DCCChat object this window wraps around
      * @param configManager Config manager
      * @param title The title of this window
      * @param nick My Current Nickname
      * @param targetNick Nickname of target
      * @param messageSinkManager The sink manager to use to despatch messages.
-     * @param windowManager Window Management
      */
-    public ChatContainer(final DCCPlugin plugin, final DCCChat dcc,
+    public ChatContainer(final DCCChat dcc,
             final AggregateConfigProvider configManager, final String title,
-            final String nick, final String targetNick, final MessageSinkManager messageSinkManager,
-            final WindowManager windowManager) {
+            final String nick, final String targetNick,
+            final MessageSinkManager messageSinkManager) {
         super(title, "dcc-chat-inactive", configManager,
                 new DCCCommandParser(configManager),
-                messageSinkManager, windowManager,
+                messageSinkManager,
                 Arrays.asList(
                     WindowComponent.TEXTAREA.getIdentifier(),
                     WindowComponent.INPUTFIELD.getIdentifier()));
@@ -70,8 +67,6 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
         dcc.setHandler(this);
         nickname = nick;
         otherNickname = targetNick;
-
-        windowManager.addWindow(plugin.getContainer(), this);
     }
 
     /**

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

@@ -157,9 +157,9 @@ public class DCCCommand extends Command implements IntelligentCommand {
             final String target, final boolean isSilent) {
         final DCCChat chat = new DCCChat();
         if (myPlugin.listen(chat)) {
-            final ChatContainer window = new ChatContainer(myPlugin, chat,
-                    origin.getConfigManager(),
-                    "*Chat: " + target, myNickname, target, messageSinkManager, windowManager);
+            final ChatContainer window = new ChatContainer(chat, origin.getConfigManager(),
+                    "*Chat: " + target, myNickname, target, messageSinkManager);
+            windowManager.addWindow(myPlugin.getContainer(), window);
             parser.sendCTCP(target, "DCC", "CHAT chat " + DCC.ipToLong(
                     myPlugin.getListenIP(parser)) + " " + chat.getPort());
             ActionManager.getActionManager().triggerEvent(
@@ -235,9 +235,10 @@ public class DCCCommand extends Command implements IntelligentCommand {
                 if (origin.getConfigManager().getOptionBool(
                         myPlugin.getDomain(), "send.reverse")) {
                     final Parser parser = server.getParser();
-                    new TransferContainer(myPlugin, send,
+                    final TransferContainer container = new TransferContainer(myPlugin, send,
                             origin.getConfigManager(), "Send: " + target,
-                            target, server, windowManager);
+                            target, server);
+                    windowManager.addWindow(myPlugin.getContainer(), container);
                     parser.sendCTCP(target, "DCC", "SEND \""
                             + selectedFile.getName() + "\" "
                             + DCC.ipToLong(myPlugin.getListenIP(parser))
@@ -247,9 +248,10 @@ public class DCCCommand extends Command implements IntelligentCommand {
                 } else {
                     final Parser parser = server.getParser();
                     if (myPlugin.listen(send)) {
-                        new TransferContainer(myPlugin, send,
+                        final TransferContainer container = new TransferContainer(myPlugin, send,
                                 origin.getConfigManager(), "*Send: "
-                                + target, target, server, windowManager);
+                                + target, target, server);
+                        windowManager.addWindow(myPlugin.getContainer(), container);
                         parser.sendCTCP(target, "DCC", "SEND \""
                                 + selectedFile.getName() + "\" "
                                 + DCC.ipToLong(myPlugin.getListenIP(parser))

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

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

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

@@ -184,8 +184,9 @@ 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, windowManager);
+                    TransferContainer container = new TransferContainer(DCCPlugin.this, send,
+                            config, "*Receive: " + nickname, nickname, null);
+                    windowManager.addWindow(getContainer(), container);
                     send.setToken(token);
                     if (resume) {
                         if (config.getOptionBool(getDomain(),
@@ -209,8 +210,9 @@ public class DCCPlugin extends BaseCommandPlugin implements ActionListener {
                         }
                     }
                 } else {
-                    new TransferContainer(DCCPlugin.this, send, config,
-                            "Receive: " + nickname, nickname, null, windowManager);
+                    TransferContainer container = new TransferContainer(DCCPlugin.this, send,
+                            config, "Receive: " + nickname, nickname, null);
+                    windowManager.addWindow(getContainer(), container);
                     if (resume) {
                         parser.sendCTCP(nickname, "DCC", "RESUME "
                                 + send.getShortFileName() + " "
@@ -393,8 +395,9 @@ 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, messageSinkManager, windowManager);
+            final DCCFrameContainer f = new ChatContainer(chat, config,
+                    "Chat: " + nickname, myNickname, nickname, messageSinkManager);
+            windowManager.addWindow(getContainer(), f);
             f.addLine("DCCChatStarting", nickname, chat.getHost(),
                     chat.getPort());
             chat.connect();
@@ -642,7 +645,7 @@ public class DCCPlugin extends BaseCommandPlugin implements ActionListener {
      * Create the container window.
      */
     protected void createContainer() {
-        container = new PlaceholderContainer(this, config, controller, windowManager);
+        container = new PlaceholderContainer(this, config, controller);
         windowManager.addWindow(container);
     }
 

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

@@ -27,7 +27,6 @@ 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;
@@ -48,13 +47,11 @@ 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 WindowManager windowManager) {
+            final AggregateConfigProvider config, final SwingController controller) {
         super("dcc", "DCCs", "DCCs", config, Arrays.asList(
-                "com.dmdirc.addons.dcc.ui.PlaceholderPanel"), windowManager);
+                "com.dmdirc.addons.dcc.ui.PlaceholderPanel"));
         this.plugin = plugin;
         this.controller = controller;
     }

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

@@ -32,7 +32,6 @@ import com.dmdirc.addons.dcc.io.DCCTransfer;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.SocketCloseListener;
-import com.dmdirc.ui.WindowManager;
 
 import java.awt.Desktop;
 import java.io.File;
@@ -91,16 +90,14 @@ 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 WindowManager windowManager) {
+            final String targetNick, final Server server) {
         super(dcc.getType() == DCCTransfer.TransferType.SEND
                 ? "dcc-send-inactive" : "dcc-receive-inactive",
                 title, title, config,
-                Arrays.asList("com.dmdirc.addons.dcc.ui.TransferPanel"), windowManager);
+                Arrays.asList("com.dmdirc.addons.dcc.ui.TransferPanel"));
         this.plugin = plugin;
         this.dcc = dcc;
         this.server = server;
@@ -115,8 +112,6 @@ public class TransferContainer extends FrameContainer implements
         dcc.addHandler(this);
 
         otherNickname = targetNick;
-
-        windowManager.addWindow(plugin.getContainer(), this);
     }
 
     /** {@inheritDoc} */

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

@@ -45,9 +45,7 @@ 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()), parent.getWindowManager());
-
-        parent.getWindowManager().addWindow(parent, this);
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
 
         final int frameBufferSize = parent.getConfigManager().getOptionInt(
                 "ui", "frameBufferSize");

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

@@ -48,6 +48,7 @@ import com.dmdirc.parser.interfaces.ClientInfo;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
+import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.Styliser;
 import com.dmdirc.util.io.ReverseFileReader;
 import com.dmdirc.util.io.StreamUtils;
@@ -95,6 +96,8 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
     private final ConfigProvider identity;
     /** Parent Identity Manager. */
     private final IdentityController identityController;
+    /** The manager to add history windows to. */
+    private final WindowManager windowManager;
 
     /** Timer used to close idle files. */
     protected Timer idleFileTimer;
@@ -113,13 +116,16 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
      * @param actionController The action controller to register listeners with
      * @param identityController The Identity Manager that controls the current config
      * @param commandController Command controller to register commands
+     * @param windowManager The manager to add history windows to.
      */
     public LoggingPlugin(final PluginInfo pluginInfo,
             final ActionController actionController,
             final IdentityController identityController,
-            final CommandController commandController) {
+            final CommandController commandController,
+            final WindowManager windowManager) {
         super(commandController);
         this.identityController = identityController;
+        this.windowManager = windowManager;
 
         this.pluginInfo = pluginInfo;
         this.actionController = actionController;
@@ -865,7 +871,8 @@ public class LoggingPlugin extends BaseCommandPlugin implements ActionListener,
             return false;
         }
 
-        new HistoryWindow("History", reader, target, historyLines);
+        HistoryWindow window = new HistoryWindow("History", reader, target, historyLines);
+        windowManager.addWindow(target, window);
 
         return true;
     }

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

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.parser.interfaces.callbacks.DebugInfoListener;
-import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.WindowComponent;
 
 import java.util.Arrays;
@@ -52,14 +51,12 @@ public class DebugWindow extends FrameContainer {
      * @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, final WindowManager windowManager) {
+    public DebugWindow(final DebugPlugin plugin, final String title, final Parser parser, final Server server) {
         super("raw", "Parser Debug", title, server.getConfigManager(),
-                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()), windowManager);
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
         this.plugin = plugin;
         this.parser = parser;
         this.server = server;
-
-        windowManager.addWindow(server, this);
     }
 
     /**

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

@@ -98,7 +98,8 @@ public final class ParserDebugCommand extends Command {
             try {
                 parser.getCallbackManager().addCallback(DebugInfoListener.class, myPlugin);
                 final DebugWindow window = new DebugWindow(myPlugin,
-                        "Parser Debug", parser, origin.getServer(), windowManager);
+                        "Parser Debug", parser, origin.getServer());
+                windowManager.addWindow(origin.getServer(), window);
                 myPlugin.registeredParsers.put(parser, window);
                 sendLine(origin, isSilent, FORMAT_OUTPUT, "Adding callback ok");
                 window.addLine("======================", true);

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

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

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

@@ -104,7 +104,8 @@ public class SwingDebugPlugin extends BasePlugin implements ActionListener {
         if (e.getSource() == showSysOut) {
             if (showSysOut.isSelected()) {
                 sysoutFrame = new SystemStreamContainer(SystemStreamType.Out,
-                        controller.getGlobalConfig(), this, windowManager);
+                        controller.getGlobalConfig(), this);
+                windowManager.addWindow(sysoutFrame);
             } else {
                 sysoutFrame.close();
             }
@@ -113,7 +114,8 @@ public class SwingDebugPlugin extends BasePlugin implements ActionListener {
         if (e.getSource() == showSysErr) {
             if (showSysErr.isSelected()) {
                 syserrFrame = new SystemStreamContainer(SystemStreamType.Error,
-                        controller.getGlobalConfig(), this, windowManager);
+                        controller.getGlobalConfig(), this);
+                windowManager.addWindow(syserrFrame);
             } else {
                 syserrFrame.close();
             }

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

@@ -25,7 +25,6 @@ package com.dmdirc.addons.swingdebug;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.WindowComponent;
 
 import java.io.IOException;
@@ -47,20 +46,18 @@ 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 WindowManager windowManager) {
+            final SwingDebugPlugin plugin) {
         super("dmdirc", stream.toString(), stream.toString(), config,
-                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()), windowManager);
+                Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
         this.plugin = plugin;
         try {
             thread = new SystemStreamRedirectThread(stream, getDocument());
             thread.start();
         } catch (IOException ex) {
         }
-        windowManager.addWindow(this);
     }
 
     /** {@inheritDoc} */