Remove FrameContainer parent/child fields.

src/com/dmdirc/Channel.java

@@ -108,7 +108,7 @@ public class Channel extends FrameContainer implements GroupChat {
             final TabCompleterFactory tabCompleterFactory,
             final BackBufferFactory backBufferFactory,
             final GroupChatUserManager groupChatUserManager) {
-        super(connection.getWindowModel(), "channel-inactive",
+        super("channel-inactive",
                 newChannelInfo.getName(),
                 Styliser.stipControlCodes(newChannelInfo.getName()),
                 configMigrator.getConfigProvider(),

src/com/dmdirc/CustomWindow.java

@@ -46,7 +46,7 @@ public class CustomWindow extends FrameContainer {
             final String title,
             final WindowModel parent,
             final BackBufferFactory backBufferFactory) {
-        super(parent, "custom", name, title, parent.getConfigManager(), backBufferFactory,
+        super("custom", name, title, parent.getConfigManager(), backBufferFactory,
                 parent.getEventBus(),
                 Collections.singletonList(WindowComponent.TEXTAREA.getIdentifier()));
         connection = parent.getConnection();
@@ -62,7 +62,7 @@ public class CustomWindow extends FrameContainer {
             final AggregateConfigProvider configProvider,
             final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory) {
-        super(null, "custom", name, title, configProvider, backBufferFactory,
+        super("custom", name, title, configProvider, backBufferFactory,
                 eventBus, Collections.singletonList(WindowComponent.TEXTAREA.getIdentifier()));
         connection = Optional.empty();
         initBackBuffer();

src/com/dmdirc/FrameContainer.java

@@ -47,9 +47,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Optional;
 import java.util.Set;
-import java.util.concurrent.CopyOnWriteArrayList;
-
-import javax.annotation.Nullable;
 
 import static com.google.common.base.Preconditions.checkState;
 
@@ -61,10 +58,6 @@ public abstract class FrameContainer implements WindowModel {
 
     /** Listeners not yet using ListenerSupport. */
     protected final ListenerList listeners = new ListenerList();
-    /** The children of this frame. */
-    private final Collection<WindowModel> children = new CopyOnWriteArrayList<>();
-    /** The parent of this frame. */
-    private final Optional<WindowModel> parent;
     /** The name of the icon being used for this container's frame. */
     private String icon;
     /** The name of this container. */
@@ -108,7 +101,6 @@ public abstract class FrameContainer implements WindowModel {
      * Instantiate new frame container.
      */
     protected FrameContainer(
-            @Nullable final WindowModel parent,
             final String icon,
             final String name,
             final String title,
@@ -116,7 +108,6 @@ public abstract class FrameContainer implements WindowModel {
             final BackBufferFactory backBufferFactory,
             final DMDircMBassador eventBus,
             final Collection<String> components) {
-        this.parent = Optional.ofNullable(parent);
         this.configManager = config;
         this.name = name;
         this.title = title;
@@ -139,7 +130,6 @@ public abstract class FrameContainer implements WindowModel {
      * Instantiate new frame container that accepts user input.
      */
     protected FrameContainer(
-            @Nullable final WindowModel parent,
             final String icon,
             final String name,
             final String title,
@@ -148,7 +138,6 @@ public abstract class FrameContainer implements WindowModel {
             final TabCompleter tabCompleter,
             final DMDircMBassador eventBus,
             final Collection<String> components) {
-        this.parent = Optional.ofNullable(parent);
         this.configManager = config;
         this.name = name;
         this.title = title;
@@ -176,11 +165,6 @@ public abstract class FrameContainer implements WindowModel {
         this.commandParser = Optional.ofNullable(commandParser);
     }
 
-    @Override
-    public Optional<WindowModel> getParent() {
-        return parent;
-    }
-
     @Override
     public String getIcon() {
         return icon;
@@ -211,21 +195,6 @@ public abstract class FrameContainer implements WindowModel {
         return writable;
     }
 
-    @Override
-    public Collection<WindowModel> getChildren() {
-        return Collections.unmodifiableCollection(children);
-    }
-
-    @Override
-    public void addChild(final WindowModel child) {
-        children.add(child);
-    }
-
-    @Override
-    public void removeChild(final WindowModel child) {
-        children.remove(child);
-    }
-
     /**
      * Changes the name of this container, and fires a {@link FrameNameChangedEvent}.
      *

src/com/dmdirc/GlobalWindow.java

@@ -54,7 +54,7 @@ public class GlobalWindow extends FrameContainer {
     public GlobalWindow(@GlobalConfig final AggregateConfigProvider config,
             final GlobalCommandParser parser, final TabCompleterFactory tabCompleterFactory,
             final DMDircMBassador eventBus, final BackBufferFactory backBufferFactory) {
-        super(null, "icon", "Global", "(Global)", config, backBufferFactory,
+        super("icon", "Global", "(Global)", config, backBufferFactory,
                 tabCompleterFactory.getTabCompleter(config, CommandType.TYPE_GLOBAL), eventBus,
                 Arrays.asList(WindowComponent.TEXTAREA.getIdentifier(),
                         WindowComponent.INPUTFIELD.getIdentifier()));

src/com/dmdirc/Query.java

@@ -71,7 +71,7 @@ public class Query extends FrameContainer implements PrivateChat {
             final User user,
             final TabCompleterFactory tabCompleterFactory,
             final BackBufferFactory backBufferFactory) {
-        super(connection.getWindowModel(), "query",
+        super("query",
                 user.getNickname(),
                 user.getNickname(),
                 connection.getWindowModel().getConfigManager(),

src/com/dmdirc/Server.java

@@ -186,7 +186,7 @@ public class Server extends FrameContainer implements Connection {
             @Nonnull final Profile profile,
             final BackBufferFactory backBufferFactory,
             final UserManager userManager) {
-        super(null, "server-disconnected",
+        super("server-disconnected",
                 getHost(uri),
                 getHost(uri),
                 configMigrator.getConfigProvider(),

src/com/dmdirc/interfaces/WindowModel.java

@@ -41,8 +41,6 @@ import java.util.Set;
  */
 public interface WindowModel {
 
-    Optional<WindowModel> getParent();
-
     String getIcon();
 
     String getName();
@@ -55,33 +53,6 @@ public interface WindowModel {
 
     boolean isWritable();
 
-    /**
-     * Returns a collection of direct children of this frame.
-     *
-     * @return This frame's children
-     *
-     * @since 0.6.4
-     */
-    Collection<WindowModel> getChildren();
-
-    /**
-     * Adds a new child window to this frame.
-     *
-     * @param child The window to be added
-     *
-     * @since 0.6.4
-     */
-    void addChild(WindowModel child);
-
-    /**
-     * Removes a child window from this frame.
-     *
-     * @param child The window to be removed
-     *
-     * @since 0.6.4
-     */
-    void removeChild(WindowModel child);
-
     /**
      * Changes the title of this container, and fires a {@link FrameTitleChangedEvent}.
      *

src/com/dmdirc/ui/WindowManager.java

@@ -218,7 +218,6 @@ public class WindowManager {
         checkArgument(isInHierarchy(parent));
         checkNotNull(child);
 
-        parent.addChild(child);
         parents.put(child, parent);
         children.put(parent, child);
 
@@ -264,7 +263,6 @@ public class WindowManager {
         } else {
             final WindowModel parent = parents.get(window);
             fireDeleteWindow(parent, window);
-            parent.removeChild(window);
             parents.remove(parent);
         }
     }

test/com/dmdirc/harness/TestWritableFrameContainer.java

@@ -42,7 +42,7 @@ public class TestWritableFrameContainer extends FrameContainer {
             final AggregateConfigProvider cm, final CommandManager commandManager,
             final DMDircMBassador eventBus,
             final BackBufferFactory backBufferFactory) {
-        super(null, "raw", "Raw", "(Raw)", cm, backBufferFactory,
+        super("raw", "Raw", "(Raw)", cm, backBufferFactory,
                 new TabCompleter(cm),
                 eventBus,
                 Collections.<String>emptySet());

test/com/dmdirc/ui/WindowManagerTest.java

@@ -194,7 +194,6 @@ public class WindowManagerTest {
         manager.removeWindow(child);
 
         verify(frameListener).delWindow(container, child);
-        verify(container).removeChild(child);
     }
 
     @Test
@@ -207,7 +206,6 @@ public class WindowManagerTest {
 
         verify(frameListener).delWindow(container, child);
         verify(grandchild).close();
-        verify(container).removeChild(child);
     }
 
     @Test