Pass FrameContainer their parents when constructed

There's no reason for the parent to ever change, and this simplifies
a lot of things going forward.

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

src/com/dmdirc/Channel.java

@@ -117,7 +117,7 @@ public class Channel extends MessageTarget implements ConfigChangeListener, Grou
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
             final EventBus eventBus) {
-        super("channel-inactive", newChannelInfo.getName(),
+        super(newServer, "channel-inactive", newChannelInfo.getName(),
                 Styliser.stipControlCodes(newChannelInfo.getName()),
                 configMigrator.getConfigProvider(),
                 new ChannelCommandParser(newServer, commandController),

src/com/dmdirc/CustomWindow.java

@@ -51,7 +51,7 @@ public class CustomWindow extends FrameContainer {
             final FrameContainer parent,
             final URLBuilder urlBuilder,
             final EventBus eventBus) {
-        super("custom", name, title, parent.getConfigManager(), urlBuilder, eventBus,
+        super(parent, "custom", name, title, parent.getConfigManager(), urlBuilder, eventBus,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
     }
 
@@ -70,7 +70,7 @@ public class CustomWindow extends FrameContainer {
             final AggregateConfigProvider configProvider,
             final URLBuilder urlBuilder,
             final EventBus eventBus) {
-        super("custom", name, title, configProvider, urlBuilder, eventBus,
+        super(null, "custom", name, title, configProvider, urlBuilder, eventBus,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier()));
     }
 

src/com/dmdirc/FrameContainer.java

@@ -55,6 +55,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 
+import javax.annotation.Nullable;
+
 import static com.google.common.base.Preconditions.checkState;
 
 /**
@@ -72,7 +74,7 @@ public abstract class FrameContainer {
     /** The children of this frame. */
     private final Collection<FrameContainer> children = new CopyOnWriteArrayList<>();
     /** The parent of this frame. */
-    private FrameContainer parent;
+    private final FrameContainer parent;
     /** The name of the icon being used for this container's frame. */
     private String icon;
     /** The name of this container. */
@@ -119,6 +121,7 @@ public abstract class FrameContainer {
     /**
      * Instantiate new frame container.
      *
+     * @param parent     The parent of this frame container, if any.
      * @param icon       The icon to use for this container
      * @param name       The name of this container
      * @param title      The title of this container
@@ -130,6 +133,7 @@ public abstract class FrameContainer {
      * @since 0.6.4
      */
     protected FrameContainer(
+            @Nullable final FrameContainer parent,
             final String icon,
             final String name,
             final String title,
@@ -137,6 +141,7 @@ public abstract class FrameContainer {
             final URLBuilder urlBuilder,
             final EventBus eventBus,
             final Collection<String> components) {
+        this.parent = parent;
         this.configManager = config;
         this.name = name;
         this.title = title;
@@ -154,6 +159,7 @@ public abstract class FrameContainer {
     /**
      * Instantiate new frame container that accepts user input.
      *
+     * @param parent             The parent of this frame container, if any.
      * @param icon               The icon to use for this container
      * @param name               The name of this container
      * @param title              The title of this container
@@ -168,6 +174,7 @@ public abstract class FrameContainer {
      * @since 0.6.4
      */
     protected FrameContainer(
+            @Nullable final FrameContainer parent,
             final String icon,
             final String name,
             final String title,
@@ -178,6 +185,7 @@ public abstract class FrameContainer {
             final MessageSinkManager messageSinkManager,
             final EventBus eventbus,
             final Collection<String> components) {
+        this.parent = parent;
         this.configManager = config;
         this.name = name;
         this.title = title;
@@ -241,7 +249,6 @@ public abstract class FrameContainer {
      */
     public void addChild(final FrameContainer child) {
         children.add(child);
-        child.setParent(this);
     }
 
     /**
@@ -255,22 +262,6 @@ public abstract class FrameContainer {
         children.remove(child);
     }
 
-    /**
-     * Sets the parent of this container to the one specified. If this container already had a
-     * parent, it will deregister itself with the old parent.
-     *
-     * @param parent The new parent for this container
-     *
-     * @since 0.6.4
-     */
-    public synchronized void setParent(final FrameContainer parent) {
-        if (this.parent != null && (parent == null || !parent.equals(this.parent))) {
-            this.parent.removeChild(this);
-        }
-
-        this.parent = parent;
-    }
-
     /**
      * Gets an icon manager for this container.
      *

src/com/dmdirc/GlobalWindow.java

@@ -67,7 +67,7 @@ public class GlobalWindow extends FrameContainer {
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
             final EventBus eventBus) {
-        super("icon", "Global", "(Global)", config, urlBuilder, parser,
+        super(null, "icon", "Global", "(Global)", config, urlBuilder, parser,
                 tabCompleterFactory.getTabCompleter(config, CommandType.TYPE_GLOBAL),
                 messageSinkManager, eventBus,
                 Arrays.asList(

src/com/dmdirc/MessageTarget.java

@@ -32,6 +32,8 @@ import com.google.common.eventbus.EventBus;
 
 import java.util.Collection;
 
+import javax.annotation.Nullable;
+
 /**
  * Defines common methods for objects that you can send messages to (such as channels and queries).
  */
@@ -40,6 +42,7 @@ public abstract class MessageTarget extends FrameContainer {
     /**
      * Creates a new MessageTarget.
      *
+     * @param parent             The parent of this frame container, if any.
      * @param icon               The icon to use for this target
      * @param name               The name of this target
      * @param title              The title of this target
@@ -54,6 +57,7 @@ public abstract class MessageTarget extends FrameContainer {
      * @since 0.6.4
      */
     public MessageTarget(
+            @Nullable final FrameContainer parent,
             final String icon,
             final String name,
             final String title,
@@ -64,8 +68,8 @@ public abstract class MessageTarget extends FrameContainer {
             final URLBuilder urlBuilder,
             final EventBus eventBus,
             final Collection<String> components) {
-        super(icon, name, title, config, urlBuilder, parser, tabCompleter, messageSinkManager,
-                eventBus, components);
+        super(parent, icon, name, title, config, urlBuilder, parser, tabCompleter,
+                messageSinkManager, eventBus, components);
     }
 
     /**

src/com/dmdirc/Query.java

@@ -102,7 +102,7 @@ public class Query extends MessageTarget implements PrivateActionListener,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder,
             final EventBus eventBus) {
-        super("query", newServer.parseHostmask(newHost)[0],
+        super(newServer, "query", newServer.parseHostmask(newHost)[0],
                 newServer.parseHostmask(newHost)[0],
                 newServer.getConfigManager(),
                 new QueryCommandParser(newServer, commandController),

src/com/dmdirc/Raw.java

@@ -67,7 +67,7 @@ public class Raw extends FrameContainer implements DataInListener, DataOutListen
             final MessageSinkManager messageSinkManager,
             final EventBus eventBus,
             final URLBuilder urlBuilder) {
-        super("raw", "Raw", "(Raw log)", newServer.getConfigManager(), urlBuilder,
+        super(newServer, "raw", "Raw", "(Raw log)", newServer.getConfigManager(), urlBuilder,
                 new ServerCommandParser(newServer.getConfigManager(), commandController),
                 newServer.getTabCompleter(),
                 messageSinkManager,

src/com/dmdirc/Server.java

@@ -230,7 +230,7 @@ public class Server extends FrameContainer implements ConfigChangeListener,
             @Unbound final ScheduledExecutorService executorService,
             @Unbound final URI uri,
             @Unbound final ConfigProvider profile) {
-        super("server-disconnected",
+        super(null, "server-disconnected",
                 getHost(uri),
                 getHost(uri),
                 configMigrator.getConfigProvider(),

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -46,7 +46,7 @@ public class TestWritableFrameContainer extends FrameContainer {
             final AggregateConfigProvider cm, final CommandManager commandManager,
             final MessageSinkManager messageSinkManager,
             final URLBuilder urlBuilder, final EventBus eventBus) {
-        super("raw", "Raw", "(Raw)", cm, urlBuilder,
+        super(null, "raw", "Raw", "(Raw)", cm, urlBuilder,
                 new GlobalCommandParser(cm, commandManager),
                 new TabCompleter(mock(CommandController.class), cm),
                 messageSinkManager,