Plugin support for FrameContainer changes.

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

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.dcc;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.dcc.actions.DCCActions;
 import com.dmdirc.addons.dcc.io.DCCChat;
@@ -36,6 +37,8 @@ import com.google.common.eventbus.EventBus;
 
 import java.util.Arrays;
 
+import javax.annotation.Nullable;
+
 /**
  * This class links DCC Chat objects to a window.
  */
@@ -51,6 +54,7 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
     /**
      * Creates a new instance of DCCChatWindow with a given DCCChat object.
      *
+     * @param parent              The parent of this frame container, if any.
      * @param dcc                 The DCCChat object this window wraps around
      * @param configManager       Config manager
      * @param commandController   The controller to use in the command parser.
@@ -63,6 +67,7 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
      * @param eventBus            The bus to despatch events on.
      */
     public ChatContainer(
+            @Nullable final FrameContainer parent,
             final DCCChat dcc,
             final AggregateConfigProvider configManager,
             final CommandController commandController,
@@ -73,7 +78,7 @@ public class ChatContainer extends DCCFrameContainer implements DCCChatHandler {
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
             final EventBus eventBus) {
-        super(title, "dcc-chat-inactive", configManager,
+        super(parent, title, "dcc-chat-inactive", configManager,
                 new DCCCommandParser(configManager, commandController),
                 messageSinkManager,
                 tabCompleterFactory,

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

@@ -175,9 +175,18 @@ 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(chat, origin.getConfigManager(),
-                    getController(), "*Chat: " + target, myNickname, target, tabCompleterFactory,
-                    messageSinkManager, urlBuilder, eventBus);
+            final ChatContainer window = new ChatContainer(
+                    myPlugin.getContainer(),
+                    chat,
+                    origin.getConfigManager(),
+                    getController(),
+                    "*Chat: " + target,
+                    myNickname,
+                    target,
+                    tabCompleterFactory,
+                    messageSinkManager,
+                    urlBuilder,
+                    eventBus);
             windowManager.addWindow(myPlugin.getContainer(), window);
             parser.sendCTCP(target, "DCC", "CHAT chat " + DCC.ipToLong(
                     myPlugin.getListenIP(parser)) + " " + chat.getPort());

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

@@ -34,6 +34,8 @@ import com.google.common.eventbus.EventBus;
 
 import java.util.Collection;
 
+import javax.annotation.Nullable;
+
 /**
  * This class links DCC objects to a window.
  */
@@ -45,6 +47,7 @@ public abstract class DCCFrameContainer extends FrameContainer {
     /**
      * Creates a new instance of DCCFrame.
      *
+     * @param parent              The parent of this frame container, if any.
      * @param title               The title of this window
      * @param icon                The icon to use
      * @param configManager       Config manager
@@ -56,6 +59,7 @@ public abstract class DCCFrameContainer extends FrameContainer {
      * @param components          The UI components that this frame requires
      */
     public DCCFrameContainer(
+            @Nullable final FrameContainer parent,
             final String title,
             final String icon,
             final AggregateConfigProvider configManager,
@@ -65,7 +69,7 @@ public abstract class DCCFrameContainer extends FrameContainer {
             final URLBuilder urlBuilder,
             final EventBus eventBus,
             final Collection<String> components) {
-        super(icon, title, title, configManager, urlBuilder, parser,
+        super(parent, icon, title, title, configManager, urlBuilder, parser,
                 tabCompleterFactory.getTabCompleter(configManager),
                 messageSinkManager,
                 eventBus,

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

@@ -437,9 +437,18 @@ public class DCCManager implements ActionListener {
             }
             final String myNickname = ((Connection) arguments[0]).getParser()
                     .getLocalClient().getNickname();
-            final DCCFrameContainer f = new ChatContainer(chat, config, commandController,
-                    "Chat: " + nickname, myNickname, nickname, tabCompleterFactory,
-                    messageSinkManager, urlBuilder, eventBus);
+            final DCCFrameContainer f = new ChatContainer(
+                    getContainer(),
+                    chat,
+                    config,
+                    commandController,
+                    "Chat: " + nickname,
+                    myNickname,
+                    nickname,
+                    tabCompleterFactory,
+                    messageSinkManager,
+                    urlBuilder,
+                    eventBus);
             windowManager.addWindow(getContainer(), f);
             f.addLine("DCCChatStarting", nickname, chat.getHost(),
                     chat.getPort());

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

@@ -59,7 +59,7 @@ public class PlaceholderContainer extends FrameContainer {
             final Window parentWindow,
             final URLBuilder urlBuilder,
             final EventBus eventBus) {
-        super("dcc", "DCCs", "DCCs", config, urlBuilder, eventBus,
+        super(null, "dcc", "DCCs", "DCCs", config, urlBuilder, eventBus,
                 Arrays.asList("com.dmdirc.addons.dcc.ui.PlaceholderPanel"));
         this.plugin = plugin;
         this.parentWindow = parentWindow;

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

@@ -89,7 +89,7 @@ public class TransferContainer extends FrameContainer implements
             final AggregateConfigProvider config, final String title,
             final String targetNick, final Connection connection,
             final URLBuilder urlBuilder, final EventBus eventBus) {
-        super(dcc.getType() == DCCTransfer.TransferType.SEND
+        super(plugin.getContainer(), dcc.getType() == DCCTransfer.TransferType.SEND
                 ? "dcc-send-inactive" : "dcc-receive-inactive",
                 title, title, config, urlBuilder, eventBus,
                 Arrays.asList("com.dmdirc.addons.dcc.ui.TransferPanel"));

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

@@ -54,7 +54,7 @@ public class HistoryWindow extends FrameContainer {
             final URLBuilder urlBuilder,
             final EventBus eventBus,
             final int numLines) {
-        super("raw", title, title, parent.getConfigManager(), urlBuilder, eventBus,
+        super(parent, "raw", title, title, parent.getConfigManager(), urlBuilder, eventBus,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
 
         final int frameBufferSize = parent.getConfigManager().getOptionInt(

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

@@ -62,7 +62,8 @@ public class DebugWindow extends FrameContainer {
             final Connection connection,
             final URLBuilder urlBuilder,
             final EventBus eventBus) {
-        super("raw", "Parser Debug", title, connection.getWindowModel().getConfigManager(),
+        super(connection.getWindowModel(), "raw", "Parser Debug", title,
+                connection.getWindowModel().getConfigManager(),
                 urlBuilder, eventBus, Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
         this.listener = listener;
         this.parser = parser;

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

@@ -54,7 +54,7 @@ public class FakeWriteableFrameContainer extends FrameContainer {
             final MessageSinkManager messageSinkManager,
             final EventBus eventBus,
             final URLBuilder urlBuilder) {
-        super(target.getIcon(), target.getName(), target.getTitle(),
+        super(target, target.getIcon(), target.getName(), target.getTitle(),
                 target.getConfigManager(), urlBuilder, target.getCommandParser(),
                 target.getTabCompleter(), messageSinkManager, eventBus,
                 Collections.<String>emptyList());