DI more things.

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

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

@@ -99,7 +99,7 @@ public class MainFrame extends JFrame implements WindowListener,
     /** Client Version. */
     private final String version;
     /** Frame manager used for ctrl tab frame switching. */
-    private final CtrlTabWindowManager frameManager;
+    private CtrlTabWindowManager frameManager;
     /** The listeners registered with this class. */
     private final ListenerList listeners = new ListenerList();
     /** Window management. */
@@ -158,8 +158,6 @@ public class MainFrame extends JFrame implements WindowListener,
         this.windowManager = windowManager;
 
         focusOrder = new QueuedLinkedHashSet<>();
-        initComponents();
-
         imageIcon = new ImageIcon(iconManager.getImage("icon"));
         setIconImage(imageIcon.getImage());
 
@@ -196,7 +194,6 @@ public class MainFrame extends JFrame implements WindowListener,
         windowFactory.addWindowListener(this);
 
         setTitle(getTitlePrefix());
-        frameManager = new CtrlTabWindowManager(controller, windowFactory, this, rootPane);
     }
 
     /**
@@ -367,28 +364,36 @@ public class MainFrame extends JFrame implements WindowListener,
     /**
      * Initialises the components for this frame.
      */
-    private void initComponents() {
-        statusBar = new SwingStatusBar(controller, this);
-        frameManagerPanel = new JPanel();
-        activeFrame = null;
-        framePanel = new JPanel(new MigLayout("fill, ins 0"));
-        initFrameManagers();
-        mainSplitPane = initSplitPane();
+    public void initComponents() {
+        UIUtilities.invokeAndWait(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                frameManagerPanel = new JPanel();
+                activeFrame = null;
+                framePanel = new JPanel(new MigLayout("fill, ins 0"));
+                initFrameManagers();
+                mainSplitPane = initSplitPane();
 
-        setPreferredSize(new Dimension(800, 600));
+                setPreferredSize(new Dimension(800, 600));
 
-        getContentPane().setLayout(new MigLayout(
-                "fill, ins rel, wrap 1, hidemode 2"));
-        layoutComponents();
+                getContentPane().setLayout(new MigLayout(
+                        "fill, ins rel, wrap 1, hidemode 2"));
+                layoutComponents();
 
-        setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+                setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
 
-        pack();
+                pack();
+            }
+        });
     }
 
     /**
      * Sets the menu bar that this frame will use.
      *
+     * <p>Must be called prior to {@link #initComponents()}.
+     *
      * @param menuBar The menu bar to use.
      */
     public void setMenuBar(final MenuBar menuBar) {
@@ -402,6 +407,28 @@ public class MainFrame extends JFrame implements WindowListener,
         });
     }
 
+    /**
+     * Sets the window manager that this frame will use.
+     *
+     * <p>Must be called prior to {@link #initComponents()}.
+     *
+     * @param windowManager The window manager to use.
+     */
+    public void setWindowManager(final CtrlTabWindowManager windowManager) {
+        this.frameManager = windowManager;
+    }
+
+    /**
+     * Sets the status bar that will be used.
+     *
+     * <p>Must be called prior to {@link #initComponents()}.
+     *
+     * @param statusBar The status bar to be used.
+     */
+    public void setStatusBar(final SwingStatusBar statusBar) {
+        this.statusBar = statusBar;
+    }
+
     /**
      * Lays out the this component.
      */

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.Channel;
-import com.dmdirc.CorePluginExtractor;
 import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
 import com.dmdirc.actions.ActionFactory;
@@ -39,7 +38,6 @@ import com.dmdirc.addons.ui_swing.commands.ServerSettings;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.components.statusbar.FeedbackNag;
 import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
-import com.dmdirc.addons.ui_swing.dialogs.DialogKeyListener;
 import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
@@ -47,15 +45,12 @@ import com.dmdirc.addons.ui_swing.dialogs.error.ErrorListDialog;
 import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
 import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.url.URLDialog;
-import com.dmdirc.addons.ui_swing.wizard.WizardListener;
-import com.dmdirc.addons.ui_swing.wizard.firstrun.SwingFirstRunWizard;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.config.prefs.PreferencesSetting;
 import com.dmdirc.config.prefs.PreferencesType;
 import com.dmdirc.interfaces.CommandController;
-import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.interfaces.config.IdentityController;
@@ -69,8 +64,6 @@ import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.plugins.implementations.BaseCommandPlugin;
 import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.core.util.URLHandler;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.themes.ThemeManager;
@@ -81,15 +74,12 @@ import com.dmdirc.util.validators.OptionalValidator;
 
 import java.awt.Font;
 import java.awt.GraphicsEnvironment;
-import java.awt.KeyboardFocusManager;
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Callable;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.swing.JMenuItem;
 import javax.swing.SwingUtilities;
@@ -109,18 +99,10 @@ import dagger.ObjectGraph;
 @SuppressWarnings("PMD.UnusedPrivateField")
 public class SwingController extends BaseCommandPlugin implements UIController {
 
-    /** URL Handler to use. */
-    @Getter
-    private final URLHandler urlHandler;
-    /** Status bar. */
-    @Getter
-    private SwingStatusBar swingStatusBar;
     /** Top level window list. */
     private final List<java.awt.Window> windows;
     /** Error dialog. */
     private ErrorListDialog errorDialog;
-    /** Key listener to handle dialog key events. */
-    private DialogKeyListener keyListener;
     /** This plugin's plugin info object. */
     private final PluginInfo pluginInfo;
     /** Global config manager. */
@@ -165,18 +147,12 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     /** Alias wrapper. */
     @Getter
     private final AliasWrapper aliasWrapper;
-    /** Controller to use to close the application. */
-    private final LifecycleController lifecycleController;
-    /** Extractor to use for core plugins. */
-    private final CorePluginExtractor corePluginExtractor;
     /** Theme manager to use. */
     @Getter
     private final ThemeManager themeManager;
     /** Apple handler, deals with Mac specific code. */
     @Getter
     private final Apple apple;
-    /** Window Management. */
-    private final WindowManager windowManager;
     /** The colour manager to use to parse colours. */
     @Getter
     private final ColourManager colourManager;
@@ -200,13 +176,10 @@ public class SwingController extends BaseCommandPlugin implements UIController {
      * @param actionManager Action manager
      * @param actionFactory The factory to use to create actions.
      * @param serverManager Server manager to use for server information.
-     * @param lifecycleController Controller to use to close the application.
-     * @param corePluginExtractor Extractor to use for core plugins.
      * @param performWrapper Perform wrapper to use for performs.
      * @param aliasWrapper Alias wrapper to use for aliases.
      * @param themeManager Theme manager to use.
      * @param urlBuilder URL builder to use to resolve icons etc.
-     * @param windowManager Window management
      * @param colourManager The colour manager to use to parse colours.
      * @param actionSubstitutorFactory Factory to use to create action substitutors.
      */
@@ -218,13 +191,10 @@ public class SwingController extends BaseCommandPlugin implements UIController {
             final ActionManager actionManager,
             final ActionFactory actionFactory,
             final ServerManager serverManager,
-            final LifecycleController lifecycleController,
-            final CorePluginExtractor corePluginExtractor,
             final PerformWrapper performWrapper,
             final AliasWrapper aliasWrapper,
             final ThemeManager themeManager,
             final URLBuilder urlBuilder,
-            final WindowManager windowManager,
             final ColourManager colourManager,
             final ActionSubstitutorFactory actionSubstitutorFactory) {
         this.pluginInfo = pluginInfo;
@@ -234,12 +204,9 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         this.actionFactory = actionFactory;
         this.pluginManager = pluginManager;
         this.serverManager = serverManager;
-        this.lifecycleController = lifecycleController;
-        this.corePluginExtractor = corePluginExtractor;
         this.performWrapper = performWrapper;
         this.aliasWrapper = aliasWrapper;
         this.themeManager = themeManager;
-        this.windowManager = windowManager;
         this.colourManager = colourManager;
         this.urlBuilder = urlBuilder;
         this.actionSubstitutorFactory = actionSubstitutorFactory;
@@ -251,8 +218,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         iconManager = new IconManager(globalConfig, urlBuilder);
         prefsComponentFactory = new PrefsComponentFactory(this);
         dialogManager = new DialogManager(this);
-        urlHandler = new URLHandler(this, globalConfig, serverManager,
-                StatusBarManager.getStatusBarManager());
         setAntiAlias();
         windows = new ArrayList<>();
     }
@@ -281,34 +246,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     /** {@inheritDoc} */
     @Override
     public void showFirstRunWizard() {
-        final Semaphore semaphore = new Semaphore(0);
-        UIUtilities.invokeLater(new Runnable() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                final WizardListener listener = new WizardListener() {
-
-                    /** {@inheritDoc} */
-                    @Override
-                    public void wizardFinished() {
-                        semaphore.release();
-                    }
-
-                    /** {@inheritDoc} */
-                    @Override
-                    public void wizardCancelled() {
-                        semaphore.release();
-                    }
-                };
-                final SwingFirstRunWizard wizard = new SwingFirstRunWizard(
-                        getMainFrame(), SwingController.this,
-                        corePluginExtractor, iconManager);
-                wizard.getWizardDialog().addWizardListener(listener);
-                wizard.display();
-            }
-        });
-        semaphore.acquireUninterruptibly();
+        swingManager.getFirstRunExecutor().showWizardAndWait();
     }
 
     /** {@inheritDoc} */
@@ -526,16 +464,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         }
 
         swingManager.load();
-        keyListener = new DialogKeyListener();
-        UIUtilities.invokeAndWait(new Runnable() {
-
-            /** {@inheritDoc} */
-            @Override
-            public void run() {
-                KeyboardFocusManager.getCurrentKeyboardFocusManager()
-                        .addKeyEventDispatcher(keyListener);
-            }
-        });
 
         UIUtilities.invokeAndWait(new Runnable() {
 
@@ -543,10 +471,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
             @Override
             public void run() {
                 getMainFrame().setVisible(true);
-                swingStatusBar = getMainFrame().getStatusBar();
                 errorDialog = new ErrorListDialog(SwingController.this);
-                StatusBarManager.getStatusBarManager().registerStatusBar(
-                        getSwingStatusBar());
             }
         });
 
@@ -559,10 +484,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         swingManager.unload();
 
         errorDialog.dispose();
-        StatusBarManager.getStatusBarManager()
-                .registerStatusBar(getSwingStatusBar());
-        KeyboardFocusManager.getCurrentKeyboardFocusManager().
-                removeKeyEventDispatcher(keyListener);
+
         for (final java.awt.Window window : getTopLevelWindows()) {
             window.dispose();
         }
@@ -913,4 +835,27 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     public MainFrame getMainFrame() {
         return swingManager.getMainFrame();
     }
+
+    /**
+     * Retrieves the status bar that's in use.
+     *
+     * @return The status bar that's in use.
+     * @deprecated Should be injected where needed.
+     */
+    @Deprecated
+    public SwingStatusBar getSwingStatusBar() {
+        return swingManager.getMainFrame().getStatusBar();
+    }
+
+    /**
+     * Gets the URL handler to use.
+     *
+     * @return The URL handler to use.
+     * @deprecated Should be injected.
+     */
+    @Deprecated
+    public URLHandler getUrlHandler() {
+        return swingManager.getUrlHandler();
+    }
+
 }

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

@@ -23,11 +23,19 @@
 package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
+import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
+import com.dmdirc.addons.ui_swing.dialogs.DialogKeyListener;
+import com.dmdirc.addons.ui_swing.framemanager.ctrltab.CtrlTabWindowManager;
+import com.dmdirc.addons.ui_swing.wizard.firstrun.FirstRunWizardExecutor;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.core.components.StatusBarManager;
+import com.dmdirc.ui.core.util.URLHandler;
 
+import java.awt.KeyboardFocusManager;
 import java.awt.Toolkit;
 
 import javax.inject.Inject;
+import javax.inject.Provider;
 import javax.inject.Singleton;
 
 /**
@@ -42,34 +50,69 @@ public class SwingManager {
     /** The window factory in use. */
     private final SwingWindowFactory windowFactory;
 
+    /** The status bar manager to register our status bar with. */
+    private final StatusBarManager statusBarManager;
+
+    /** 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;
 
+    /** The URL handler to use. */
+    private final URLHandler urlHandler;
+
+    /** The key listener that supports dialogs. */
+    private final DialogKeyListener dialogKeyListener;
+
+    /** Provider of first run executors. */
+    private final Provider<FirstRunWizardExecutor> firstRunExecutor;
+
     /**
      * Creates a new instance of {@link SwingManager}.
      *
      * @param eventQueue The event queue to use.
      * @param windowFactory The window factory in use.
      * @param windowManager The window manager to listen on for events.
+     * @param statusBarManager The core status bar manager to register our status bar with.
      * @param mainFrame The main frame of the Swing UI.
      * @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.
+     * @param urlHandler The URL handler to use.
+     * @param dialogKeyListener The key listener that supports dialogs.
+     * @param firstRunExecutor A provider of first run executors.
      */
     @Inject
     public SwingManager(
             final DMDircEventQueue eventQueue,
             final SwingWindowFactory windowFactory,
             final WindowManager windowManager,
+            final StatusBarManager statusBarManager,
             final MainFrame mainFrame,
-            final MenuBar menuBar) {
+            final MenuBar menuBar,
+            final SwingStatusBar statusBar,
+            final CtrlTabWindowManager ctrlTabManager,
+            final URLHandler urlHandler,
+            final DialogKeyListener dialogKeyListener,
+            final Provider<FirstRunWizardExecutor> firstRunExecutor) {
         this.eventQueue = eventQueue;
         this.windowFactory = windowFactory;
         this.windowManager = windowManager;
+        this.statusBar = statusBar;
+        this.statusBarManager = statusBarManager;
+        this.urlHandler = urlHandler;
+        this.dialogKeyListener = dialogKeyListener;
+        this.firstRunExecutor = firstRunExecutor;
 
         this.mainFrame = mainFrame;
         this.mainFrame.setMenuBar(menuBar);
+        this.mainFrame.setWindowManager(ctrlTabManager);
+        this.mainFrame.setStatusBar(statusBar);
+        this.mainFrame.initComponents();
     }
 
     /**
@@ -77,7 +120,10 @@ public class SwingManager {
      */
     public void load() {
         installEventQueue();
+        installKeyListener();
+
         windowManager.addListenerAndSync(windowFactory);
+        statusBarManager.registerStatusBar(statusBar);
     }
 
     /**
@@ -85,9 +131,21 @@ public class SwingManager {
      */
     public void unload() {
         uninstallEventQueue();
+        uninstallKeyListener();
+
         windowManager.removeListener(windowFactory);
         windowFactory.dispose();
         mainFrame.dispose();
+        statusBarManager.unregisterStatusBar(statusBar);
+    }
+
+    /**
+     * Gets a first run wizard executor to use.
+     *
+     * @return A first run wizard executor.
+     */
+    public FirstRunWizardExecutor getFirstRunExecutor() {
+        return firstRunExecutor.get();
     }
 
     /**
@@ -112,6 +170,17 @@ public class SwingManager {
         return mainFrame;
     }
 
+    /**
+     * Gets the URL handler to use.
+     *
+     * @return The URL handler to use.
+     * @deprecated Should be injected.
+     */
+    @Deprecated
+    public URLHandler getUrlHandler() {
+        return urlHandler;
+    }
+
     /**
      * Installs the DMDirc event queue.
      */
@@ -132,4 +201,26 @@ public class SwingManager {
         eventQueue.pop();
     }
 
+    /**
+     * Installs the dialog key listener.
+     */
+    private void installKeyListener() {
+        UIUtilities.invokeAndWait(new Runnable() {
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                KeyboardFocusManager.getCurrentKeyboardFocusManager()
+                        .addKeyEventDispatcher(dialogKeyListener);
+            }
+        });
+    }
+
+    /**
+     * Removes the dialog key listener.
+     */
+    private void uninstallKeyListener() {
+        KeyboardFocusManager.getCurrentKeyboardFocusManager()
+                .removeKeyEventDispatcher(dialogKeyListener);
+    }
+
 }

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

@@ -24,15 +24,20 @@ package com.dmdirc.addons.ui_swing;
 
 import com.dmdirc.ClientModule;
 import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.CorePluginExtractor;
+import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_swing.commands.ChannelSettings;
 import com.dmdirc.addons.ui_swing.commands.Input;
 import com.dmdirc.addons.ui_swing.commands.PopInCommand;
 import com.dmdirc.addons.ui_swing.commands.PopOutCommand;
 import com.dmdirc.addons.ui_swing.commands.ServerSettings;
+import com.dmdirc.addons.ui_swing.wizard.firstrun.SwingFirstRunWizard;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.WindowManager;
+import com.dmdirc.ui.core.components.StatusBarManager;
+import com.dmdirc.ui.core.util.URLHandler;
 import com.dmdirc.util.URLBuilder;
 
 import java.util.concurrent.Callable;
@@ -120,4 +125,46 @@ public class SwingModule {
         });
     }
 
+    /**
+     * Provides an URL handler for use in the swing UI.
+     *
+     * @param swingController The controller that will own the handler.
+     * @param globalConfig The global configuration to read settings from.
+     * @param serverManager The server manager to use to connect to servers.
+     * @param statusBarManager The status bar manager to add messages to.
+     * @return The URL handler to use.
+     */
+    @Provides
+    @Singleton
+    public URLHandler getURLHandler(
+            final SwingController swingController,
+            @GlobalConfig final AggregateConfigProvider globalConfig,
+            final ServerManager serverManager,
+            final StatusBarManager statusBarManager) {
+        return new URLHandler(swingController, globalConfig, serverManager, statusBarManager);
+    }
+
+    /**
+     * Gets a first run wizard to display.
+     *
+     * @param mainFrame The main frame, which will be the parent window.
+     * @param swingController The controller that owns the wizard.
+     * @param pluginExtractor The extractor to use to extract plugins.
+     * @param globalConfig The config to read settings from.
+     * @param urlBuilder The URL builder to use to build icons.
+     * @return
+     */
+    @Provides
+    public SwingFirstRunWizard getFirstRunWizard(
+            final MainFrame mainFrame,
+            final SwingController swingController,
+            final CorePluginExtractor pluginExtractor,
+            @GlobalConfig final AggregateConfigProvider globalConfig,
+            final URLBuilder urlBuilder) {
+        return new SwingFirstRunWizard(
+                mainFrame, swingController, pluginExtractor,
+                // TODO: Allow global icon manager to be injected.
+                new IconManager(globalConfig, urlBuilder));
+    }
+
 }

src/com/dmdirc/addons/ui_swing/components/statusbar/SwingStatusBar.java

@@ -33,6 +33,8 @@ import com.dmdirc.ui.StatusMessage;
 import java.awt.Component;
 import java.util.Arrays;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.JPanel;
 import javax.swing.SwingUtilities;
 import javax.swing.UIManager;
@@ -41,7 +43,8 @@ import net.miginfocom.layout.PlatformDefaults;
 import net.miginfocom.swing.MigLayout;
 
 /** Status bar, shows message and info on the GUI. */
-public final class SwingStatusBar extends JPanel implements StatusBar {
+@Singleton
+public class SwingStatusBar extends JPanel implements StatusBar {
 
     /**
      * A version number for this class. It should be changed whenever the class
@@ -68,7 +71,9 @@ public final class SwingStatusBar extends JPanel implements StatusBar {
      * @param controller Swing controller
      * @param mainFrame Main frame
      */
-    public SwingStatusBar(final SwingController controller,
+    @Inject
+    public SwingStatusBar(
+            final SwingController controller,
             final MainFrame mainFrame) {
         super();
 

src/com/dmdirc/addons/ui_swing/dialogs/DialogKeyListener.java

@@ -28,13 +28,23 @@ import java.awt.KeyEventDispatcher;
 import java.awt.KeyboardFocusManager;
 import java.awt.event.KeyEvent;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.JButton;
 
 /**
  * Dialog key listener.
  */
+@Singleton
 public class DialogKeyListener implements KeyEventDispatcher {
 
+    /**
+     * Creates a new instance of {@link DialogKeyListener}.
+     */
+    @Inject
+    public DialogKeyListener() {
+    }
+
     /** {@inheritDoc} */
     @Override
     public boolean dispatchKeyEvent(final KeyEvent e) {

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

@@ -34,14 +34,16 @@ import com.dmdirc.addons.ui_swing.components.TreeScroller;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeViewModel;
 import com.dmdirc.addons.ui_swing.framemanager.tree.TreeViewNode;
+import com.dmdirc.interfaces.ui.Window;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
-import com.dmdirc.interfaces.ui.Window;
 
 import java.awt.event.KeyEvent;
 import java.util.HashMap;
 import java.util.Map;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.JComponent;
 import javax.swing.KeyStroke;
 import javax.swing.tree.DefaultTreeSelectionModel;
@@ -52,6 +54,7 @@ import javax.swing.tree.TreeSelectionModel;
 /**
  * A Window manager to handle ctrl[+shift]+tab switching between windows.
  */
+@Singleton
 public class CtrlTabWindowManager implements SwingWindowListener,
         SelectionListener {
 
@@ -70,13 +73,12 @@ public class CtrlTabWindowManager implements SwingWindowListener,
      * @param controller Parent controller
      * @param windowFactory The window factory to use to create and listen for windows.
      * @param mainFrame The main frame that owns this window manager
-     * @param component Component to add listen to events on
      */
+    @Inject
     public CtrlTabWindowManager(
             final SwingController controller,
             final SwingWindowFactory windowFactory,
-            final MainFrame mainFrame,
-            final JComponent component) {
+            final MainFrame mainFrame) {
         nodes = new HashMap<>();
         model = new TreeViewModel(controller, new TreeViewNode(null, null));
         selectionModel = new DefaultTreeSelectionModel();
@@ -94,15 +96,15 @@ public class CtrlTabWindowManager implements SwingWindowListener,
         windowFactory.addWindowListener(this);
         mainFrame.addSelectionListener(this);
 
-        component.getActionMap().put("prevFrameAction",
+        mainFrame.getRootPane().getActionMap().put("prevFrameAction",
                 new PreviousFrameAction(treeScroller));
-        component.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+        mainFrame.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
                 .put(KeyStroke.getKeyStroke(KeyEvent.VK_TAB,
                 KeyEvent.CTRL_DOWN_MASK | KeyEvent.SHIFT_DOWN_MASK),
                 "prevFrameAction");
-        component.getActionMap().put(
+        mainFrame.getRootPane().getActionMap().put(
                 "nextFrameAction", new NextFrameAction(treeScroller));
-        component.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+        mainFrame.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
                 .put(KeyStroke.getKeyStroke(KeyEvent.VK_TAB,
                 KeyEvent.CTRL_DOWN_MASK), "nextFrameAction");
     }

src/com/dmdirc/addons/ui_swing/wizard/firstrun/FirstRunWizardExecutor.java

@@ -0,0 +1,95 @@
+/*
+ * Copyright (c) 2006-2013 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.wizard.firstrun;
+
+import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.wizard.WizardListener;
+
+import java.util.concurrent.Semaphore;
+
+import javax.inject.Inject;
+import javax.inject.Provider;
+
+/**
+ * Utility to create and run a first-run wizard.
+ */
+public class FirstRunWizardExecutor {
+
+    /** Semaphore used to signal when the dialog is complete. */
+    private final Semaphore semaphore = new Semaphore(0);
+
+    /** The provider of actual first-run wizards. */
+    private final Provider<SwingFirstRunWizard> wizardProvider;
+
+    /**
+     * Creates a new instance of {@link FirstRunWizardExecutor}.
+     *
+     * @param wizardProvider The provider of first-run wizards to use.
+     */
+    @Inject
+    public FirstRunWizardExecutor(final Provider<SwingFirstRunWizard> wizardProvider) {
+        this.wizardProvider = wizardProvider;
+    }
+
+    /**
+     * Shows the wizard and waits for it to finish.
+     */
+    public void showWizardAndWait() {
+        UIUtilities.invokeLater(new FirstRunWizardRunnable());
+        semaphore.acquireUninterruptibly();
+    }
+
+    /**
+     * Creates a new wizard, adds a listener, and displays the wizard.
+     */
+    private class FirstRunWizardRunnable implements Runnable {
+
+        /** {@inheritDoc} */
+        @Override
+        public void run() {
+            final SwingFirstRunWizard wizard = wizardProvider.get();
+            wizard.getWizardDialog().addWizardListener(new FirstRunWizardListener());
+            wizard.display();
+        }
+    }
+
+    /**
+     * Listens for wizard finished events and releases the semaphore.
+     */
+    private class FirstRunWizardListener implements WizardListener {
+
+        /** {@inheritDoc} */
+        @Override
+        public void wizardFinished() {
+            semaphore.release();
+        }
+
+        /** {@inheritDoc} */
+        @Override
+        public void wizardCancelled() {
+            semaphore.release();
+        }
+
+    }
+
+}

src/com/dmdirc/addons/ui_swing/wizard/firstrun/SwingFirstRunWizard.java

@@ -49,8 +49,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 /** First run wizard, used to initially setup the client for the user. */
-public final class SwingFirstRunWizard implements WizardListener,
-        FirstRunWizard {
+public class SwingFirstRunWizard implements WizardListener, FirstRunWizard {
 
     /** Wizard dialog. */
     private final WizardDialog wizardDialog;