FrameContainers need UIControllers to be sane... Simple method to provide this.

Change-Id: I1fe08f27693e9fb8134b53c317a8871d93658178
Reviewed-on: http://gerrit.dmdirc.com/1145
Automatic-Compile: Chris Smith <chris@dmdirc.com>
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/ui_dummy/DummyFrameManager.java

@@ -25,6 +25,7 @@ package com.dmdirc.addons.ui_dummy;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
 import com.dmdirc.ui.interfaces.FrameManager;
+import com.dmdirc.ui.interfaces.UIController;
 
 import java.awt.Color;
 
@@ -88,4 +89,9 @@ public class DummyFrameManager implements FrameManager {
         return true;
     }
 
+    @Override
+    public void setController(UIController controller) {
+        throw new UnsupportedOperationException("Not supported yet.");
+    }
+
 }

src/com/dmdirc/addons/ui_swing/MainFrame.java

@@ -364,6 +364,7 @@ public final class MainFrame extends JFrame implements WindowListener,
                     // the same way, so we might as well catch Exception
                     mainFrameManager = new TreeFrameManager();
                 }
+                mainFrameManager.setController(controller);
 
                 WindowManager.addFrameListener(mainFrameManager);
                 mainFrameManager.setParent(frameManagerPanel);

src/com/dmdirc/addons/ui_swing/framemanager/buttonbar/ButtonBar.java

@@ -23,7 +23,10 @@ package com.dmdirc.addons.ui_swing.framemanager.buttonbar;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.FrameContainerComparator;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.NotificationListener;
@@ -31,6 +34,7 @@ import com.dmdirc.interfaces.SelectionListener;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.interfaces.FrameManager;
 import com.dmdirc.ui.interfaces.FramemanagerPosition;
+import com.dmdirc.ui.interfaces.UIController;
 import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.util.MapList;
 
@@ -96,6 +100,8 @@ public final class ButtonBar implements FrameManager, ActionListener,
     private int buttonWidth = 0;
     /** The height of buttons. */
     private int buttonHeight = 25;
+    /** UI Controller. */
+    private SwingWindowFactory controller;
 
     /** Creates a new instance of DummyFrameManager. */
     public ButtonBar() {
@@ -140,6 +146,16 @@ public final class ButtonBar implements FrameManager, ActionListener,
         });
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public void setController(final UIController controller) {
+        if (!(controller instanceof SwingController)) {
+            throw new IllegalArgumentException("Controller must be an instance "
+                    + "of SwingController");
+        }
+        this.controller = ((SwingController) controller).getWindowFactory();
+    }
+
     /**
      * Removes all buttons from the bar and readds them.
      */
@@ -281,7 +297,9 @@ public final class ButtonBar implements FrameManager, ActionListener,
     public void actionPerformed(final ActionEvent e) {
         for (Map.Entry<FrameContainer<?>, JToggleButton> entry : buttons.entrySet()) {
             if (entry.getValue().equals(e.getSource())) {
-                if (entry.getKey().getFrame().equals(activeWindow)) {
+                final TextFrame frame = (TextFrame) controller.getSwingWindow(
+                        entry.getKey());
+                if (frame != null && frame.equals(activeWindow)) {
                     entry.getValue().setSelected(true);
                 }
 
@@ -348,7 +366,7 @@ public final class ButtonBar implements FrameManager, ActionListener,
     /** {@inheritDoc} */
     @Override
     public void selectionChanged(final FrameContainer<?> window) {
-        activeWindow = window.getFrame();
+        activeWindow = (TextFrame) controller.getSwingWindow(window);
         if (selected != null && buttons.containsKey(selected)) {
             buttons.get(selected).setSelected(false);
         }

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

@@ -22,6 +22,7 @@
 
 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.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
@@ -30,7 +31,6 @@ import com.dmdirc.addons.ui_swing.components.TreeScroller;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.ui.interfaces.Window;
 
 import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
@@ -68,17 +68,22 @@ public class Tree extends JTree implements MouseMotionListener,
     private boolean dragButton;
     /** Tree frame manager. */
     private TreeFrameManager manager;
+    /** UI Controller. */
+    private SwingWindowFactory controller;
 
     /**
      * Specialised JTree for frame manager.
      *
      * @param manager Frame manager
      * @param model tree model.
+     * @param controller Swing controller
      */
-    public Tree(final TreeFrameManager manager, final TreeModel model) {
+    public Tree(final TreeFrameManager manager, final TreeModel model,
+            final SwingWindowFactory controller) {
         super(model);
 
         this.manager = manager;
+        this.controller = controller;
 
         putClientProperty("JTree.lineStyle", "Angled");
         getInputMap().setParent(null);
@@ -280,13 +285,8 @@ public class Tree extends JTree implements MouseMotionListener,
             if (e.isPopupTrigger()) {
                 TextFrame frame = null;
 
-                for (Window window : ((TreeViewNode) localPath.
-                        getLastPathComponent()).getWindow().getWindows()) {
-                    if (window instanceof TextFrame) {
-                        frame = (TextFrame) window;
-                        break;
-                    }
-                }
+                frame = (TextFrame) controller.getSwingWindow(((TreeViewNode)
+                        localPath.getLastPathComponent()).getWindow());
 
                 if (frame == null) {
                     return;

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.framemanager.tree;
 
 import com.dmdirc.FrameContainer;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.interfaces.FrameInfoListener;
@@ -33,6 +34,7 @@ import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.interfaces.FrameManager;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.interfaces.UIController;
 
 import java.awt.Color;
 import java.awt.Rectangle;
@@ -68,26 +70,17 @@ public final class TreeFrameManager implements FrameManager,
      */
     private static final long serialVersionUID = 5;
     /** display tree. */
-    private final Tree tree;
+    private Tree tree;
     /** data model. */
-    private final TreeViewModel model;
+    private TreeViewModel model;
     /** node storage, used for adding and deleting nodes correctly. */
     private final Map<FrameContainer<?>, TreeViewNode> nodes;
+    /** UI Controller. */
+    private SwingController controller;
 
     /** creates a new instance of the TreeFrameManager. */
     public TreeFrameManager() {
         nodes = new HashMap<FrameContainer<?>, TreeViewNode>();
-        model = new TreeViewModel(new TreeViewNode(null, null));
-        tree = new Tree(this, model);
-
-        tree.setCellRenderer(new TreeViewTreeCellRenderer(this));
-        tree.setVisible(true);
-
-        IdentityManager.getGlobalConfig().addChangeListener("treeview", this);
-        IdentityManager.getGlobalConfig().addChangeListener("ui",
-                "backgroundcolour", this);
-        IdentityManager.getGlobalConfig().addChangeListener("ui",
-                "foregroundcolour", this);
     }
 
     /** {@inheritDoc} */
@@ -124,6 +117,37 @@ public final class TreeFrameManager implements FrameManager,
         });
     }
 
+    /** {@inheritDoc} */
+    @Override
+    public void setController(final UIController controller) {
+        if (!(controller instanceof SwingController)) {
+            throw new IllegalArgumentException("Controller must be an instance "
+                    + "of SwingController");
+        }
+        this.controller = (SwingController) controller;
+
+        UIUtilities.invokeLater(new Runnable() {
+
+            @Override
+            public void run() {
+                model = new TreeViewModel(new TreeViewNode(null, null));
+                tree = new Tree(TreeFrameManager.this, model, 
+                        TreeFrameManager.this.controller.getWindowFactory());
+
+                tree.setCellRenderer(new TreeViewTreeCellRenderer(
+                        TreeFrameManager.this));
+                tree.setVisible(true);
+
+                IdentityManager.getGlobalConfig().addChangeListener("treeview",
+                        TreeFrameManager.this);
+                IdentityManager.getGlobalConfig().addChangeListener("ui",
+                        "backgroundcolour", TreeFrameManager.this);
+                IdentityManager.getGlobalConfig().addChangeListener("ui",
+                        "foregroundcolour", TreeFrameManager.this);
+            }
+        });
+    }
+
     /** {@inheritDoc} */
     @Override
     public void addWindow(final FrameContainer<?> window, final boolean focus) {

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

@@ -23,11 +23,11 @@
 package com.dmdirc.addons.ui_swing.framemanager.tree;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.ui.interfaces.Window;
+
 import javax.swing.tree.DefaultMutableTreeNode;
 
 /**
- *
+ * Tree node representing a NodeLabel and a FrameContainer.
  */
 public class TreeViewNode extends DefaultMutableTreeNode {
     
@@ -41,20 +41,35 @@ public class TreeViewNode extends DefaultMutableTreeNode {
     private NodeLabel label;
     /** Node's frame container. */
     private FrameContainer<?> window;
-    
+
+    /**
+     * Instantiates a new tree view node.
+     *
+     * @param label Node label
+     * @param window Node window
+     */
     public TreeViewNode(final NodeLabel label, final FrameContainer<?> window) {
         super();
         
         this.label = label;
         this.window = window;
     }
-    
+
+    /**
+     * Returns the label for this tree node.
+     *
+     * @return Node label
+     */
     public NodeLabel getLabel() {
         return label;
     }
-    
+
+    /**
+     * Returns the FrameContainer for this node.
+     *
+     * @return Node window
+     */
     public FrameContainer<?> getWindow() {
         return window;
     }
-
 }

src/com/dmdirc/addons/ui_web/uicomponents/WebFrameManager.java

@@ -27,6 +27,7 @@ import com.dmdirc.ui.interfaces.FrameManager;
 import com.dmdirc.addons.ui_web.DynamicRequestHandler;
 import com.dmdirc.addons.ui_web.Event;
 import com.dmdirc.addons.ui_web.WebInterfaceUI;
+import com.dmdirc.ui.interfaces.UIController;
 import javax.swing.JComponent;
 
 /**
@@ -87,4 +88,9 @@ public class WebFrameManager implements FrameManager {
         throw new UnsupportedOperationException("Not supported yet.");
     }
 
+    @Override
+    public void setController(UIController controller) {
+        //Ignore
+    }
+
 }