Merge pull request #455 from csmith/master

Remove usages of FrameContainer window methods.

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

      * Create the container window.
      */
     protected void createContainer() {
-        container = new PlaceholderContainer(this, config, backBufferFactory, mainWindow, eventBus);
+        container = new PlaceholderContainer(this, config, backBufferFactory, mainWindow,
+                windowManager, eventBus);
         windowManager.addWindow(container);
     }
 

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

 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.BackBufferFactory;
 
 import java.awt.Dialog.ModalityType;
     private final DCCManager plugin;
     /** Window that will own new dialogs. */
     private final Window parentWindow;
+    private final WindowManager windowManager;
 
     /**
      * Creates a placeholder DCC frame.
             final AggregateConfigProvider config,
             final BackBufferFactory backBufferFactory,
             final Window parentWindow,
+            final WindowManager windowManager,
             final DMDircMBassador eventBus) {
         super(null, "dcc", "DCCs", "DCCs", config, backBufferFactory, eventBus,
                 Collections.singletonList("com.dmdirc.addons.dcc.ui.PlaceholderPanel"));
         this.plugin = plugin;
         this.parentWindow = parentWindow;
+        this.windowManager = windowManager;
         initBackBuffer();
     }
 
     @Override
     public void close() {
         int dccs = 0;
-        for (WindowModel window : getChildren()) {
+        for (WindowModel window : windowManager.getChildren(this)) {
             if (window instanceof TransferContainer
                     && ((TransferContainer) window).getDCC().isActive()
                     || window instanceof ChatContainer
     public void removeChild(final WindowModel child) {
         super.removeChild(child);
 
-        if (getChildren().isEmpty()) {
+        if (windowManager.getChildren(this).isEmpty()) {
             close();
         }
     }

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

 public class HistoryWindow extends FrameContainer {
 
     private static final Logger LOG = LoggerFactory.getLogger(HistoryWindow.class);
+    private final Optional<Connection> connection;
     private final Path logFile;
     private final int numLines;
 
                 eventBus, Collections.singletonList(WindowComponent.TEXTAREA.getIdentifier()));
         this.logFile = logFile;
         this.numLines = numLines;
+        this.connection = parent.getConnection();
 
         initBackBuffer();
         outputLoggingBackBuffer(parent.getConfigManager().getOptionInt("ui", "frameBufferSize"));
 
     @Override
     public Optional<Connection> getConnection() {
-        return getParent().flatMap(WindowModel::getConnection);
+        return connection;
     }
 
     @VisibleForTesting

ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java

 
             for (WindowModel window : windowManager.getRootWindows()) {
                 addWindow(null, windowFactory.getSwingWindow(window));
-                final Collection<WindowModel> childWindows = window.getChildren();
+                final Collection<WindowModel> childWindows = windowManager.getChildren(window);
                 for (WindowModel childWindow : childWindows) {
                     addWindow(nodes.get(windowFactory.getSwingWindow(window)),
                             windowFactory.getSwingWindow(childWindow));

ui_web2/src/com/dmdirc/addons/ui_web2/InitialStateProducer.java

     private final WindowManager windowManager;
 
     @Inject
-    public InitialStateProducer(final WindowManager windowManager) {
+    public InitialStateProducer(
+            final WindowManager windowManager,
+            final WindowModelSerialiser windowSerialiser) {
         serialiser = new GsonBuilder()
-                .registerTypeHierarchyAdapter(WindowModel.class, new WindowModelSerialiser())
+                .registerTypeHierarchyAdapter(WindowModel.class, windowSerialiser)
                 .registerTypeAdapter(BackBuffer.class, new BackBufferSerializer())
                 .create();
         this.windowManager = windowManager;

ui_web2/src/com/dmdirc/addons/ui_web2/serialisers/WindowModelSerialiser.java

 package com.dmdirc.addons.ui_web2.serialisers;
 
 import com.dmdirc.interfaces.WindowModel;
+import com.dmdirc.ui.WindowManager;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 
 import java.lang.reflect.Type;
 
+import javax.inject.Inject;
+
 /**
  * Serialises {@link WindowModel}s.
  */
 public class WindowModelSerialiser implements JsonSerializer<WindowModel> {
 
+    private final WindowManager windowManager;
+
+    @Inject
+    public WindowModelSerialiser(final WindowManager windowManager) {
+        this.windowManager = windowManager;
+    }
+
     @Override
     public JsonElement serialize(final WindowModel src, final Type typeOfSrc,
             final JsonSerializationContext context) {
         res.addProperty("icon", src.getIcon());
         res.addProperty("title", src.getTitle());
         res.addProperty("writable", src.isWritable());
-        res.add("children", context.serialize(src.getChildren()));
+        res.add("children", context.serialize(windowManager.getChildren(src)));
         res.add("components", context.serialize(src.getComponents()));
         res.add("backbuffer", context.serialize(src.getBackBuffer()));
         return res;