Merge branch 'master' of https://github.com/DMDirc/Plugins into dev4

DMDirc · Jan 18, 2015 · e9516a4 · e9516a4
2 parents 5b6fd58 + c46ece0
commit e9516a4
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 17 deletions.
diff --git a/dcc/src/com/dmdirc/addons/dcc/PlaceholderContainer.java b/dcc/src/com/dmdirc/addons/dcc/PlaceholderContainer.java
@@ -26,6 +26,7 @@
 import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.messages.BackBufferFactory;
 
@@ -68,7 +69,7 @@ public PlaceholderContainer(
     @Override
     public void close() {
         int dccs = 0;
-        for (FrameContainer window : getChildren()) {
+        for (WindowModel window : getChildren()) {
             if (window instanceof TransferContainer
                     && ((TransferContainer) window).getDCC().isActive()
                     || window instanceof ChatContainer
@@ -95,7 +96,7 @@ public Optional<Connection> getConnection() {
     }
 
     @Override
-    public void removeChild(final FrameContainer child) {
+    public void removeChild(final WindowModel child) {
         super.removeChild(child);
 
         if (getChildren().isEmpty()) {

diff --git a/logging/src/com/dmdirc/addons/logging/HistoryWindow.java b/logging/src/com/dmdirc/addons/logging/HistoryWindow.java
@@ -26,6 +26,7 @@
 import com.dmdirc.FrameContainer;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.Connection;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.ui.core.components.WindowComponent;
 import com.dmdirc.ui.messages.BackBufferFactory;
@@ -74,7 +75,7 @@ public HistoryWindow(
 
     @Override
     public Optional<Connection> getConnection() {
-        return getParent().flatMap(FrameContainer::getConnection);
+        return getParent().flatMap(WindowModel::getConnection);
     }
 
     @VisibleForTesting

diff --git a/ui_swing/src/com/dmdirc/addons/ui_swing/SwingWindowFactory.java b/ui_swing/src/com/dmdirc/addons/ui_swing/SwingWindowFactory.java
@@ -34,6 +34,7 @@
 import com.dmdirc.addons.ui_swing.events.SwingWindowAddedEvent;
 import com.dmdirc.addons.ui_swing.events.SwingWindowDeletedEvent;
 import com.dmdirc.events.UserErrorEvent;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.ui.FrameListener;
 import com.dmdirc.logger.ErrorLevel;
 
@@ -104,16 +105,16 @@ public final void registerImplementation(final WindowProvider provider) {
     }
 
     @Override
-    public void addWindow(final FrameContainer window, final boolean focus) {
+    public void addWindow(final WindowModel window, final boolean focus) {
         addWindow(null, window, focus);
     }
 
     @Override
-    public void addWindow(final FrameContainer parent, final FrameContainer window,
+    public void addWindow(final WindowModel parent, final WindowModel window,
             final boolean focus) {
         UIUtilities.invokeLater(() -> {
-            final TextFrame parentWindow = getSwingWindow(parent);
-            final TextFrame childWindow = doAddWindow(window);
+            final TextFrame parentWindow = getSwingWindow((FrameContainer) parent);
+            final TextFrame childWindow = doAddWindow((FrameContainer) window);
 
             if (childWindow == null) {
                 return;
@@ -152,14 +153,14 @@ protected TextFrame doAddWindow(final FrameContainer window) {
     }
 
     @Override
-    public void delWindow(final FrameContainer window) {
+    public void delWindow(final WindowModel window) {
         delWindow(null, window);
     }
 
     @Override
-    public void delWindow(final FrameContainer parent, final FrameContainer window) {
-        final TextFrame parentWindow = getSwingWindow(parent);
-        final TextFrame childWindow = getSwingWindow(window);
+    public void delWindow(final WindowModel parent, final WindowModel window) {
+        final TextFrame parentWindow = getSwingWindow((FrameContainer) parent);
+        final TextFrame childWindow = getSwingWindow((FrameContainer) window);
         windows.remove(window);
         UIUtilities.invokeLater(() -> swingEventBus.publish(new SwingWindowDeletedEvent(
                 Optional.ofNullable(parentWindow), childWindow)));

diff --git a/ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java b/ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/tree/TreeFrameManager.java
@@ -40,6 +40,7 @@
 import com.dmdirc.events.FrameIconChangedEvent;
 import com.dmdirc.events.UnreadStatusChangedEvent;
 import com.dmdirc.events.UserErrorEvent;
+import com.dmdirc.interfaces.WindowModel;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.Window;
@@ -307,12 +308,12 @@ private void redoTreeView() {
             }
             scroller = new TreeTreeScroller(swingEventBus, tree);
 
-            for (FrameContainer window : windowManager.getRootWindows()) {
-                addWindow(null, windowFactory.getSwingWindow(window));
-                final Collection<FrameContainer> childWindows = window.getChildren();
-                for (FrameContainer childWindow : childWindows) {
-                    addWindow(nodes.get(windowFactory.getSwingWindow(window)),
-                            windowFactory.getSwingWindow(childWindow));
+            for (WindowModel window : windowManager.getRootWindows()) {
+                addWindow(null, windowFactory.getSwingWindow((FrameContainer) window));
+                final Collection<WindowModel> childWindows = window.getChildren();
+                for (WindowModel childWindow : childWindows) {
+                    addWindow(nodes.get(windowFactory.getSwingWindow((FrameContainer) window)),
+                            windowFactory.getSwingWindow((FrameContainer) childWindow));
                 }
             }