Use services for frame managers.

To add a frame manager, a plugin must export a FrameManagerProvider instance.
This will drop users back to using a treeview as their previous config setting
will be wrong (it needs to point to the Provider class now), and I don't think
it's worth adding migration code given we know of 0 users of the buttonbar.

This also enables us to dependency inject the frame managers.

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

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

@@ -32,7 +32,6 @@ import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
 import com.dmdirc.addons.ui_swing.framemanager.FramemanagerPosition;
 import com.dmdirc.addons.ui_swing.framemanager.ctrltab.CtrlTabWindowManager;
-import com.dmdirc.addons.ui_swing.framemanager.tree.TreeFrameManager;
 import com.dmdirc.events.ClientFocusGainedEvent;
 import com.dmdirc.events.ClientFocusLostEvent;
 import com.dmdirc.events.ClientMinimisedEvent;
@@ -42,8 +41,6 @@ import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.NotificationListener;
 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.ui.Colour;
 import com.dmdirc.ui.CoreUIUtils;
 import com.dmdirc.ui.IconManager;
@@ -111,6 +108,8 @@ public class MainFrame extends JFrame implements WindowListener,
     private final ListenerList listeners = new ListenerList();
     /** Window management. */
     private final WindowManager windowManager;
+    /** Provider of frame managers. */
+    private final Provider<FrameManager> frameManagerProvider;
     /** The bus to despatch events on. */
     private final EventBus eventBus;
     /** The main application icon. */
@@ -139,15 +138,16 @@ public class MainFrame extends JFrame implements WindowListener,
     /**
      * Creates new form MainFrame.
      *
-     * @param controller          Swing controller
-     * @param apple               Apple instance
-     * @param windowFactory       The window factory to use to create and listen for windows.
-     * @param lifecycleController Controller to use to end the application.
-     * @param globalConfig        The config to read settings from.
-     * @param quitWorker          The quit worker to use when quitting the app.
-     * @param iconManager         The icon manager to use to get icons.
-     * @param windowManager       Window management
-     * @param eventBus            The event bus to post events to.
+     * @param controller           Swing controller
+     * @param apple                Apple instance
+     * @param windowFactory        The window factory to use to create and listen for windows.
+     * @param lifecycleController  Controller to use to end the application.
+     * @param globalConfig         The config to read settings from.
+     * @param quitWorker           The quit worker to use when quitting the app.
+     * @param iconManager          The icon manager to use to get icons.
+     * @param windowManager        Window management
+     * @param frameManagerProvider Provider to use to retrieve frame managers.
+     * @param eventBus             The event bus to post events to.
      */
     public MainFrame(
             final Apple apple,
@@ -158,6 +158,7 @@ public class MainFrame extends JFrame implements WindowListener,
             final Provider<QuitWorker> quitWorker,
             final IconManager iconManager,
             final WindowManager windowManager,
+            final Provider<FrameManager> frameManagerProvider,
             final EventBus eventBus) {
         checkOnEDT();
         this.apple = apple;
@@ -168,6 +169,7 @@ public class MainFrame extends JFrame implements WindowListener,
         this.quitWorker = quitWorker;
         this.iconManager = iconManager;
         this.windowManager = windowManager;
+        this.frameManagerProvider = frameManagerProvider;
         this.eventBus = eventBus;
 
         focusOrder = new QueuedLinkedHashSet<>();
@@ -215,8 +217,7 @@ public class MainFrame extends JFrame implements WindowListener,
      * @return Frame manager size.
      */
     public int getFrameManagerSize() {
-        if (position == FramemanagerPosition.LEFT
-                || position == FramemanagerPosition.RIGHT) {
+        if (position == FramemanagerPosition.LEFT || position == FramemanagerPosition.RIGHT) {
             return frameManagerPanel.getWidth();
         } else {
             return frameManagerPanel.getHeight();
@@ -346,20 +347,9 @@ public class MainFrame extends JFrame implements WindowListener,
                 frameManagerPanel.removeAll();
                 if (mainFrameManager != null) {
                     windowFactory.removeWindowListener(mainFrameManager);
+                    removeSelectionListener(mainFrameManager);
                 }
-                final String manager = globalConfig.getOption("ui", "framemanager");
-                try {
-                    mainFrameManager = (FrameManager) Class.forName(manager)
-                            .getConstructor(WindowManager.class).newInstance(windowManager);
-                } catch (final ReflectiveOperationException | SecurityException | LinkageError ex) {
-                    Logger.appError(ErrorLevel.MEDIUM, "Unable to load frame "
-                            + "manager, falling back to default.", ex);
-                } finally {
-                    if (mainFrameManager == null) {
-                        mainFrameManager = new TreeFrameManager(windowManager);
-                    }
-                }
-                mainFrameManager.setController(controller);
+                mainFrameManager = frameManagerProvider.get();
                 mainFrameManager.setParent(frameManagerPanel);
                 addSelectionListener(mainFrameManager);
                 windowFactory.addWindowListener(mainFrameManager);

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

@@ -32,6 +32,7 @@ import com.dmdirc.addons.ui_swing.commands.PopOutCommand;
 import com.dmdirc.addons.ui_swing.commands.ServerSettings;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.dialogs.error.ErrorListDialog;
+import com.dmdirc.addons.ui_swing.framemanager.FrameManagerProvider;
 import com.dmdirc.addons.ui_swing.injection.SwingModule;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
@@ -423,11 +424,12 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         final Map<String, String> framemanagers = new HashMap<>();
         final Map<String, String> fmpositions = new HashMap<>();
 
+        // TODO: When we can inject nicely, use a service locator to find all implementations.
         framemanagers.put(
-                "com.dmdirc.addons.ui_swing.framemanager.tree.TreeFrameManager",
+                "com.dmdirc.addons.ui_swing.framemanager.tree.TreeFrameManagerProvider",
                 "Treeview");
         framemanagers.put(
-                "com.dmdirc.addons.ui_swing.framemanager.buttonbar.ButtonBar",
+                "com.dmdirc.addons.ui_swing.framemanager.buttonbar.ButtonBarProvider",
                 "Button bar");
 
         fmpositions.put("top", "Top");
@@ -717,4 +719,14 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         return swingManager.getMainFrame();
     }
 
+    @Exported
+    public FrameManagerProvider getTreeManager() {
+        return swingManager.getTreeProvider();
+    }
+
+    @Exported
+    public FrameManagerProvider getButtonManager() {
+        return swingManager.getButtonProvider();
+    }
+
 }

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

@@ -31,7 +31,9 @@ import com.dmdirc.addons.ui_swing.dialogs.DialogKeyListener;
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.url.URLDialogFactory;
+import com.dmdirc.addons.ui_swing.framemanager.buttonbar.ButtonBarProvider;
 import com.dmdirc.addons.ui_swing.framemanager.ctrltab.CtrlTabWindowManager;
+import com.dmdirc.addons.ui_swing.framemanager.tree.TreeFrameManagerProvider;
 import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
 import com.dmdirc.addons.ui_swing.wizard.firstrun.FirstRunWizardExecutor;
 import com.dmdirc.ui.WindowManager;
@@ -58,12 +60,12 @@ public class SwingManager {
     private final SwingWindowFactory windowFactory;
     /** The status bar manager to register our status bar with. */
     private final StatusBarManager statusBarManager;
+    private final MenuBar menuBar;
     /** The status bar in use. */
     private final SwingStatusBar statusBar;
     /** The window manager to listen on for events. */
     private final WindowManager windowManager;
-    /** The main frame of the Swing UI. */
-    private final MainFrame mainFrame;
+    private final CtrlTabWindowManager ctrlTabManager;
     /** The key listener that supports dialogs. */
     private final DialogKeyListener dialogKeyListener;
     /** Provider of first run executors. */
@@ -80,6 +82,14 @@ public class SwingManager {
     private final SwingLinkHandler linkHandler;
     /** Bus to listen on for events. */
     private final EventBus eventBus;
+    /** The provider to use to create tree-based frame managers. */
+    private final TreeFrameManagerProvider treeProvider;
+    /** The provider to use to create button-based frame managers. */
+    private final ButtonBarProvider buttonProvider;
+    /** The provider to use to create new main frames. */
+    private final Provider<MainFrame> mainFrameProvider;
+    /** The main frame of the Swing UI. */
+    private MainFrame mainFrame;
 
     /**
      * Creates a new instance of {@link SwingManager}.
@@ -88,7 +98,7 @@ public class SwingManager {
      * @param windowFactory                 The window factory in use.
      * @param windowManager                 The window manager to listen on for events.
      * @param statusBarManager              The status bar manager to register our status bar with.
-     * @param mainFrame                     The main frame of the Swing UI.
+     * @param mainFrameProvider             The provider to use for the main frame.
      * @param menuBar                       The menu bar to use for the main frame.
      * @param statusBar                     The status bar to use in the main frame.
      * @param ctrlTabManager                The window manager that handles ctrl+tab behaviour.
@@ -100,6 +110,8 @@ public class SwingManager {
      * @param urlDialogFactory              Factory to use to create URL dialogs.
      * @param linkHandler                   The handler to use when users click links.
      * @param eventBus                      The bus to listen on for events.
+     * @param treeProvider                  Provider to use for tree-based frame managers.
+     * @param buttonProvider                Provider to use for button-based frame managers.
      */
     @Inject
     public SwingManager(
@@ -107,7 +119,7 @@ public class SwingManager {
             final SwingWindowFactory windowFactory,
             final WindowManager windowManager,
             final StatusBarManager statusBarManager,
-            final MainFrame mainFrame,
+            final Provider<MainFrame> mainFrameProvider,
             final MenuBar menuBar,
             final SwingStatusBar statusBar,
             final CtrlTabWindowManager ctrlTabManager,
@@ -118,12 +130,17 @@ public class SwingManager {
             final Provider<FeedbackNag> feedbackNagProvider,
             final URLDialogFactory urlDialogFactory,
             final SwingLinkHandler linkHandler,
-            final EventBus eventBus) {
+            final EventBus eventBus,
+            final TreeFrameManagerProvider treeProvider,
+            final ButtonBarProvider buttonProvider) {
         this.eventQueue = eventQueue;
         this.windowFactory = windowFactory;
         this.windowManager = windowManager;
+        this.menuBar = menuBar;
         this.statusBar = statusBar;
         this.statusBarManager = statusBarManager;
+        this.mainFrameProvider = mainFrameProvider;
+        this.ctrlTabManager = ctrlTabManager;
         this.dialogKeyListener = dialogKeyListener;
         this.firstRunExecutor = firstRunExecutor;
         this.serverSettingsDialogProvider = serverSettingsDialogProvider;
@@ -132,18 +149,20 @@ public class SwingManager {
         this.urlDialogFactory = urlDialogFactory;
         this.linkHandler = linkHandler;
         this.eventBus = eventBus;
-
-        this.mainFrame = mainFrame;
-        this.mainFrame.setMenuBar(menuBar);
-        this.mainFrame.setWindowManager(ctrlTabManager);
-        this.mainFrame.setStatusBar(statusBar);
-        this.mainFrame.initComponents();
+        this.treeProvider = treeProvider;
+        this.buttonProvider = buttonProvider;
     }
 
     /**
      * Handles loading of the UI.
      */
     public void load() {
+        this.mainFrame = mainFrameProvider.get();
+        this.mainFrame.setMenuBar(menuBar);
+        this.mainFrame.setWindowManager(ctrlTabManager);
+        this.mainFrame.setStatusBar(statusBar);
+        this.mainFrame.initComponents();
+
         installEventQueue();
         installKeyListener();
 
@@ -219,6 +238,14 @@ public class SwingManager {
         return mainFrame;
     }
 
+    public TreeFrameManagerProvider getTreeProvider() {
+        return treeProvider;
+    }
+
+    public ButtonBarProvider getButtonProvider() {
+        return buttonProvider;
+    }
+
     /**
      * Installs the DMDirc event queue.
      */

src/com/dmdirc/addons/ui_swing/framemanager/FrameManager.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.framemanager;
 
 import com.dmdirc.addons.ui_swing.SelectionListener;
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.SwingWindowListener;
 
 import javax.swing.JComponent;
@@ -42,14 +41,6 @@ public interface FrameManager extends SwingWindowListener, SelectionListener {
      */
     void setParent(JComponent parent);
 
-    /**
-     * Sets the UIController for the frame manager. This method will be called immediately after
-     * construction of the frame manager.
-     *
-     * @param controller UIController
-     */
-    void setController(SwingController controller);
-
     /**
      * Indicates whether this frame manager can be positioned vertically (i.e., at the side of the
      * screen).

src/com/dmdirc/addons/ui_swing/framemanager/FrameManagerProvider.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing.framemanager;
+
+/**
+ * Service interface for plugins that provide frame managers.
+ */
+public interface FrameManagerProvider {
+
+    FrameManager getFrameManager();
+
+}

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

@@ -22,8 +22,10 @@
 
 package com.dmdirc.addons.ui_swing.framemanager.buttonbar;
 
+import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.FrameContainerComparator;
+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;
@@ -33,6 +35,7 @@ import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
 import com.dmdirc.addons.ui_swing.framemanager.FramemanagerPosition;
 import com.dmdirc.interfaces.FrameInfoListener;
 import com.dmdirc.interfaces.NotificationListener;
+import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigChangeListener;
 import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.ui.Colour;
@@ -53,6 +56,8 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.inject.Inject;
+import javax.inject.Provider;
 import javax.swing.JComponent;
 import javax.swing.JMenuItem;
 import javax.swing.JPopupMenu;
@@ -78,13 +83,13 @@ public final class ButtonBar implements FrameManager, ActionListener,
     /** The default height of buttons. */
     private static final int BUTTON_HEIGHT = 25;
     /** A map of windows to the buttons we're using for them. */
-    private Map<Window, FrameToggleButton> buttons;
+    private final Map<Window, FrameToggleButton> buttons;
     /** The scrolling panel for our ButtonBar. */
     private final JScrollPane scrollPane;
     /** The panel used for our buttons. */
-    private ButtonPanel buttonPanel;
+    private final ButtonPanel buttonPanel;
     /** The position of this frame manager. */
-    private FramemanagerPosition position;
+    private final FramemanagerPosition position;
     /** The default width of buttons. */
     private int buttonWidth = 0;
     /** The parent for the manager. */
@@ -98,19 +103,35 @@ public final class ButtonBar implements FrameManager, ActionListener,
     /** Sort child windows prefs setting. */
     private boolean sortChildWindows;
     /** UI Window Factory. */
-    private SwingWindowFactory windowFactory;
-    /** UI Controller. */
-    private SwingController controller;
+    private final SwingWindowFactory windowFactory;
     /** Window management. */
     private final WindowManager windowManager;
+    /** Global configuration to read settings from. */
+    private final AggregateConfigProvider globalConfig;
+    /** Provider to use to retrieve the current main frame. */
+    private final Provider<MainFrame> mainFrameProvider;
 
     /**
      * Creates a new instance of ButtonBar.
      *
-     * @param windowManager Window management
+     * @param controller        The controller to use to change window focus.
+     * @param windowFactory     The factory to use to retrieve window information.
+     * @param windowManager     The window manager to use to read window state.
+     * @param globalConfig      Global configuration to read settings from.
+     * @param mainFrameProvider The provider to use to retrieve the current main frame.
      */
-    public ButtonBar(final WindowManager windowManager) {
+    @Inject
+    public ButtonBar(
+            final SwingController controller,
+            final SwingWindowFactory windowFactory,
+            @GlobalConfig final AggregateConfigProvider globalConfig,
+            final WindowManager windowManager,
+            final Provider<MainFrame> mainFrameProvider) {
+        this.windowFactory = windowFactory;
+        this.globalConfig = globalConfig;
         this.windowManager = windowManager;
+        this.mainFrameProvider = mainFrameProvider;
+
         scrollPane = new JScrollPane();
         scrollPane.setBorder(null);
         scrollPane.setHorizontalScrollBarPolicy(ScrollPaneConstants.HORIZONTAL_SCROLLBAR_NEVER);
@@ -118,6 +139,26 @@ public final class ButtonBar implements FrameManager, ActionListener,
         scrollPane.setMinimumSize(new Dimension(0, BUTTON_HEIGHT
                 + ((int) PlatformDefaults.getUnitValueX("related")
                 .getValue()) * 2));
+
+        position = FramemanagerPosition.getPosition(
+                globalConfig.getOption("ui", "framemanagerPosition"));
+
+        if (position.isHorizontal()) {
+            buttonPanel = new ButtonPanel(controller,
+                    new MigLayout("ins rel, fill, flowx"), this);
+        } else {
+            buttonPanel = new ButtonPanel(controller,
+                    new MigLayout("ins rel, fill, flowy"), this);
+        }
+        scrollPane.getViewport().addMouseWheelListener(buttonPanel);
+        scrollPane.getViewport().add(buttonPanel);
+
+        buttons = Collections.synchronizedMap(new HashMap<Window, FrameToggleButton>());
+        sortChildWindows = globalConfig.getOptionBool("ui", "sortchildwindows");
+        sortRootWindows = globalConfig.getOptionBool("ui", "sortrootwindows");
+
+        globalConfig.addChangeListener("ui", "sortrootwindows", this);
+        globalConfig.addChangeListener("ui", "sortchildwindows", this);
     }
 
     /**
@@ -156,9 +197,10 @@ public final class ButtonBar implements FrameManager, ActionListener,
                 ButtonBar.this.buttonWidth = position.isHorizontal()
                         ? 150 : (parent.getWidth() / NUM_CELLS);
                 initButtons(windowManager.getRootWindows());
-                if (controller.getMainFrame().getActiveFrame() != null) {
-                    selectionChanged(controller.getMainFrame()
-                            .getActiveFrame());
+
+                final TextFrame activeFrame = mainFrameProvider.get().getActiveFrame();
+                if (activeFrame != null) {
+                    selectionChanged(activeFrame);
                 }
                 parent.setVisible(true);
             }
@@ -209,38 +251,6 @@ public final class ButtonBar implements FrameManager, ActionListener,
         return null;
     }
 
-    @Override
-    public void setController(final SwingController controller) {
-        this.windowFactory = controller.getWindowFactory();
-        this.controller = controller;
-
-        position = FramemanagerPosition.getPosition(
-                controller.getGlobalConfig().getOption("ui",
-                        "framemanagerPosition"));
-
-        if (position.isHorizontal()) {
-            buttonPanel = new ButtonPanel(controller,
-                    new MigLayout("ins rel, fill, flowx"), this);
-        } else {
-            buttonPanel = new ButtonPanel(controller,
-                    new MigLayout("ins rel, fill, flowy"), this);
-        }
-        scrollPane.getViewport().addMouseWheelListener(buttonPanel);
-        scrollPane.getViewport().add(buttonPanel);
-
-        buttons = Collections.synchronizedMap(
-                new HashMap<Window, FrameToggleButton>());
-        sortChildWindows = controller.getGlobalConfig()
-                .getOptionBool("ui", "sortchildwindows");
-        sortRootWindows = controller.getGlobalConfig()
-                .getOptionBool("ui", "sortrootwindows");
-
-        controller.getGlobalConfig().addChangeListener("ui",
-                "sortrootwindows", this);
-        controller.getGlobalConfig().addChangeListener("ui",
-                "sortchildwindows", this);
-    }
-
     /**
      * Adds buttons for the collection of windows that is passed to it. This method also iterates
      * through any children for each item in the collection.
@@ -363,7 +373,8 @@ public final class ButtonBar implements FrameManager, ActionListener,
         if (frame != null && frame.equals(activeWindow)) {
             button.setSelected(true);
         }
-        controller.getMainFrame().setActiveFrame(frame);
+
+        mainFrameProvider.get().setActiveFrame(frame);
     }
 
     /**
@@ -568,12 +579,10 @@ public final class ButtonBar implements FrameManager, ActionListener,
     public void configChanged(final String domain, final String key) {
         switch (key) {
             case "sortrootwindows":
-                sortRootWindows = controller.getGlobalConfig()
-                        .getOptionBool("ui", "sortrootwindows");
+                sortRootWindows = globalConfig.getOptionBool("ui", "sortrootwindows");
                 break;
             case "sortchildwindows":
-                sortChildWindows = controller.getGlobalConfig()
-                        .getOptionBool("ui", "sortrootwindows");
+                sortChildWindows = globalConfig.getOptionBool("ui", "sortrootwindows");
                 break;
         }
         relayout();

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

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing.framemanager.buttonbar;
+
+import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
+import com.dmdirc.addons.ui_swing.framemanager.FrameManagerProvider;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
+
+/**
+ * Provider for button bar frame managers.
+ */
+public class ButtonBarProvider implements FrameManagerProvider {
+
+    private final Provider<ButtonBar> provider;
+
+    @Inject
+    public ButtonBarProvider(final Provider<ButtonBar> provider) {
+        this.provider = provider;
+    }
+
+    @Override
+    public FrameManager getFrameManager() {
+        return provider.get();
+    }
+
+}

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

@@ -22,7 +22,9 @@
 
 package com.dmdirc.addons.ui_swing.framemanager.tree;
 
+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.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.TreeScroller;
@@ -46,6 +48,8 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.inject.Inject;
+import javax.inject.Provider;
 import javax.swing.JComponent;
 import javax.swing.JScrollPane;
 import javax.swing.JTree;
@@ -73,24 +77,59 @@ public class TreeFrameManager implements FrameManager,
     /** node storage, used for adding and deleting nodes correctly. */
     private final Map<FrameContainer, TreeViewNode> nodes;
     /** UI Controller. */
-    private SwingController controller;
+    private final SwingController controller;
     /** Tree scroller. */
     private TreeScroller scroller;
     /** Configuration manager. */
-    private AggregateConfigProvider config;
+    private final AggregateConfigProvider config;
     /** Colour manager. */
-    private ColourManager colourManager;
+    private final ColourManager colourManager;
     /** Window manage. */
     private final WindowManager windowManager;
+    /** Provider to use to retrieve the current main frame. */
+    private final Provider<MainFrame> mainFrameProvider;
 
     /**
      * Creates a new instance of the TreeFrameManager.
      *
-     * @param windowManager Window Management
+     * @param controller        The controller to use to switch windows.
+     * @param windowManager     The window manager to use to read window state.
+     * @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.
      */
-    public TreeFrameManager(final WindowManager windowManager) {
+    @Inject
+    public TreeFrameManager(
+            final SwingController controller,
+            final WindowManager windowManager,
+            @GlobalConfig final AggregateConfigProvider globalConfig,
+            final ColourManager colourManager,
+            final Provider<MainFrame> mainFrameProvider) {
         this.windowManager = windowManager;
         nodes = new HashMap<>();
+
+        this.controller = controller;
+        this.config = globalConfig;
+        this.colourManager = colourManager;
+
+        UIUtilities.invokeLater(new Runnable() {
+            @Override
+            public void run() {
+                model = new TreeViewModel(config, new TreeViewNode(null, null));
+                tree = new Tree(TreeFrameManager.this, model,
+                        TreeFrameManager.this.controller);
+                tree.setCellRenderer(new TreeViewTreeCellRenderer(config, colourManager,
+                        TreeFrameManager.this));
+                tree.setVisible(true);
+
+                config.addChangeListener("treeview", TreeFrameManager.this);
+                config.addChangeListener("ui", "sortrootwindows", TreeFrameManager.this);
+                config.addChangeListener("ui", "sortchildwindows", TreeFrameManager.this);
+                config.addChangeListener("ui", "backgroundcolour", TreeFrameManager.this);
+                config.addChangeListener("ui", "foregroundcolour", TreeFrameManager.this);
+            }
+        });
+        this.mainFrameProvider = mainFrameProvider;
     }
 
     @Override
@@ -127,31 +166,6 @@ public class TreeFrameManager implements FrameManager,
         });
     }
 
-    @Override
-    public void setController(final SwingController controller) {
-        this.controller = controller;
-        this.config = controller.getGlobalConfig();
-        this.colourManager = controller.getColourManager();
-
-        UIUtilities.invokeLater(new Runnable() {
-            @Override
-            public void run() {
-                model = new TreeViewModel(config, new TreeViewNode(null, null));
-                tree = new Tree(TreeFrameManager.this, model,
-                        TreeFrameManager.this.controller);
-                tree.setCellRenderer(new TreeViewTreeCellRenderer(config, colourManager,
-                        TreeFrameManager.this));
-                tree.setVisible(true);
-
-                config.addChangeListener("treeview", TreeFrameManager.this);
-                config.addChangeListener("ui", "sortrootwindows", TreeFrameManager.this);
-                config.addChangeListener("ui", "sortchildwindows", TreeFrameManager.this);
-                config.addChangeListener("ui", "backgroundcolour", TreeFrameManager.this);
-                config.addChangeListener("ui", "foregroundcolour", TreeFrameManager.this);
-            }
-        });
-    }
-
     @Override
     public void windowAdded(final TextFrame parent, final TextFrame window) {
         if (nodes.containsKey(window.getContainer())) {
@@ -310,9 +324,10 @@ public class TreeFrameManager implements FrameManager,
                         addWindow(nodes.get(window), childWindow);
                     }
                 }
-                if (controller.getMainFrame() != null
-                        && controller.getMainFrame().getActiveFrame() != null) {
-                    selectionChanged(controller.getMainFrame().getActiveFrame());
+
+                final MainFrame mainFrame = mainFrameProvider.get();
+                if (mainFrame != null && mainFrame.getActiveFrame() != null) {
+                    selectionChanged(mainFrame.getActiveFrame());
                 }
             }
         });

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

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2006-2014 DMDirc Developers
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing.framemanager.tree;
+
+import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
+import com.dmdirc.addons.ui_swing.framemanager.FrameManagerProvider;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
+
+/**
+ * Provider for tree frame managers.
+ */
+public class TreeFrameManagerProvider implements FrameManagerProvider {
+
+    private final Provider<TreeFrameManager> provider;
+
+    @Inject
+    public TreeFrameManagerProvider(final Provider<TreeFrameManager> provider) {
+        this.provider = provider;
+    }
+
+    @Override
+    public FrameManager getFrameManager() {
+        return provider.get();
+    }
+
+}

src/com/dmdirc/addons/ui_swing/injection/SwingModule.java

@@ -48,12 +48,16 @@ import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
 import com.dmdirc.addons.ui_swing.components.statusbar.UpdaterLabel;
 import com.dmdirc.addons.ui_swing.dialogs.prefs.URLConfigPanel;
 import com.dmdirc.addons.ui_swing.dialogs.prefs.UpdateConfigPanel;
+import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
+import com.dmdirc.addons.ui_swing.framemanager.FrameManagerProvider;
+import com.dmdirc.addons.ui_swing.framemanager.tree.TreeFrameManagerProvider;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.plugins.PluginDomain;
 import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.plugins.ServiceLocator;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
@@ -118,6 +122,7 @@ public class SwingModule {
             final Provider<QuitWorker> quitWorker,
             final URLBuilder urlBuilder,
             final WindowManager windowManager,
+            final Provider<FrameManager> frameManagerProvider,
             final EventBus eventBus) {
         return UIUtilities.invokeAndWait(new Callable<MainFrame>() {
 
@@ -132,6 +137,7 @@ public class SwingModule {
                         quitWorker,
                         new IconManager(globalConfig, urlBuilder),
                         windowManager,
+                        frameManagerProvider,
                         eventBus);
             }
         });
@@ -176,4 +182,20 @@ public class SwingModule {
                 configManager, identity, actionManager, pluginManager);
     }
 
+    @Provides
+    public FrameManager getFrameManager(
+            @GlobalConfig final AggregateConfigProvider globalConfig,
+            final TreeFrameManagerProvider fallbackProvider,
+            final ServiceLocator locator) {
+        final String manager = globalConfig.getOption("ui", "framemanager");
+
+        FrameManagerProvider provider = locator.getService(FrameManagerProvider.class, manager);
+        if (provider == null) {
+            // Couldn't find the user's selected provider - let's just use the fallback.
+            provider = fallbackProvider;
+        }
+
+        return provider.getFrameManager();
+    }
+
 }