Remove some deprecated methods.

Change-Id: Ic23e4904ada42ac1cb942634d397b002d67eda30
Reviewed-on: http://gerrit.dmdirc.com/3285
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Greg Holmes <greg@dmdirc.com>

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.framemanager.tree;
 
 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.actions.CloseFrameContainerAction;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
@@ -72,21 +73,32 @@ 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.
      *
-     * @param manager    Frame manager
-     * @param model      tree model.
-     * @param controller Swing controller
+     * @param manager       Frame manager
+     * @param model         tree model.
+     * @param controller    Swing controller
+     * @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 SwingController controller) {
+    public Tree(
+            final TreeFrameManager manager,
+            final TreeModel model,
+            final SwingController controller,
+            final AggregateConfigProvider globalConfig,
+            final SwingWindowFactory windowFactory,
+            final String domain) {
         super(model);
 
         this.manager = manager;
         this.controller = controller;
-        this.config = controller.getGlobalConfig();
+        this.config = globalConfig;
+        this.windowFactory = windowFactory;
 
         putClientProperty("JTree.lineStyle", "Angled");
         getInputMap().setParent(null);
@@ -105,8 +117,8 @@ public class Tree extends JTree implements MouseMotionListener,
         setFocusable(false);
 
         dragSelect = config.getOptionBool("treeview", "dragSelection");
-        showHandles = config.getOptionBool(controller.getDomain(), "showtreeexpands");
-        config.addChangeListener(controller.getDomain(), "showtreeexpands", this);
+        showHandles = config.getOptionBool(domain, "showtreeexpands");
+        config.addChangeListener(domain, "showtreeexpands", this);
         config.addChangeListener("treeview", this);
 
         setShowsRootHandles(showHandles);
@@ -162,7 +174,7 @@ public class Tree extends JTree implements MouseMotionListener,
                 dragSelect = config.getOptionBool("treeview", "dragSelection");
                 break;
             case "showtreeexpands":
-                config.getOptionBool(controller.getDomain(), "showtreeexpands");
+                showHandles = config.getOptionBool(domain, "showtreeexpands");
                 setShowsRootHandles(showHandles);
                 putClientProperty("showHandles", showHandles);
                 break;
@@ -179,9 +191,9 @@ public class Tree extends JTree implements MouseMotionListener,
         if (dragSelect && dragButton) {
             final TreeViewNode node = getNodeForLocation(e.getX(), e.getY());
             if (node != null) {
-                controller.requestWindowFocus(controller.getWindowFactory()
-                        .getSwingWindow(((TreeViewNode) new TreePath(node.getPath()).
-                                getLastPathComponent()).getWindow()));
+                controller.requestWindowFocus(windowFactory.getSwingWindow(
+                        ((TreeViewNode) new TreePath(node.getPath()).getLastPathComponent())
+                        .getWindow()));
             }
         }
         manager.checkRollover(e);
@@ -219,9 +231,8 @@ public class Tree extends JTree implements MouseMotionListener,
             final TreePath selectedPath = getPathForLocation(e.getX(),
                     e.getY());
             if (selectedPath != null) {
-                controller.requestWindowFocus(controller.getWindowFactory()
-                        .getSwingWindow(((TreeViewNode) selectedPath
-                                .getLastPathComponent()).getWindow()));
+                controller.requestWindowFocus(windowFactory.getSwingWindow(
+                        ((TreeViewNode) selectedPath.getLastPathComponent()).getWindow()));
             }
         }
         processMouseEvents(e);
@@ -266,7 +277,7 @@ public class Tree extends JTree implements MouseMotionListener,
     public void processMouseEvents(final MouseEvent e) {
         final TreePath localPath = getPathForLocation(e.getX(), e.getY());
         if (localPath != null && e.isPopupTrigger()) {
-            final TextFrame frame = controller.getWindowFactory().getSwingWindow(
+            final TextFrame frame = windowFactory.getSwingWindow(
                     ((TreeViewNode) localPath.getLastPathComponent()).getWindow());
 
             if (frame == null) {
@@ -333,10 +344,10 @@ public class Tree extends JTree implements MouseMotionListener,
                 }
                 break;
             case "popout":
-                controller.getWindowFactory().getSwingWindow(node.getWindow()).setPopout(true);
+                windowFactory.getSwingWindow(node.getWindow()).setPopout(true);
                 break;
             case "popin":
-                controller.getWindowFactory().getSwingWindow(node.getWindow()).setPopout(false);
+                windowFactory.getSwingWindow(node.getWindow()).setPopout(false);
                 break;
         }
         final TreeViewNode parentNode = (TreeViewNode) node.getParent();

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

@@ -26,6 +26,7 @@ import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.MainFrame;
 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.TreeScroller;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
@@ -36,6 +37,7 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
+import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.ui.Colour;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.messages.ColourManager;
@@ -97,6 +99,8 @@ public class TreeFrameManager implements FrameManager,
      * @param globalConfig      The provider to read config settings from.
      * @param colourManager     The colour manager to use to retrieve colours.
      * @param mainFrameProvider The provider to use to retrieve the current main frame.
+     * @param windowFactory     The factory to use to retrieve swing windows.
+     * @param domain            The domain to read settings from.
      */
     @Inject
     public TreeFrameManager(
@@ -104,7 +108,9 @@ public class TreeFrameManager implements FrameManager,
             final WindowManager windowManager,
             @GlobalConfig final AggregateConfigProvider globalConfig,
             final ColourManager colourManager,
-            final Provider<MainFrame> mainFrameProvider) {
+            final Provider<MainFrame> mainFrameProvider,
+            final SwingWindowFactory windowFactory,
+            @PluginDomain(SwingController.class) final String domain) {
         this.windowManager = windowManager;
         nodes = new HashMap<>();
 
@@ -116,8 +122,8 @@ public class TreeFrameManager implements FrameManager,
             @Override
             public void run() {
                 model = new TreeViewModel(config, new TreeViewNode(null, null));
-                tree = new Tree(TreeFrameManager.this, model,
-                        TreeFrameManager.this.controller);
+                tree = new Tree(TreeFrameManager.this, model, controller, globalConfig,
+                        windowFactory, domain);
                 tree.setCellRenderer(new TreeViewTreeCellRenderer(config, colourManager,
                         TreeFrameManager.this));
                 tree.setVisible(true);