Merge pull request #456 from csmith/master

Remove FrameContainer parent/child fields.

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

      * @param eventBus            The bus to dispatch events on.
      */
     public ChatContainer(
-            @Nullable final WindowModel parent,
             final DCCChat dcc,
             final AggregateConfigProvider configManager,
             final BackBufferFactory backBufferFactory,
             final String targetNick,
             final TabCompleterFactory tabCompleterFactory,
             final DMDircMBassador eventBus) {
-        super(parent, title, "dcc-chat-inactive", configManager, backBufferFactory,
+        super(title, "dcc-chat-inactive", configManager, backBufferFactory,
                 new DCCCommandParser(configManager, commandController, eventBus),
                 tabCompleterFactory,
                 eventBus,

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

         final DCCChat chat = new DCCChat();
         if (myPlugin.listen(chat)) {
             final ChatContainer window = new ChatContainer(
-                    myPlugin.getContainer(),
                     chat,
                     origin.getConfigManager(),
                     backBufferFactory,

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

 import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.interfaces.Connection;
-import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.input.TabCompleterFactory;
 import com.dmdirc.ui.messages.BackBufferFactory;
 import java.util.Collection;
 import java.util.Optional;
 
-import javax.annotation.Nullable;
-
 /**
  * This class links DCC objects to a window.
  */
     /**
      * 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
      * @param components          The UI components that this frame requires
      */
     public DCCFrameContainer(
-            @Nullable final WindowModel parent,
             final String title,
             final String icon,
             final AggregateConfigProvider configManager,
             final TabCompleterFactory tabCompleterFactory,
             final DMDircMBassador eventBus,
             final Collection<String> components) {
-        super(parent, icon, title, title, configManager, backBufferFactory,
+        super(icon, title, title, configManager, backBufferFactory,
                 tabCompleterFactory.getTabCompleter(configManager),
                 eventBus,
                 components);

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

         chat.setAddress(ipAddress, port);
         final String myNickname = parser.getLocalClient().getNickname();
         final DCCFrameContainer container = new ChatContainer(
-                getContainer(),
                 chat,
                 config,
                 backBufferFactory,

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

             final Window parentWindow,
             final WindowManager windowManager,
             final DMDircMBassador eventBus) {
-        super(null, "dcc", "DCCs", "DCCs", config, backBufferFactory, eventBus,
+        super("dcc", "DCCs", "DCCs", config, backBufferFactory, eventBus,
                 Collections.singletonList("com.dmdirc.addons.dcc.ui.PlaceholderPanel"));
         this.plugin = plugin;
         this.parentWindow = parentWindow;
         return Optional.empty();
     }
 
-    @Override
-    public void removeChild(final WindowModel child) {
-        super.removeChild(child);
-
-        if (windowManager.getChildren(this).isEmpty()) {
-            close();
-        }
-    }
-
 }

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

             final BackBufferFactory backBufferFactory, final String title,
             final String targetNick, @Nullable final Connection connection,
             final DMDircMBassador eventBus) {
-        super(plugin.getContainer(), dcc.getType() == DCCTransfer.TransferType.SEND
+        super(dcc.getType() == DCCTransfer.TransferType.SEND
                 ? "dcc-send-inactive" : "dcc-receive-inactive",
                 title, title, config, backBufferFactory, eventBus,
                 Arrays.asList("com.dmdirc.addons.dcc.ui.TransferPanel"));

debug/src/com/dmdirc/addons/debug/RawWindow.java

             final Connection connection,
             final TabCompleterFactory tabCompleterFactory,
             final BackBufferFactory backBufferFactory) {
-        super(connection.getWindowModel(), "raw", "Raw", "(Raw log)",
+        super("raw", "Raw", "(Raw log)",
                 connection.getWindowModel().getConfigManager(),
                 backBufferFactory,
                 tabCompleterFactory.getTabCompleter(connection.getWindowModel().getTabCompleter(),

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

             final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory,
             final int numLines) {
-        super(parent, "raw", title, title, parent.getConfigManager(), backBufferFactory,
+        super("raw", title, title, parent.getConfigManager(), backBufferFactory,
                 eventBus, Collections.singletonList(WindowComponent.TEXTAREA.getIdentifier()));
         this.logFile = logFile;
         this.numLines = numLines;

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

             final Connection connection,
             final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory) {
-        super(connection.getWindowModel(), "raw", "Parser Debug", title,
+        super("raw", "Parser Debug", title,
                 connection.getWindowModel().getConfigManager(), backBufferFactory,
                 eventBus, Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
         this.listener = listener;

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

             final WindowModel target,
             final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory) {
-        super(target, target.getIcon(), target.getName(), target.getTitle(),
+        super(target.getIcon(), target.getName(), target.getTitle(),
                 target.getConfigManager(), backBufferFactory,
                 target.getTabCompleter(), eventBus, Collections.<String>emptyList());
         this.target = target;