Merge pull request #645 from csmith/master

Remove usages of FrameContainer window methods.

src/com/dmdirc/CustomWindow.java

@@ -36,6 +36,8 @@ import java.util.Optional;
  */
 public class CustomWindow extends FrameContainer {
 
+    private final Optional<Connection> connection;
+
     /**
      * Creates a new custom window as a child of the specified window.
      */
@@ -47,6 +49,7 @@ public class CustomWindow extends FrameContainer {
         super(parent, "custom", name, title, parent.getConfigManager(), backBufferFactory,
                 parent.getEventBus(),
                 Collections.singletonList(WindowComponent.TEXTAREA.getIdentifier()));
+        connection = parent.getConnection();
         initBackBuffer();
     }
 
@@ -61,12 +64,13 @@ public class CustomWindow extends FrameContainer {
             final BackBufferFactory backBufferFactory) {
         super(null, "custom", name, title, configProvider, backBufferFactory,
                 eventBus, Collections.singletonList(WindowComponent.TEXTAREA.getIdentifier()));
+        connection = Optional.empty();
         initBackBuffer();
     }
 
     @Override
     public Optional<Connection> getConnection() {
-        return getParent().flatMap(WindowModel::getConnection);
+        return connection;
     }
 
 }

src/com/dmdirc/commandparser/commands/global/Echo.java

@@ -109,7 +109,7 @@ public class Echo extends Command implements IntelligentCommand {
             while (frame == null && target.isPresent()) {
                 frame = windowManager.findCustomWindow(target.get(),
                         results.getArgumentsAsString(targetFlag));
-                target = target.flatMap(WindowModel::getParent);
+                target = target.flatMap(windowManager::getParent);
             }
 
             if (frame == null) {
@@ -144,12 +144,12 @@ public class Echo extends Command implements IntelligentCommand {
             final Optional<Connection> connection = context.getWindow().getConnection();
 
             //Active window's Children
-            windowList.addAll(context.getWindow().getChildren());
+            windowList.addAll(windowManager.getChildren(context.getWindow()));
 
             //Children of Current Window's server
             connection
                     .map(Connection::getWindowModel)
-                    .map(WindowModel::getChildren)
+                    .map(windowManager::getChildren)
                     .ifPresent(windowList::addAll);
 
             //Global Windows

src/com/dmdirc/commandparser/commands/server/JoinChannelCommand.java

@@ -36,6 +36,7 @@ import com.dmdirc.interfaces.CommandController;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.parser.common.ChannelJoinRequest;
+import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.messages.Styliser;
 
@@ -69,6 +70,7 @@ public class JoinChannelCommand extends Command implements IntelligentCommand {
     private final Multimap<WindowModel, String> mentions = ArrayListMultimap.create();
     /** Lock to synchronise on when accessing mentions. */
     private final Object mentionsLock = new Object();
+    private final WindowManager windowManager;
 
     /**
      * Creates a new instance of the join channel command.
@@ -79,8 +81,10 @@ public class JoinChannelCommand extends Command implements IntelligentCommand {
     @Inject
     public JoinChannelCommand(
             final CommandController controller,
+            final WindowManager windowManager,
             final DMDircMBassador eventBus) {
         super(controller);
+        this.windowManager = windowManager;
         eventBus.subscribe(this);
     }
 
@@ -185,14 +189,14 @@ public class JoinChannelCommand extends Command implements IntelligentCommand {
         }
 
         // Check the parent window
-        final Optional<WindowModel> parent = source.getParent();
+        final Optional<WindowModel> parent = windowManager.getParent(source);
         if (checkParents && parent.isPresent()) {
             results.addAll(checkSource(parent.get(), true, false));
         }
 
         // Check the children window
         if (checkChildren) {
-            for (WindowModel child : source.getChildren()) {
+            for (WindowModel child : windowManager.getChildren(source)) {
                 results.addAll(checkSource(child, false, true));
             }
         }