Switch Window to TextFrame in the frame managers.

ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/ctrltab/CtrlTabWindowManager.java

@@ -40,7 +40,6 @@ import com.dmdirc.addons.ui_swing.framemanager.tree.TreeViewModel;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeViewNode;
 import com.dmdirc.events.UserErrorEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.logger.ErrorLevel;
 
 import java.awt.event.InputEvent;
@@ -69,7 +68,7 @@ import net.engio.mbassy.listener.Invoke;
 public class CtrlTabWindowManager {
 
     /** Node storage, used for adding and deleting nodes correctly. */
-    private final Map<Window, TreeViewNode> nodes;
+    private final Map<TextFrame, TreeViewNode> nodes;
     /** Data model. */
     private final TreeViewModel model;
     /** Tree Scroller. */

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

@@ -24,11 +24,11 @@ package com.dmdirc.addons.ui_swing.framemanager.tree;
 
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.ImageButton;
+import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
 import com.dmdirc.events.FrameIconChangedEvent;
 import com.dmdirc.events.FrameNameChangedEvent;
 import com.dmdirc.events.NotificationSetEvent;
-import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.messages.Styliser;
 
@@ -53,7 +53,7 @@ public class NodeLabel extends JPanel {
     /** A version number for this class. */
     private static final long serialVersionUID = 1;
     /** The window this node represents in the tree. */
-    private final Window window;
+    private final TextFrame window;
     /** Colour used to show if the mouse is over this node. */
     private boolean rollover;
     /** Colour used to show if this node has an active notification. */
@@ -74,7 +74,7 @@ public class NodeLabel extends JPanel {
      *
      * @param window Window for this node
      */
-    public NodeLabel(final Window window, final IconManager iconManager) {
+    public NodeLabel(final TextFrame window, final IconManager iconManager) {
         this.window = window;
         this.iconManager = iconManager;
 

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.framemanager.tree;
 
-import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.actions.CloseWindowAction;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
@@ -73,8 +72,6 @@ public class Tree extends JTree implements MouseMotionListener,
     private boolean dragButton;
     /** Show handles. */
     private boolean showHandles;
-    /** Factory to use to retrieve swing windows. */
-    private final SwingWindowFactory windowFactory;
 
     /**
      * Specialised JTree for frame manager.
@@ -84,20 +81,17 @@ public class Tree extends JTree implements MouseMotionListener,
      * @param eventBus          The swing event bus to post events to.
      * @param globalConfig      The config to read settings from.
      * @param domain            The domain to read settings from.
-     * @param windowFactory     The factory to use to get swing windows.
      */
     public Tree(
             final TreeFrameManager manager,
             final TreeModel model,
             final SwingEventBus eventBus,
             final AggregateConfigProvider globalConfig,
-            final SwingWindowFactory windowFactory,
             final String domain) {
         super(model);
 
         this.manager = manager;
         this.config = globalConfig;
-        this.windowFactory = windowFactory;
         this.eventBus = eventBus;
 
         putClientProperty("JTree.lineStyle", "Angled");

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

@@ -132,8 +132,7 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
             @Override
             public void run() {
                 model = new TreeViewModel(config, new TreeViewNode(null, null));
-                tree = new Tree(TreeFrameManager.this, model, swingEventBus, globalConfig,
-                        windowFactory, domain);
+                tree = new Tree(TreeFrameManager.this, model, swingEventBus, globalConfig, domain);
                 tree.setCellRenderer(
                         new TreeViewTreeCellRenderer(config, colourManager, TreeFrameManager.this));
                 tree.setVisible(true);
@@ -229,7 +228,7 @@ public class TreeFrameManager implements FrameManager, Serializable, ConfigChang
      * @param parent Parent node
      * @param window Window to add
      */
-    public void addWindow(final MutableTreeNode parent, final Window window) {
+    public void addWindow(final MutableTreeNode parent, final TextFrame window) {
         UIUtilities.invokeAndWait(new Runnable() {
 
             @Override

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

@@ -75,7 +75,7 @@ public class TreeViewModel extends DefaultTreeModel {
      * @return index where new node is to be inserted.
      */
     private int getIndex(final TreeViewNode newChild, final TreeNode parent) {
-        if (newChild.getWindow() instanceof GlobalWindow) {
+        if (newChild.getWindow().getContainer() instanceof GlobalWindow) {
             return 0;
         }
 
@@ -107,8 +107,7 @@ public class TreeViewModel extends DefaultTreeModel {
      *
      * @return True iff newChild should be sorted before child
      */
-    private boolean sortBefore(final TreeViewNode newChild,
-            final TreeViewNode child) {
+    private boolean sortBefore(final TreeViewNode newChild, final TreeViewNode child) {
         return comparator.compare(newChild.getWindow(), child.
                 getWindow()) <= -1;
     }
@@ -122,8 +121,7 @@ public class TreeViewModel extends DefaultTreeModel {
      *
      * @return True iff newChild should be sorted before child
      */
-    private boolean sortAfter(final TreeViewNode newChild,
-            final TreeViewNode child) {
+    private boolean sortAfter(final TreeViewNode newChild, final TreeViewNode child) {
         return comparator.compare(newChild.getWindow(), child.
                 getWindow()) >= 1;
     }

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

@@ -22,7 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.framemanager.tree;
 
-import com.dmdirc.interfaces.ui.Window;
+import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 
 import javax.swing.tree.DefaultMutableTreeNode;
 
@@ -36,7 +36,7 @@ public class TreeViewNode extends DefaultMutableTreeNode {
     /** Node's label. */
     private final NodeLabel label;
     /** Node's frame container. */
-    private final Window window;
+    private final TextFrame window;
 
     /**
      * Instantiates a new tree view node.
@@ -44,7 +44,7 @@ public class TreeViewNode extends DefaultMutableTreeNode {
      * @param label  Node label
      * @param window Node window
      */
-    public TreeViewNode(final NodeLabel label, final Window window) {
+    public TreeViewNode(final NodeLabel label, final TextFrame window) {
 
         this.label = label;
         this.window = window;
@@ -64,7 +64,7 @@ public class TreeViewNode extends DefaultMutableTreeNode {
      *
      * @return Node window
      */
-    public Window getWindow() {
+    public TextFrame getWindow() {
         return window;
     }
 

ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/WindowMenuFrameManager.java

@@ -30,7 +30,6 @@ import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.events.SwingWindowAddedEvent;
 import com.dmdirc.addons.ui_swing.events.SwingWindowDeletedEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.plugins.PluginDomain;
 
 import com.google.common.collect.Maps;
@@ -59,7 +58,7 @@ public class WindowMenuFrameManager extends JMenu {
     /** Window selection font changer. */
     private final WindowSelectionFontChangerFactory windowSelectionFontChanger;
     /** Window to item mapping. */
-    private final Map<Window, AbstractButton> menuItems;
+    private final Map<TextFrame, AbstractButton> menuItems;
     /** Swing event bus. */
     private final SwingEventBus swingEventBus;
     /** Close menu item. */
@@ -156,11 +155,11 @@ public class WindowMenuFrameManager extends JMenu {
         add(item);
     }
 
-    private void deleteTopLevelWindow(final Window window) {
+    private void deleteTopLevelWindow(final TextFrame window) {
         remove(menuItems.get(window));
     }
 
-    private void deleteChildWindow(final Window parent, final Window child) {
+    private void deleteChildWindow(final TextFrame parent, final TextFrame child) {
         menuItems.get(parent).remove(menuItems.get(child));
     }
 }

ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/WindowSelectionFontChanger.java

@@ -23,10 +23,10 @@
 package com.dmdirc.addons.ui_swing.framemanager.windowmenu;
 
 import com.dmdirc.addons.ui_swing.EdtHandlerInvocation;
+import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.events.SwingWindowSelectedEvent;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
-import com.dmdirc.interfaces.ui.Window;
 
 import java.awt.Font;
 import java.util.Optional;
@@ -46,9 +46,9 @@ import net.engio.mbassy.listener.References;
 public class WindowSelectionFontChanger {
 
     private final JComponent component;
-    private final Window window;
+    private final TextFrame window;
 
-    public WindowSelectionFontChanger(final JComponent component, final Window window) {
+    public WindowSelectionFontChanger(final JComponent component, final TextFrame window) {
         this.component = component;
         this.window = window;
     }

ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/WindowSelectionFontChangerFactory.java

@@ -22,9 +22,9 @@
 
 package com.dmdirc.addons.ui_swing.framemanager.windowmenu;
 
+import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.events.SwingEventBus;
 import com.dmdirc.addons.ui_swing.interfaces.ActiveFrameManager;
-import com.dmdirc.interfaces.ui.Window;
 
 import javax.inject.Inject;
 import javax.swing.JComponent;
@@ -45,7 +45,7 @@ public class WindowSelectionFontChangerFactory {
     }
 
     public WindowSelectionFontChanger getWindowSelectionFontChanger(final JComponent component,
-            final Window window) {
+            final TextFrame window) {
         final WindowSelectionFontChanger windowSelectionFontChanger
                 = new WindowSelectionFontChanger(component, window);
         windowSelectionFontChanger.init(activeFrameManager, swingEventBus);