Remove DialogManager.

Replace remaining legitimate usages with [Keyed]DialogProviders.

Remove the DialogManager itself, all the getters for it, all the places keeping
references around to it, all the dialogs taking it in the constructor, and all
the partridges in pear trees that had one hidden away.

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

src/com/dmdirc/addons/dcc/DCCManager.java

@@ -33,7 +33,6 @@ import com.dmdirc.addons.dcc.kde.KFileChooser;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingWindowFactory;
 import com.dmdirc.addons.ui_swing.components.frames.ComponentFrame;
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.commandline.CommandLineOptionsModule.Directory;
 import com.dmdirc.commandline.CommandLineOptionsModule.DirectoryType;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
@@ -89,8 +88,6 @@ public class DCCManager implements ActionListener {
     private final CommandController commandController;
     /** The factory to use for tab completers. */
     private final TabCompleterFactory tabCompleterFactory;
-    /** The dialog manager to register popups with. */
-    private final DialogManager dialogManager;
     /** The main frame that will own any new windows. */
     private final MainFrame mainFrame;
     /** The configuration domain to use. */
@@ -99,7 +96,6 @@ public class DCCManager implements ActionListener {
     /**
      * Creates a new instance of this plugin.
      *
-     * @param dialogManager The dialog manager to register popups with.
      * @param mainFrame The main frame that will own any new windows.
      * @param pluginInfo This plugin's plugin info
      * @param identityController The Identity controller that provides the current config
@@ -113,7 +109,6 @@ public class DCCManager implements ActionListener {
      */
     @Inject
     public DCCManager(
-            final DialogManager dialogManager,
             final MainFrame mainFrame,
             final PluginInfo pluginInfo,
             final IdentityController identityController,
@@ -124,7 +119,6 @@ public class DCCManager implements ActionListener {
             final TabCompleterFactory tabCompleterFactory,
             final SwingWindowFactory windowFactory,
             @Directory(DirectoryType.BASE) final String baseDirectory) {
-        this.dialogManager = dialogManager;
         this.mainFrame = mainFrame;
         this.messageSinkManager = messageSinkManager;
         this.windowManager = windowManager;
@@ -677,7 +671,7 @@ public class DCCManager implements ActionListener {
      * Create the container window.
      */
     protected void createContainer() {
-        container = new PlaceholderContainer(this, config, dialogManager, mainFrame);
+        container = new PlaceholderContainer(this, config, mainFrame);
         windowManager.addWindow(container);
     }
 

src/com/dmdirc/addons/dcc/PlaceholderContainer.java

@@ -24,7 +24,6 @@ package com.dmdirc.addons.dcc;
 
 import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.ui_swing.MainFrame;
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
@@ -39,8 +38,6 @@ public class PlaceholderContainer extends FrameContainer {
 
     /** The plugin which owns this placeholder. */
     private final DCCManager plugin;
-    /** Manager to register new dialogs with. */
-    private final DialogManager dialogManager;
     /** Frame that will own new dialogs. */
     private final MainFrame mainFrame;
 
@@ -49,18 +46,15 @@ public class PlaceholderContainer extends FrameContainer {
      *
      * @param plugin The plugin which owns this placeholder
      * @param config Config manager
-     * @param dialogManager Manager to register new dialogs with.
      * @param mainFrame Frame that will own new dialogs.
      */
     public PlaceholderContainer(
             final DCCManager plugin,
             final AggregateConfigProvider config,
-            final DialogManager dialogManager,
             final MainFrame mainFrame) {
         super("dcc", "DCCs", "DCCs", config, Arrays.asList(
                 "com.dmdirc.addons.dcc.ui.PlaceholderPanel"));
         this.plugin = plugin;
-        this.dialogManager = dialogManager;
         this.mainFrame = mainFrame;
     }
 
@@ -78,7 +72,7 @@ public class PlaceholderContainer extends FrameContainer {
         }
 
         if (dccs > 0) {
-            new StandardQuestionDialog(dialogManager, mainFrame, ModalityType.MODELESS,
+            new StandardQuestionDialog(mainFrame, ModalityType.MODELESS,
                     "Close confirmation",
                     "Closing this window will cause all existing DCCs "
                     + "to terminate, are you sure you want to do this?") {

src/com/dmdirc/addons/lagdisplay/ServerInfoDialog.java

@@ -28,7 +28,6 @@ import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPanel;
 import com.dmdirc.addons.ui_swing.components.statusbar.StatusbarPopupWindow;
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.util.annotations.factory.Factory;
 import com.dmdirc.util.annotations.factory.Unbound;
 
@@ -62,17 +61,15 @@ public class ServerInfoDialog extends StatusbarPopupWindow {
      *
      * @param plugin The {@link LagDisplayPlugin} we're using for info
      * @param parent The {@link JPanel} to use for positioning
-     * @param dialogManager The manager to register this dialog with.
      * @param mainFrame The frame that will own this dialog.
      * @param serverManager The manager to use to iterate servers.
      */
     public ServerInfoDialog(
             final LagDisplayPlugin plugin,
             @Unbound final StatusbarPanel parent,
-            final DialogManager dialogManager,
             final MainFrame mainFrame,
             final ServerManager serverManager) {
-        super(dialogManager, parent, mainFrame);
+        super(parent, mainFrame);
 
         this.plugin = plugin;
         this.mainFrame = mainFrame;

src/com/dmdirc/addons/nickcolours/NickColourInputDialog.java

@@ -79,7 +79,7 @@ public class NickColourInputDialog extends StandardDialog
             final NickColourPanel panel, final int row,
             final String nickname, final String network,
             final String textcolour, final String nickcolour) {
-        super(swingController.getDialogManager(), swingController.getMainFrame(), false);
+        super(swingController.getMainFrame(), false);
 
         this.panel = panel;
         this.row = row;

src/com/dmdirc/addons/serverlistdialog/AddEntryInputDialog.java

@@ -84,7 +84,7 @@ public class AddEntryInputDialog extends StandardDialog {
     public AddEntryInputDialog(final SwingController controller,
             final Window owner, final JTree items,
             final ServerListModel model) {
-        super(controller.getDialogManager(), owner, ModalityType.MODELESS);
+        super(owner, ModalityType.MODELESS);
 
         this.items = items;
         this.model = model;

src/com/dmdirc/addons/serverlistdialog/AddGroupInputDialog.java

@@ -81,7 +81,7 @@ public class AddGroupInputDialog extends StandardDialog {
     public AddGroupInputDialog(final SwingController controller,
             final Window owner, final JTree items,
             final ServerListModel model) {
-        super(controller.getDialogManager(), owner, ModalityType.MODELESS);
+        super(owner, ModalityType.MODELESS);
 
         this.tree = items;
         this.serverListModel = model;

src/com/dmdirc/addons/serverlistdialog/ServerListDialog.java

@@ -22,13 +22,11 @@
 
 package com.dmdirc.addons.serverlistdialog;
 
-import com.dmdirc.ServerManager;
 import com.dmdirc.actions.wrappers.PerformWrapper;
 import com.dmdirc.addons.serverlists.ServerGroupItem;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.LockedLayer;
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.ui.core.util.URLHandler;
 
@@ -83,7 +81,6 @@ public class ServerListDialog extends StandardDialog implements
      * @param urlHandler The URL Handler to use to handle clicked links
      * @param performWrapper The wrapper to use for the perform tab
      * @param serverListModel The model to use for the dialog.
-     * @param dialogManager The manager to register the dialog with.
      * @param mainFrame The main frame that owns the dialog.
      */
     @Inject
@@ -92,9 +89,8 @@ public class ServerListDialog extends StandardDialog implements
             final URLHandler urlHandler,
             final PerformWrapper performWrapper,
             final ServerListModel serverListModel,
-            final DialogManager dialogManager,
             final MainFrame mainFrame) {
-        super(dialogManager, mainFrame, ModalityType.MODELESS);
+        super(mainFrame, ModalityType.MODELESS);
 
         setTitle("Server List");
         model = serverListModel;

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

@@ -30,7 +30,6 @@ import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 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.ConfirmQuitDialog;
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.addons.ui_swing.framemanager.FrameManager;
 import com.dmdirc.addons.ui_swing.framemanager.FramemanagerPosition;
@@ -83,8 +82,6 @@ public class MainFrame extends JFrame implements WindowListener,
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 9;
-    /** Dialog manager. */
-    private final DialogManager dialogManager;
     /** Focus queue. */
     private final QueuedLinkedHashSet<TextFrame> focusOrder;
     /** Swing Controller. */
@@ -133,7 +130,6 @@ public class MainFrame extends JFrame implements WindowListener,
     /**
      * Creates new form MainFrame.
      *
-     * @param dialogManager Dialog manager
      * @param controller Swing controller
      * @param windowFactory The window factory to use to create and listen for windows.
      * @param lifecycleController Controller to use to end the application.
@@ -142,7 +138,7 @@ public class MainFrame extends JFrame implements WindowListener,
      * @param iconManager The icon manager to use to get icons.
      * @param windowManager Window management
      */
-    public MainFrame(final DialogManager dialogManager,
+    public MainFrame(
             final SwingController controller,
             final SwingWindowFactory windowFactory,
             final LifecycleController lifecycleController,
@@ -152,7 +148,6 @@ public class MainFrame extends JFrame implements WindowListener,
             final WindowManager windowManager) {
         super();
 
-        this.dialogManager = dialogManager;
         this.controller = controller;
         this.windowFactory = windowFactory;
         this.lifecycleController = lifecycleController;
@@ -525,7 +520,7 @@ public class MainFrame extends JFrame implements WindowListener,
      */
     public void quit(final int exitCode) {
         if (exitCode == 0 && globalConfig.getOptionBool("ui", "confirmQuit")) {
-            final StandardQuestionDialog dialog = new ConfirmQuitDialog(dialogManager, this) {
+            final StandardQuestionDialog dialog = new ConfirmQuitDialog(this) {
 
                 /** Serial version UID. */
                 private static final long serialVersionUID = 9;

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

@@ -338,10 +338,9 @@ public final class PrefsComponentFactory {
         DurationDisplay option;
 
         try {
-            option = new DurationDisplay(controller, Integer.parseInt(
-                    setting.getValue()));
+            option = new DurationDisplay(Integer.parseInt(setting.getValue()));
         } catch (final NumberFormatException ex) {
-            option = new DurationDisplay(controller);
+            option = new DurationDisplay();
         }
 
         option.addDurationListener(new DurationListener() {

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

@@ -37,15 +37,9 @@ import com.dmdirc.addons.ui_swing.commands.PopOutCommand;
 import com.dmdirc.addons.ui_swing.commands.ServerSettings;
 import com.dmdirc.addons.ui_swing.components.addonbrowser.DataLoaderWorkerFactory;
 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.DialogManager;
-import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
-import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
 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.injection.SwingModule;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesCategory;
@@ -332,8 +326,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                showDialog(ChannelSettingsDialog.class, channel,
-                        getWindowFactory().getSwingWindow(channel));
+                swingManager.getChannelSettingsDialogProvider().displayOrRequestFocus(channel);
             }
         });
     }
@@ -346,28 +339,24 @@ public class SwingController extends BaseCommandPlugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                showDialog(ServerSettingsDialog.class,
-                        server, getWindowFactory().getSwingWindow(server));
+                swingManager.getServerSettingsDialogProvider().displayOrRequestFocus(server);
             }
         });
     }
 
     /**
-     * Proxy method to {@link DialogManager} that shows a dialog in the client.
-     * For more details on what parameters might be required see
-     * {@link DialogManager#getDialog(Class, Object...)}
-     *
-     * @param <T> Dialog type
-     * @see DialogManager#getDialog(Class, Object...) getDialog
-     *
-     * @param klass The class of the dialog to show
-     * @param params Any non standard parameters required
-     * @deprecated Use dagger instead.
+     * @deprecated Callers should be given access to the provider.
      */
     @Deprecated
-    public <T extends StandardDialog> void showDialog(final Class<T> klass,
-            final Object... params) {
-        getDialogManager().showDialog(klass, params);
+    public void closeServerSettingsDialog(final Server server) {
+        UIUtilities.invokeLater(new Runnable() {
+
+            /** {@inheritDoc} */
+            @Override
+            public void run() {
+                swingManager.getServerSettingsDialogProvider().dispose(server);
+            }
+        });
     }
 
     /**
@@ -479,7 +468,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                showDialog(URLDialog.class, url, getUrlHandler());
+                swingManager.getUrlDialogFactory().getURLDialog(url).display();
             }
         });
     }
@@ -492,7 +481,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
             /** {@inheritDoc} */
             @Override
             public void run() {
-                new FeedbackNag(SwingController.this);
+                swingManager.getFeedbackNagProvider().get();
             }
         });
     }
@@ -581,9 +570,11 @@ public class SwingController extends BaseCommandPlugin implements UIController {
      * Returns the preferences dialog instance creating if required.
      *
      * @return Swing prefs dialog
+     * @deprecated Inject the relevant dialog manager instead.
      */
+    @Deprecated
     public SwingPreferencesDialog getPrefsDialog() {
-        return getDialogManager().getDialog(SwingPreferencesDialog.class);
+        return swingManager.getPrefsDialogProvider().get();
     }
 
     /** {@inheritDoc} */
@@ -935,17 +926,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         return swingManager.getUrlHandler();
     }
 
-    /**
-     * Gets the Dialog manager.
-     *
-     * @return The Dialog manager to use
-     * @deprecated Should be injected
-     */
-    @Deprecated
-    public DialogManager getDialogManager() {
-        return swingManager.getDialogManager();
-    }
-
     @Deprecated
     public DataLoaderWorkerFactory getDataLoaderWorkerFactory() {
         return swingManager.getDataLoaderWorkerFactory();

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

@@ -22,12 +22,20 @@
 
 package com.dmdirc.addons.ui_swing;
 
+import com.dmdirc.Channel;
+import com.dmdirc.Server;
 import com.dmdirc.addons.ui_swing.components.addonbrowser.DataLoaderWorkerFactory;
 import com.dmdirc.addons.ui_swing.components.menubar.MenuBar;
+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.channelsetting.ChannelSettingsDialog;
+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.URLDialogFactory;
 import com.dmdirc.addons.ui_swing.framemanager.ctrltab.CtrlTabWindowManager;
+import com.dmdirc.addons.ui_swing.injection.DialogProvider;
+import com.dmdirc.addons.ui_swing.injection.KeyedDialogProvider;
 import com.dmdirc.addons.ui_swing.wizard.firstrun.FirstRunWizardExecutor;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
@@ -47,9 +55,6 @@ import javax.inject.Singleton;
 @Singleton
 public class SwingManager {
 
-    /** The dialog manager to use. */
-    private final DialogManager dialogManager;
-
     /** The event queue to use. */
     private final DMDircEventQueue eventQueue;
 
@@ -86,10 +91,22 @@ public class SwingManager {
     /** The factory to use to create prefs components. */
     private final PrefsComponentFactory prefsComponentFactory;
 
+    /** Provider of prefs dialogs. */
+    private final DialogProvider<SwingPreferencesDialog> prefsDialogProvider;
+    /** Provider of server settings dialogs. */
+    private final KeyedDialogProvider<Server, ServerSettingsDialog> serverSettingsDialogProvider;
+    /** Provider of channel settings dialogs. */
+    private final KeyedDialogProvider<Channel, ChannelSettingsDialog> channelSettingsDialogProvider;
+
+    /** Provider of feedback nags. */
+    private final Provider<FeedbackNag> feedbackNagProvider;
+
+    /** Factory to use to create URL dialogs. */
+    private final URLDialogFactory urlDialogFactory;
+
     /**
      * Creates a new instance of {@link SwingManager}.
      *
-     * @param dialogManager Dialog manager to use
      * @param eventQueue The event queue to use.
      * @param windowFactory The window factory in use.
      * @param windowManager The window manager to listen on for events.
@@ -104,10 +121,14 @@ public class SwingManager {
      * @param cachingUpdateManager Update manager to use.
      * @param firstRunExecutor A provider of first run executors.
      * @param prefsComponentFactory The factory to use to create prefs components.
+     * @param prefsDialogProvider Provider of prefs dialogs.
+     * @param serverSettingsDialogProvider Provider of server settings dialogs.
+     * @param channelSettingsDialogProvider Provider of channel settings dialogs.
+     * @param feedbackNagProvider Provider of feedback nags.
+     * @param urlDialogFactory Factory to use to create URL dialogs.
      */
     @Inject
     public SwingManager(
-            final DialogManager dialogManager,
             final DMDircEventQueue eventQueue,
             final SwingWindowFactory windowFactory,
             final WindowManager windowManager,
@@ -121,8 +142,12 @@ public class SwingManager {
             final DataLoaderWorkerFactory dataLoaderWorkerFactory,
             final CachingUpdateManager cachingUpdateManager,
             final Provider<FirstRunWizardExecutor> firstRunExecutor,
-            final PrefsComponentFactory prefsComponentFactory) {
-        this.dialogManager = dialogManager;
+            final PrefsComponentFactory prefsComponentFactory,
+            final DialogProvider<SwingPreferencesDialog> prefsDialogProvider,
+            final KeyedDialogProvider<Server, ServerSettingsDialog> serverSettingsDialogProvider,
+            final KeyedDialogProvider<Channel, ChannelSettingsDialog> channelSettingsDialogProvider,
+            final Provider<FeedbackNag> feedbackNagProvider,
+            final URLDialogFactory urlDialogFactory) {
         this.eventQueue = eventQueue;
         this.windowFactory = windowFactory;
         this.windowManager = windowManager;
@@ -134,6 +159,11 @@ public class SwingManager {
         this.cachingUpdateManager = cachingUpdateManager;
         this.firstRunExecutor = firstRunExecutor;
         this.prefsComponentFactory = prefsComponentFactory;
+        this.prefsDialogProvider = prefsDialogProvider;
+        this.serverSettingsDialogProvider = serverSettingsDialogProvider;
+        this.channelSettingsDialogProvider = channelSettingsDialogProvider;
+        this.feedbackNagProvider = feedbackNagProvider;
+        this.urlDialogFactory = urlDialogFactory;
 
         this.mainFrame = mainFrame;
         this.mainFrame.setMenuBar(menuBar);
@@ -175,18 +205,6 @@ public class SwingManager {
         return firstRunExecutor.get();
     }
 
-    /**
-     * Retrieves the dialog manager to use.
-     *
-     * @return The dialog manager to use
-     *
-     * @deprecated Should be injected
-     */
-    @Deprecated
-    public DialogManager getDialogManager() {
-        return dialogManager;
-    }
-
     @Deprecated
     public DataLoaderWorkerFactory getDataLoaderWorkerFactory() {
         return dataLoaderWorkerFactory;
@@ -202,6 +220,31 @@ public class SwingManager {
         return prefsComponentFactory;
     }
 
+    @Deprecated
+    public DialogProvider<SwingPreferencesDialog> getPrefsDialogProvider() {
+        return prefsDialogProvider;
+    }
+
+    @Deprecated
+    public KeyedDialogProvider<Server, ServerSettingsDialog> getServerSettingsDialogProvider() {
+        return serverSettingsDialogProvider;
+    }
+
+    @Deprecated
+    public KeyedDialogProvider<Channel, ChannelSettingsDialog> getChannelSettingsDialogProvider() {
+        return channelSettingsDialogProvider;
+    }
+
+    @Deprecated
+    public Provider<FeedbackNag> getFeedbackNagProvider() {
+        return feedbackNagProvider;
+    }
+
+    @Deprecated
+    public URLDialogFactory getUrlDialogFactory() {
+        return urlDialogFactory;
+    }
+
     /**
      * Retrieves the window factory to use.
      *

src/com/dmdirc/addons/ui_swing/cinch/ConfirmAction.java

@@ -139,7 +139,7 @@ public @interface ConfirmAction {
                 /** {@inheritDoc} */
                 @Override
                 public void actionPerformed(final ActionEvent e) {
-                    new StandardQuestionDialog(null,
+                    new StandardQuestionDialog(
                             (Window) ((AbstractButton) actionObject)
                             .getTopLevelAncestor(), ModalityType.DOCUMENT_MODAL,
                             "Confirmaton", message) {

src/com/dmdirc/addons/ui_swing/cinch/InputAction.java

@@ -187,7 +187,7 @@ public @interface InputAction {
                 /** {@inheritDoc} */
                 @Override
                 public void actionPerformed(final ActionEvent e) {
-                    new StandardInputDialog(null,
+                    new StandardInputDialog(
                             (Window) ((AbstractButton) actionObject)
                             .getTopLevelAncestor(), ModalityType.DOCUMENT_MODAL,
                             "Input", message, validatorInstance) {

src/com/dmdirc/addons/ui_swing/components/addonbrowser/AddonInfoLabel.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 
 import java.awt.Color;
 import java.awt.Font;
@@ -51,25 +50,20 @@ public class AddonInfoLabel extends JPanel {
     private final AddonInfo addonInfo;
     /** Parent window. */
     private final BrowserWindow parentWindow;
-    /** The manager that will be used for installer dialogs. */
-    private final DialogManager dialogManager;
     /** Factory to use to create install workers. */
     private final InstallWorkerFactory workerFactory;
 
     /**
      * Creates a new addon info label to describe the specified addon info.
      *
-     * @param dialogManager The manager that will be used for installer dialogs.
      * @param addonInfo Addon to describe
      * @param parentWindow Parent window
      * @param workerFactory
      */
     public AddonInfoLabel(
-            final DialogManager dialogManager,
             final AddonInfo addonInfo,
             final BrowserWindow parentWindow,
             final InstallWorkerFactory workerFactory) {
-        this.dialogManager = dialogManager;
         this.addonInfo = addonInfo;
         this.parentWindow = parentWindow;
         this.workerFactory = workerFactory;
@@ -100,7 +94,7 @@ public class AddonInfoLabel extends JPanel {
                 "wmax 100%-170, hmax 150, growy, wrap, pushy, gapleft 5");
 
         final JButton button = new JButton("Install");
-        button.addActionListener(new InstallListener(dialogManager, workerFactory, addonInfo,
+        button.addActionListener(new InstallListener(workerFactory, addonInfo,
                 parentWindow));
         final boolean installed = addonInfo.isInstalled();
         add(button, "split, gapleft 5");

src/com/dmdirc/addons/ui_swing/components/addonbrowser/DataLoaderWorker.java

@@ -98,7 +98,7 @@ public class DataLoaderWorker
             final SwingController controller,
             final InstallWorkerFactory workerFactory,
             final UpdateManager updateManager,
-            @Directory(DirectoryType.TEMPORARY) final String tempDirectory,
+            @SuppressWarnings("qualifiers") @Directory(DirectoryType.TEMPORARY) final String tempDirectory,
             @Unbound final AddonTable table,
             @Unbound final boolean download,
             @Unbound final BrowserWindow browserWindow,
@@ -179,7 +179,7 @@ public class DataLoaderWorker
         table.getModel().setRowCount(0);
         for (final AddonInfo info : data) {
             table.getModel().addRow(new Object[]{
-                new AddonInfoLabel(controller.getDialogManager(), info, browserWindow, workerFactory),
+                new AddonInfoLabel(info, browserWindow, workerFactory),
             });
         }
         table.getSelectionModel().setSelectionInterval(selectedRow, selectedRow);

src/com/dmdirc/addons/ui_swing/components/addonbrowser/InstallListener.java

@@ -22,8 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
-
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -38,23 +36,18 @@ public class InstallListener implements ActionListener {
     private final InstallWorkerFactory workerFactory;
     /** Parent window. */
     private final BrowserWindow parentWindow;
-    /** Swing controller. */
-    private final DialogManager dialogManager;
 
     /**
      * Instantiates a new install listener.
      *
-     * @param dialogManager Manager to use for installer dialogs.
      * @param workerFactory Factory to use to construct install workers.
      * @param info Addoninfo to install
      * @param parentWindow Parent window
      */
     public InstallListener(
-            final DialogManager dialogManager,
             final InstallWorkerFactory workerFactory,
             final AddonInfo info,
             final BrowserWindow parentWindow) {
-        this.dialogManager = dialogManager;
         this.workerFactory = workerFactory;
         this.info = info;
         this.parentWindow = parentWindow;
@@ -67,8 +60,7 @@ public class InstallListener implements ActionListener {
      */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        final InstallerWindow installer = new InstallerWindow(dialogManager,
-                parentWindow, info);
+        final InstallerWindow installer = new InstallerWindow(parentWindow, info);
         installer.display(parentWindow);
         workerFactory.getInstallWorker(info, installer).executeInExecutor();
     }

src/com/dmdirc/addons/ui_swing/components/addonbrowser/InstallWorker.java

@@ -55,9 +55,9 @@ public class InstallWorker extends LoggingSwingWorker<String, Void> {
     private final PluginManager pluginManager;
 
     public InstallWorker(
-            @Directory(DirectoryType.TEMPORARY) final String tempDirectory,
-            @Directory(DirectoryType.PLUGINS) final String pluginDirectory,
-            @Directory(DirectoryType.THEMES) final String themeDirectory,
+            @SuppressWarnings("qualifiers") @Directory(DirectoryType.TEMPORARY) final String tempDirectory,
+            @SuppressWarnings("qualifiers") @Directory(DirectoryType.PLUGINS) final String pluginDirectory,
+            @SuppressWarnings("qualifiers") @Directory(DirectoryType.THEMES) final String themeDirectory,
             final PluginManager pluginManager,
             @Unbound final AddonInfo info,
             @Unbound final InstallerWindow window) {

src/com/dmdirc/addons/ui_swing/components/addonbrowser/InstallerWindow.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.addonbrowser;
 
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 
 import java.awt.event.ActionEvent;
@@ -57,13 +56,11 @@ public class InstallerWindow extends StandardDialog implements ActionListener {
     /**
      * Instantiates a new installer window.
      *
-     * @param dialogManager The dialog manager looking after this window.
      * @param parentWindow Parent window
      * @param info Associated addon info
      */
-    public InstallerWindow(final DialogManager dialogManager,
-            final BrowserWindow parentWindow, final AddonInfo info) {
-        super(dialogManager, parentWindow, ModalityType.MODELESS);
+    public InstallerWindow(final BrowserWindow parentWindow, final AddonInfo info) {
+        super(parentWindow, ModalityType.MODELESS);
         this.info = info;
         this.parentWindow = parentWindow;
         setTitle("Installing addon...");

src/com/dmdirc/addons/ui_swing/components/addonpanel/AddonPanel.java

@@ -28,6 +28,7 @@ import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
 import com.dmdirc.addons.ui_swing.components.addonbrowser.BrowserWindow;
 import com.dmdirc.addons.ui_swing.components.renderers.AddonCellRenderer;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
+import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.ui.IconManager;
 
@@ -53,12 +54,14 @@ import net.miginfocom.swing.MigLayout;
 public abstract class AddonPanel extends JPanel implements AddonToggleListener,
         ListSelectionListener, PreferencesInterface, HyperlinkListener {
 
+    /** Serial version UID. */
+    private static final long serialVersionUID = 3;
     /** List of addons. */
     protected JTable addonList;
     /** Swing Controller. */
     protected final SwingController controller;
-    /** Serial version UID. */
-    private static final long serialVersionUID = 3;
+    /** The prefs dialog that contains this panel. */
+    private final SwingPreferencesDialog prefsDialog;
     /** Parent Window. */
     private final Window parentWindow;
     /** The icon manager used to retrieve icons. */
@@ -79,13 +82,17 @@ public abstract class AddonPanel extends JPanel implements AddonToggleListener,
      *
      * @param parentWindow Parent window
      * @param controller Swing Controller
+     * @param prefsDialog The prefs dialog that contains this panel
      */
-    public AddonPanel(final Window parentWindow,
-            final SwingController controller) {
+    public AddonPanel(
+            final Window parentWindow,
+            final SwingController controller,
+            final SwingPreferencesDialog prefsDialog) {
         super();
 
         this.parentWindow = parentWindow;
         this.controller = controller;
+        this.prefsDialog = prefsDialog;
         iconManager = controller.getIconManager();
 
         initComponents();
@@ -161,13 +168,7 @@ public abstract class AddonPanel extends JPanel implements AddonToggleListener,
 
     /** Lays out the dialog. */
     private void layoutComponents() {
-        if (controller == null) {
-            setLayout(new MigLayout("ins 0, fill, hmax " + 500));
-        } else {
-            setLayout(new MigLayout("ins 0, fill, hmax "
-                    + controller.getPrefsDialog().getPanelHeight()));
-        }
-
+        setLayout(new MigLayout("ins 0, fill, hmax " + prefsDialog.getPanelHeight()));
         add(blurbLabel, "wrap 5, growx, pushx");
         add(getMoreLabel, "wrap 5, right");
         add(scrollPane, "wrap 5, grow, push");

src/com/dmdirc/addons/ui_swing/components/addonpanel/PluginPanel.java

@@ -26,6 +26,7 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.plugins.PluginInfo;
@@ -56,10 +57,13 @@ public class PluginPanel extends AddonPanel implements ActionListener {
      *
      * @param parentWindow Parent window
      * @param controller Swing Controller
+     * @param prefsDialog The prefs dialog that contains this panel
      */
-    public PluginPanel(final Window parentWindow,
-            final SwingController controller) {
-        super(parentWindow, controller);
+    public PluginPanel(
+            final Window parentWindow,
+            final SwingController controller,
+            final SwingPreferencesDialog prefsDialog) {
+        super(parentWindow, controller, prefsDialog);
 
         ActionManager.getActionManager().registerListener(this,
                 CoreActionType.PLUGIN_REFRESH);

src/com/dmdirc/addons/ui_swing/components/addonpanel/ThemePanel.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.components.addonpanel;
 
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
 import com.dmdirc.ui.themes.Theme;
 import com.dmdirc.ui.themes.ThemeManager;
 
@@ -57,12 +58,14 @@ public class ThemePanel extends AddonPanel {
      * @param parentWindow Parent window
      * @param controller Swing Controller
      * @param themeManager Manager to retrieve themes from.
+     * @param prefsDialog The prefs dialog that contains this panel
      */
     public ThemePanel(
             final Window parentWindow,
             final SwingController controller,
-            final ThemeManager themeManager) {
-        super(parentWindow, controller);
+            final ThemeManager themeManager,
+            final SwingPreferencesDialog prefsDialog) {
+        super(parentWindow, controller, prefsDialog);
         this.themeManager = themeManager;
     }
 

src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationDisplay.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.durationeditor;
 
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.util.DateUtils;
 import com.dmdirc.util.collections.ListenerList;
@@ -52,8 +51,6 @@ public class DurationDisplay extends JPanel implements ActionListener,
     private static final long serialVersionUID = 1;
     /** Listener list. */
     private final ListenerList listeners;
-    /** Swing controller. */
-    private final SwingController controller;
     /** Current duration. */
     private int duration;
     /** Duration label. */
@@ -65,51 +62,42 @@ public class DurationDisplay extends JPanel implements ActionListener,
 
     /**
      * Initialises a new duration display of 0 milliseconds.
-     *
-     * @param controller Controller for dialog creation
      */
-    public DurationDisplay(final SwingController controller) {
-        this(controller, 0);
+    public DurationDisplay() {
+        this(0);
     }
 
     /**
      * Instantiates a new duration display.
      *
-     * @param controller Controller for dialog creation
      * @param window Parent window.
      *
      * @since 0.6
      */
-    public DurationDisplay(final SwingController controller,
-            final Window window) {
-        this(controller, window, 0);
+    public DurationDisplay(final Window window) {
+        this(window, 0);
     }
 
     /**
      * Instantiates a new duration display.
      *
-     * @param controller Controller for dialog creation
      * @param duration Starting duration
      */
-    public DurationDisplay(final SwingController controller,
-            final long duration) {
-        this(controller, null, duration);
+    public DurationDisplay(final long duration) {
+        this(null, duration);
     }
 
     /**
      * Initialises a new duration display showing the specified millisecond duration.
      *
-     * @param controller Controller for dialog creation
      * @param window Parent window.
      * @param duration Duration to display in milliseconds
      *
      * @since 0.6
      */
-    public DurationDisplay(final SwingController controller,
-            final Window window, final long duration) {
+    public DurationDisplay(final Window window, final long duration) {
         super();
 
-        this.controller = controller;
         this.window = window;
         this.duration = (int) (duration / 1000);
         listeners = new ListenerList();
@@ -162,8 +150,7 @@ public class DurationDisplay extends JPanel implements ActionListener,
      */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        final DurationEditor editor = new DurationEditor(controller, window,
-                duration);
+        final DurationEditor editor = new DurationEditor(window, duration);
         editor.display(this);
         editor.addDurationListener(this);
     }

src/com/dmdirc/addons/ui_swing/components/durationeditor/DurationEditor.java

@@ -85,15 +85,12 @@ public class DurationEditor extends StandardDialog implements ActionListener {
     /**
      * Instantiates a new duration editor.
      *
-     * @param controller Controller for dialog creation
-     *
      * @param window Parent window.
      *
      * @since 0.6
      */
-    public DurationEditor(final SwingController controller,
-            final Window window) {
-        this(controller, window, 0);
+    public DurationEditor(final Window window) {
+        this(window, 0);
     }
 
     /**
@@ -105,21 +102,19 @@ public class DurationEditor extends StandardDialog implements ActionListener {
      */
     public DurationEditor(final SwingController controller,
             final long duration) {
-        this(controller, controller.getMainFrame(), duration);
+        this(controller.getMainFrame(), duration);
     }
 
     /**
      * Instantiates a new duration editor.
      *
-     * @param controller Controller for dialog creation
      * @param window Parent window.
      * @param duration Starting duration
      *
      * @since 0.6
      */
-    public DurationEditor(final SwingController controller,
-            final Window window, final long duration) {
-        super(controller.getDialogManager(), window, ModalityType.MODELESS);
+    public DurationEditor(final Window window, final long duration) {
+        super(window, ModalityType.MODELESS);
 
         this.window = window;
 

src/com/dmdirc/addons/ui_swing/components/frames/ServerFrame.java

@@ -26,7 +26,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.sslcertificate.SSLCertificateDialog;
 import com.dmdirc.commandparser.PopupType;
 import com.dmdirc.interfaces.Connection;
@@ -145,7 +144,7 @@ public final class ServerFrame extends InputTextFrame implements
     public void certificateProblemEncountered(final X509Certificate[] chain,
             final Collection<CertificateException> problems,
             final CertificateManager certificateManager) {
-        sslDialog = new SSLCertificateDialog(getController().getDialogManager(), getController().getIconManager(), getController().getMainFrame(),
+        sslDialog = new SSLCertificateDialog(getController().getIconManager(), getController().getMainFrame(),
                 new SSLCertificateDialogModel(chain, problems, certificateManager));
         sslDialog.display();
     }
@@ -161,7 +160,7 @@ public final class ServerFrame extends InputTextFrame implements
     /** {@inheritDoc} */
     @Override
     public void windowClosing(final FrameContainer window) {
-        controller.getDialogManager().dispose(ServerSettingsDialog.class);
+        controller.closeServerSettingsDialog((Server) window.getConnection());
         super.windowClosing(window);
     }
 

src/com/dmdirc/addons/ui_swing/components/menubar/ChannelMenu.java

@@ -112,7 +112,7 @@ public class ChannelMenu extends JMenu implements ActionListener,
     public void actionPerformed(final ActionEvent e) {
         switch (e.getActionCommand()) {
             case "JoinChannel":
-                new ChannelJoinDialog(controller.getDialogManager(), controller.getMainFrame(),
+                new ChannelJoinDialog(controller.getMainFrame(),
                         ModalityType.MODELESS, "Join channel",
                         "Enter the name of the channel to join.").display();
                 break;

src/com/dmdirc/addons/ui_swing/components/menubar/HelpMenu.java

@@ -24,9 +24,9 @@ package com.dmdirc.addons.ui_swing.components.menubar;
 
 import com.dmdirc.ServerManager;
 import com.dmdirc.addons.ui_swing.Apple;
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.FeedbackDialog;
 import com.dmdirc.addons.ui_swing.dialogs.about.AboutDialog;
+import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -44,24 +44,29 @@ public class HelpMenu extends JMenu implements ActionListener {
 
     /** Serial version UID. */
     private static final long serialVersionUID = 1;
-    /** Swing controller. */
-    private final SwingController controller;
     /** Server manager to use to join dev chat. */
     private final ServerManager serverManager;
+    /** Provider of feedback dialogs. */
+    private final DialogProvider<FeedbackDialog> feedbackDialogProvider;
+    /** Provider of about dialogs. */
+    private final DialogProvider<AboutDialog> aboutDialogProvider;
 
     /**
      * Instantiates a new help menu.
      *
-     * @param controller Swing controller
      * @param serverManager The manager to use to join dev chat.
+     * @param feedbackDialogProvider Provider of feedback dialogs.
+     * @param aboutDialogProvider Provider of about dialogs.
      */
     @Inject
     public HelpMenu(
-            final SwingController controller,
-            final ServerManager serverManager) {
+            final ServerManager serverManager,
+            final DialogProvider<FeedbackDialog> feedbackDialogProvider,
+            final DialogProvider<AboutDialog> aboutDialogProvider) {
         super("Help");
-        this.controller = controller;
         this.serverManager = serverManager;
+        this.feedbackDialogProvider = feedbackDialogProvider;
+        this.aboutDialogProvider = aboutDialogProvider;
         setMnemonic('h');
         initHelpMenu();
     }
@@ -105,13 +110,13 @@ public class HelpMenu extends JMenu implements ActionListener {
     public void actionPerformed(final ActionEvent e) {
         switch (e.getActionCommand()) {
             case "About":
-                controller.showDialog(AboutDialog.class);
+                aboutDialogProvider.displayOrRequestFocus();
                 break;
             case "JoinDevChat":
                 serverManager.joinDevChat();
                 break;
             case "feedback":
-                controller.showDialog(FeedbackDialog.class);
+                feedbackDialogProvider.displayOrRequestFocus();
                 break;
         }
     }

src/com/dmdirc/addons/ui_swing/components/menubar/SettingsMenu.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.menubar;
 
 import com.dmdirc.addons.ui_swing.Apple;
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.actionsmanager.ActionsManagerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.aliases.AliasManagerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
@@ -46,22 +45,26 @@ public class SettingsMenu extends JMenu implements ActionListener {
 
     /** Serial version UID. */
     private static final long serialVersionUID = 1;
-    /** Swing controller. */
-    private final SwingController controller;
     /** Provider of profile manager dialogs. */
     private final DialogProvider<ProfileManagerDialog> profileDialogProvider;
     /** Provider of action manager dialogs. */
     private final DialogProvider<ActionsManagerDialog> actionsDialogProvider;
+    /** Provider of preferences dialogs. */
+    private final DialogProvider<SwingPreferencesDialog> prefsDialogProvider;
+    /** Provider of alias manager dialogs. */
+    private final DialogProvider<AliasManagerDialog> aliasDialogProvider;
 
     @Inject
     public SettingsMenu(
-            final SwingController controller,
             final DialogProvider<ProfileManagerDialog> profileDialogProvider,
-            final DialogProvider<ActionsManagerDialog> actionsDialogProvider) {
+            final DialogProvider<ActionsManagerDialog> actionsDialogProvider,
+            final DialogProvider<SwingPreferencesDialog> prefsDialogProvider,
+            final DialogProvider<AliasManagerDialog> aliasDialogProvider) {
         super("Settings");
-        this.controller = controller;
         this.profileDialogProvider = profileDialogProvider;
         this.actionsDialogProvider = actionsDialogProvider;
+        this.prefsDialogProvider = prefsDialogProvider;
+        this.aliasDialogProvider = aliasDialogProvider;
 
         setMnemonic('e');
         initSettingsMenu();
@@ -109,7 +112,7 @@ public class SettingsMenu extends JMenu implements ActionListener {
     public void actionPerformed(final ActionEvent e) {
         switch (e.getActionCommand()) {
             case "Preferences":
-                controller.showDialog(SwingPreferencesDialog.class);
+                prefsDialogProvider.displayOrRequestFocus();
                 break;
             case "Profile":
                 profileDialogProvider.displayOrRequestFocus();
@@ -118,7 +121,7 @@ public class SettingsMenu extends JMenu implements ActionListener {
                 actionsDialogProvider.displayOrRequestFocus();
                 break;
             case "Aliases":
-                controller.showDialog(AliasManagerDialog.class);
+                aliasDialogProvider.displayOrRequestFocus();
                 break;
         }
     }

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

@@ -103,8 +103,7 @@ public class ErrorPanel extends StatusbarPopupPanel<JLabel> implements
     /** {@inheritDoc} */
     @Override
     protected StatusbarPopupWindow getWindow() {
-        return new ErrorPopup(controller.getDialogManager(), controller.getIconManager(),
-                this, mainFrame);
+        return new ErrorPopup(controller.getIconManager(), this, mainFrame);
     }
 
     /** Clears the error. */

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.ErrorManager;
 import com.dmdirc.logger.ErrorReportStatus;
@@ -53,17 +52,15 @@ public class ErrorPopup extends StatusbarPopupWindow {
     /**
      * Creates a new error popup.
      *
-     * @param dialogManager The manager to register the popup with.
      * @param iconManager The manager to use to retrieve icons.
      * @param parent Parent panel
      * @param parentWindow Parent window
      */
     public ErrorPopup(
-            final DialogManager dialogManager,
             final IconManager iconManager,
             final JPanel parent,
             final Window parentWindow) {
-        super(dialogManager, parent, parentWindow);
+        super(parent, parentWindow);
 
         this.iconManager = iconManager;
     }

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

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.components.statusbar;
 
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.FeedbackDialog;
+import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
 
 import java.awt.event.ActionEvent;
@@ -31,6 +32,7 @@ import java.awt.event.ActionListener;
 import java.awt.event.MouseEvent;
 import java.awt.event.MouseListener;
 
+import javax.inject.Inject;
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JMenuItem;
@@ -54,15 +56,23 @@ public class FeedbackNag extends JLabel implements StatusBarComponent,
     private final JMenuItem show;
     /** Swing Controller. */
     private final SwingController controller;
+    /** Provider of feedback dialogs. */
+    private final DialogProvider<FeedbackDialog> feedbackDialogProvider;
 
     /**
      * Creates a new feedback nag.
      *
      * @param controller Swing controller
+     * @param feedbackDialogProvider Provider of feedback dialogs.
      */
-    public FeedbackNag(final SwingController controller) {
+    @Inject
+    public FeedbackNag(
+            final SwingController controller,
+            final DialogProvider<FeedbackDialog> feedbackDialogProvider) {
         super();
         this.controller = controller;
+        this.feedbackDialogProvider = feedbackDialogProvider;
+
         menu = new JPopupMenu();
         show = new JMenuItem("Open");
         final JMenuItem dismiss = new JMenuItem("Dismiss");
@@ -109,7 +119,7 @@ public class FeedbackNag extends JLabel implements StatusBarComponent,
     @Override
     public void mouseReleased(final MouseEvent e) {
         if (e.getButton() == 1) {
-            controller.showDialog(FeedbackDialog.class);
+            feedbackDialogProvider.displayOrRequestFocus();
             controller.getSwingStatusBar().removeComponent(this);
         }
         checkMouseEvent(e);
@@ -154,7 +164,7 @@ public class FeedbackNag extends JLabel implements StatusBarComponent,
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == show) {
-            controller.showDialog(FeedbackDialog.class);
+            feedbackDialogProvider.displayOrRequestFocus();
         }
         controller.getSwingStatusBar().removeComponent(this);
     }

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

@@ -32,7 +32,6 @@ import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SelectionListener;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.InviteListener;
@@ -73,28 +72,23 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
     private final JMenuItem accept;
     /** Main frame. */
     private final MainFrame mainFrame;
-    /** The dialog manager to register dialogs with. */
-    private final DialogManager dialogManager;
     /** Active server. */
     private Server activeServer;
 
     /**
      * Instantiates a new invite label.
      *
-     * @param dialogManager The manager to register dialogs with.
      * @param iconManager The manager to retrieve the invite icon from.
      * @param serverManager The manager to use to iterate servers.
      * @param mainFrame Main frame
      */
     @Inject
     public InviteLabel(
-            final DialogManager dialogManager,
             @GlobalConfig final IconManager iconManager,
             final ServerManager serverManager,
             final MainFrame mainFrame) {
         super(new JLabel());
 
-        this.dialogManager = dialogManager;
         this.mainFrame = mainFrame;
 
         setBorder(BorderFactory.createEtchedBorder());
@@ -126,7 +120,7 @@ public class InviteLabel extends StatusbarPopupPanel<JLabel> implements
     /** {@inheritDoc} */
     @Override
     protected StatusbarPopupWindow getWindow() {
-        return new InvitePopup(dialogManager, this, activeServer, mainFrame);
+        return new InvitePopup(this, activeServer, mainFrame);
     }
 
     /**

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
 import com.dmdirc.Invite;
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.util.DateUtils;
 
@@ -51,14 +50,13 @@ public class InvitePopup extends StatusbarPopupWindow {
     /**
      * Creates a new InvitePopup for the specified panel and connection.
      *
-     * @param dialogManager The dialog manager to register this dialog with.
      * @param parent The parent of this popup
      * @param connection The connection to show invites for
      * @param parentWindow Parent window
      */
-    public InvitePopup(final DialogManager dialogManager, final JPanel parent,
+    public InvitePopup(final JPanel parent,
             final Connection connection, final Window parentWindow) {
-        super(dialogManager, parent, parentWindow);
+        super(parent, parentWindow);
         this.connection = connection;
     }
 

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

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
 import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.util.collections.RollingList;
 
@@ -80,7 +79,7 @@ class MessagePopup extends StatusbarTogglePanel<JLabel> {
     /* {@inheritDoc} */
     @Override
     protected StatusbarPopupWindow getWindow() {
-        return new MessageHistoryPanel(controller.getDialogManager(), this);
+        return new MessageHistoryPanel(this);
     }
 
     /* {@inheritDoc} */
@@ -141,11 +140,10 @@ class MessagePopup extends StatusbarTogglePanel<JLabel> {
         /**
          * Creates a new message history window.
          *
-         * @param dialogManager The dialog manager to register this window with.
          * @param window Parent window
          */
-        public MessageHistoryPanel(final DialogManager dialogManager, final JPanel parent) {
-            super(dialogManager, parent, parentWindow);
+        public MessageHistoryPanel(final JPanel parent) {
+            super(parent, parentWindow);
         }
 
         /* {@inheritDoc} */

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 
 import java.awt.Point;
@@ -56,15 +55,13 @@ public abstract class StatusbarPopupWindow extends StandardDialog {
     /**
      * Creates a new status bar popup window.
      *
-     * @param dialogManager The dialog manager to register this dialog with.
      * @param parent The {@link JPanel} to use for positioning
      * @param parentWindow Parent window
      */
     public StatusbarPopupWindow(
-            final DialogManager dialogManager,
             final JPanel parent,
             final Window parentWindow) {
-        super(dialogManager, parentWindow, ModalityType.MODELESS);
+        super(parentWindow, ModalityType.MODELESS);
 
         this.parent = parent;
         this.parentWindow = parentWindow;

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

@@ -25,6 +25,8 @@ package com.dmdirc.addons.ui_swing.components.statusbar;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingRestartDialog;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
+import com.dmdirc.addons.ui_swing.injection.DialogModule.ForUpdates;
+import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.interfaces.ui.StatusBarComponent;
 import com.dmdirc.updater.manager.CachingUpdateManager;
 import com.dmdirc.updater.manager.UpdateManager;
@@ -34,7 +36,6 @@ import com.dmdirc.updater.manager.UpdateManagerStatus;
 import java.awt.event.MouseEvent;
 
 import javax.inject.Inject;
-import javax.inject.Provider;
 import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 
@@ -56,9 +57,9 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
     /** The update manager to use to retrieve information. */
     private final CachingUpdateManager updateManager;
     /** Provider of updater dialogs. */
-    private final Provider<SwingUpdaterDialog> updaterDialogProvider;
+    private final DialogProvider<SwingUpdaterDialog> updaterDialogProvider;
     /** Provider of restart dialogs. */
-    private final Provider<SwingRestartDialog> restartDialogProvider;
+    private final DialogProvider<SwingRestartDialog> restartDialogProvider;
 
     /**
      * Instantiates a new updater label, handles showing updates on the status
@@ -73,8 +74,8 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
     public UpdaterLabel(
             final SwingController controller,
             final CachingUpdateManager updateManager,
-            final Provider<SwingUpdaterDialog> updaterDialogProvider,
-            final Provider<SwingRestartDialog> restartDialogProvider) {
+            final DialogProvider<SwingUpdaterDialog> updaterDialogProvider,
+            @ForUpdates final DialogProvider<SwingRestartDialog> restartDialogProvider) {
         super(new JLabel());
 
         this.controller = controller;
@@ -98,9 +99,9 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
         if (mouseEvent.getButton() == MouseEvent.BUTTON1) {
             if (updateManager.getManagerStatus() == UpdateManagerStatus.IDLE_RESTART_NEEDED) {
                 closeDialog();
-                restartDialogProvider.get().displayOrRequestFocus();
+                restartDialogProvider.displayOrRequestFocus();
             } else {
-                updaterDialogProvider.get().displayOrRequestFocus();
+                updaterDialogProvider.displayOrRequestFocus();
             }
         }
     }
@@ -108,8 +109,7 @@ public class UpdaterLabel extends StatusbarPopupPanel<JLabel> implements
     /** {@inheritDoc} */
     @Override
     protected StatusbarPopupWindow getWindow() {
-        return new UpdaterPopup(controller.getDialogManager(), updateManager,
-                this, controller.getMainFrame());
+        return new UpdaterPopup(updateManager, this, controller.getMainFrame());
     }
 
     /** {@inheritDoc} */

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.components.statusbar;
 
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.manager.CachingUpdateManager;
 import com.dmdirc.updater.manager.UpdateStatus;
@@ -52,17 +51,15 @@ public class UpdaterPopup extends StatusbarPopupWindow {
     /**
      * Creates a new popup window for the specified panel and window.
      *
-     * @param dialogManager The manager to register this popup with.
      * @param updateManager The manager to use to get update information.
      * @param parent The panel that owns this popup
      * @param parentWindow The Window that owns this popup
      */
     public UpdaterPopup(
-            final DialogManager dialogManager,
             final CachingUpdateManager updateManager,
             final JPanel parent,
             final Window parentWindow) {
-        super(dialogManager, parent, parentWindow);
+        super(parent, parentWindow);
 
         this.updateManager = updateManager;
     }

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

@@ -40,16 +40,15 @@ public class ChannelJoinDialog extends StandardInputDialog {
      * Creates a new dialog which prompts a user and then joins the channel
      * they specify.
      *
-     * @param dialogManager Dialog manager
      * @param mainFrame Main frame
      * @param modality Window modality
      * @param title Window title
      * @param message Window message
      */
-    public ChannelJoinDialog(final DialogManager dialogManager, final MainFrame mainFrame,
+    public ChannelJoinDialog(final MainFrame mainFrame,
             final ModalityType modality, final String title,
             final String message) {
-        super(dialogManager, mainFrame, modality, title, message);
+        super(mainFrame, modality, title, message);
 
         this.mainFrame = mainFrame;
     }

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

@@ -39,11 +39,10 @@ public abstract class ConfirmQuitDialog extends StandardQuestionDialog {
     /**
      * Creates a new client quit confirmation dialog.
      *
-     * @param dialogManager Dialog manager
      * @param parentWindow Parent window
      */
-    public ConfirmQuitDialog(final DialogManager dialogManager, final Window parentWindow) {
-        super(dialogManager, parentWindow, ModalityType.APPLICATION_MODAL, "Quit confirm",
+    public ConfirmQuitDialog(final Window parentWindow) {
+        super(parentWindow, ModalityType.APPLICATION_MODAL, "Quit confirm",
                 "You are about to quit DMDirc, are you sure?");
     }
 

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

@@ -1,253 +0,0 @@
-/*
- * 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.dialogs;
-
-import com.dmdirc.ServerManager;
-import com.dmdirc.actions.ActionFactory;
-import com.dmdirc.actions.ActionSubstitutorFactory;
-import com.dmdirc.actions.wrappers.PerformWrapper;
-import com.dmdirc.addons.ui_swing.MainFrame;
-import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
-import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.addons.ui_swing.SwingWindowFactory;
-import com.dmdirc.addons.ui_swing.components.statusbar.SwingStatusBar;
-import com.dmdirc.config.prefs.PreferencesManager;
-import com.dmdirc.interfaces.LifecycleController;
-import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.config.ConfigProvider;
-import com.dmdirc.interfaces.config.IdentityController;
-import com.dmdirc.interfaces.config.IdentityFactory;
-import com.dmdirc.interfaces.ui.StatusBar;
-import com.dmdirc.plugins.ServiceManager;
-import com.dmdirc.ui.IconManager;
-import com.dmdirc.ui.core.util.URLHandler;
-import com.dmdirc.util.SimpleInjector;
-
-import java.awt.Window;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.slf4j.LoggerFactory;
-
-/**
- * Manages the DMDirc dialogs, creates and disposes as required to ensure only
- * the required number exist at any one time.
- */
-public class DialogManager {
-
-    private static final org.slf4j.Logger LOG = LoggerFactory.getLogger(DialogManager.class);
-
-    /** Controller used for standard parameters for dependency injection. */
-    private final SwingController controller;
-    /** Stores all known dialogs in this manager. */
-    private final Map<Class<? extends StandardDialog>, StandardDialog> dialogs;
-
-    /**
-     * Creates a new instance of the dialog manager.
-     *
-     * @param controller Parent Swing controller
-     */
-    public DialogManager(final SwingController controller) {
-        this.controller = controller;
-        dialogs = Collections.synchronizedMap(
-                new HashMap<Class<? extends StandardDialog>, StandardDialog>());
-    }
-
-    /**
-     * Creates, or retrieves, an instance of the specified dialog and displays
-     * this dialog to the user. For more details on what parameters might be
-     * required see {@link DialogManager#getDialog(Class, Object...)}
-     *
-     * @param <T> Dialog type
-     *
-     * @see DialogManager#getDialog(Class, Object...) getDialog
-     *
-     * @param klass The class of the dialog to show
-     * @param params Any non standard parameters required
-     *
-     * @return Dialog instance
-     * @deprecated Use dagger instead.
-     */
-    @Deprecated
-    public <T extends StandardDialog> T showDialog(final Class<T> klass,
-            final Object... params) {
-        final T dialog = getDialog(klass, params);
-        if (dialog.isVisible()) {
-            LOG.trace("Requesting focus for dialog: {}", klass);
-            dialog.requestFocus();
-        } else {
-            LOG.trace("Display new dialog: {}", klass);
-            dialog.display();
-        }
-        return dialog;
-    }
-
-    /**
-     * Creates, or retrieves, an instance of the specified dialog.
-     *
-     * The following parameters will automatically be provided when creating a
-     * dialog, any extra parameters will need to be provided.
-     * <ul>
-     *   <li>SwingController</li>
-     *   <li>IconManager</li>
-     *   <li>IdentityManager</li>
-     *   <li>ConfigManager</li>
-     *   <li>MainFrame</li>
-     *   <li>Window</li>
-     *   <li>SwingStatusBar</li>
-     *   <li>StatusBar</li>
-     *   <li>SwingWindowFactory</li>
-     *   <li>URLHandler</li>
-     *   <li>DialogManager</li>
-     * </ul>
-     *
-     * @param <T> Dialog type
-     *
-     * @param klass The class of the dialog to show
-     * @param params Any non standard parameters required
-     *
-     * @return Dialog instance
-     * @deprecated Use dagger instead.
-     */
-    @Deprecated
-    @SuppressWarnings("unchecked")
-    public <T extends StandardDialog> T getDialog(final Class<T> klass,
-            final Object... params) {
-        final T instance;
-        if (dialogs.containsKey(klass)) {
-            LOG.trace("Getting pre-existing dialog: {}", klass);
-            instance = (T) dialogs.get(klass);
-        } else {
-            LOG.trace("Creating new dialog: {}", klass);
-            final SimpleInjector injector = getInjector(params);
-            instance = injector.createInstance(klass);
-
-            dialogs.put(instance.getClass(), instance);
-        }
-        return instance;
-    }
-
-    /**
-     * Creates and initialises the a dependency injector that can be used to
-     * create a dialog.
-     *
-     * The following parameters will automatically be provided when creating a
-     * dialog, any extra parameters will need to be provided.
-     * <ul>
-     *   <li>SwingController</li>
-     *   <li>IconManager</li>
-     *   <li>IdentityManager</li>
-     *   <li>ConfigManager</li>
-     *   <li>MainFrame</li>
-     *   <li>Window</li>
-     *   <li>SwingStatusBar</li>
-     *   <li>StatusBar</li>
-     *   <li>SwingWindowFactory</li>
-     *   <li>URLHandler</li>
-     *   <li>DialogManager</li>
-     * </ul>
-     *
-     * @param params Extra parameters to inject.
-     *
-     * @return Injector with parameters added
-     */
-    private SimpleInjector getInjector(final Object... params) {
-        final SimpleInjector injector = new SimpleInjector();
-
-        injector.addParameter(SwingController.class, controller);
-        injector.addParameter(IconManager.class, controller.getIconManager());
-        injector.addParameter(IdentityController.class, controller.getIdentityManager());
-        injector.addParameter(ConfigProvider.class, controller.getGlobalIdentity());
-        injector.addParameter(AggregateConfigProvider.class, controller.getGlobalConfig());
-        injector.addParameter(MainFrame.class, controller.getMainFrame());
-        injector.addParameter(LifecycleController.class, controller.getLifecycleController());
-        injector.addParameter(ActionSubstitutorFactory.class, controller.getActionSubstitutorFactory());
-        injector.addParameter(Window.class, controller.getMainFrame());
-        injector.addParameter(SwingStatusBar.class, controller.getSwingStatusBar());
-        injector.addParameter(StatusBar.class, controller.getSwingStatusBar());
-        injector.addParameter(SwingWindowFactory.class, controller.getWindowFactory());
-        injector.addParameter(URLHandler.class, controller.getUrlHandler());
-        injector.addParameter(DialogManager.class, this);
-        injector.addParameter(PerformWrapper.class, controller.getPerformWrapper());
-        injector.addParameter(ServerManager.class, controller.getServerManager());
-        injector.addParameter(PrefsComponentFactory.class, controller.getPrefsComponentFactory());
-        injector.addParameter(ActionFactory.class, controller.getActionFactory());
-        injector.addParameter(IdentityFactory.class, controller.getIdentityFactory());
-        injector.addParameter(ServiceManager.class, controller.getPluginManager());
-        injector.addParameter(PreferencesManager.class, PreferencesManager.getPreferencesManager());
-
-        for (final Object param : params) {
-            injector.addParameter(param);
-        }
-
-        return injector;
-    }
-
-    /**
-     * Closes the previously created instance of a dialog.
-     *
-     * @param klass The class of the dialog to show
-     * @deprecated Use dagger instead.
-     */
-    @Deprecated
-    public void close(final Class<? extends StandardDialog> klass) {
-        final StandardDialog dialog = dispose(klass);
-        if (dialog != null) {
-            dialog.dispose();
-        }
-    }
-
-    /**
-     * Removes a previously created instance of a dialog from the dialog
-     * manager.
-     *
-     * @param klass The class of the dialog to show
-     *
-     * @return Instance of the dialog that has been removed or null if there
-     * was no dialog created
-     */
-    public StandardDialog dispose(final Class<? extends StandardDialog> klass) {
-        if (dialogs.containsKey(klass)) {
-            return dialogs.remove(klass);
-        }
-        return null;
-    }
-
-    /**
-     * Removes a previously created instance of a dialog from the dialog
-     * manager.
-     *
-     * @param dialog Dialog to dispose of
-     *
-     * @return Instance of the dialog that has been removed or null if there was no dialog created
-     */
-    public StandardDialog dispose(final StandardDialog dialog) {
-        if (dialogs.containsKey(dialog.getClass())) {
-            LOG.trace("Disposing of known dialog: {}", dialog);
-            return dispose(dialog.getClass());
-        }
-        LOG.trace("Unknown dialog, not disposing: {}", dialog);
-        return null;
-    }
-}

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

@@ -22,8 +22,10 @@
 
 package com.dmdirc.addons.ui_swing.dialogs;
 
+import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.Server;
 import com.dmdirc.ServerManager;
+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.SendWorker;
@@ -33,10 +35,10 @@ import com.dmdirc.interfaces.config.IdentityController;
 import com.dmdirc.ui.core.util.Info;
 
 import java.awt.Insets;
-import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
+import javax.inject.Inject;
 import javax.swing.BorderFactory;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -78,17 +80,18 @@ public class FeedbackDialog extends StandardDialog implements ActionListener, Do
     /**
      * Instantiates the feedback dialog.
      *
-     * @param dialogManager Dialog manager
      * @param parentWindow Parent window
      * @param identityController Identity controller (needs to be a config directory)
      * @param serverManager Server manager
      * @param config Config
      */
-    public FeedbackDialog(final DialogManager dialogManager, final Window parentWindow,
+    @Inject
+    public FeedbackDialog(
+            final MainFrame parentWindow,
             final IdentityController identityController,
             final ServerManager serverManager,
-            final AggregateConfigProvider config) {
-        super(dialogManager, parentWindow, ModalityType.MODELESS);
+            @GlobalConfig final AggregateConfigProvider config) {
+        super(parentWindow, ModalityType.MODELESS);
 
         this.serverManager = serverManager;
         this.config = config;

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

@@ -105,7 +105,6 @@ public class NewServerDialog extends StandardDialog implements
     /**
      * Creates a new instance of the dialog.
      *
-     * @param dialogManager Dialog manager
      * @param mainFrame Main frame
      * @param config Config
      * @param iconManager Icon manager
@@ -115,14 +114,13 @@ public class NewServerDialog extends StandardDialog implements
      */
     @Inject
     public NewServerDialog(
-            final DialogManager dialogManager,
             final MainFrame mainFrame,
             @GlobalConfig final AggregateConfigProvider config,
             @GlobalConfig final IconManager iconManager,
             final IdentityController identityController,
             final ServerManager serverManager,
             final DialogProvider<ProfileManagerDialog> profileDialogProvider) {
-        super(dialogManager, mainFrame, ModalityType.MODELESS);
+        super(mainFrame, ModalityType.MODELESS);
         this.identityController = identityController;
         this.serverManager = serverManager;
         this.mainFrame = mainFrame;

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

@@ -39,13 +39,10 @@ import javax.swing.SwingUtilities;
 /**
  * Provides common methods for dialogs.
  */
-@SuppressWarnings("unused")
 public class StandardDialog extends JDialog {
 
     /** Serial version UID. */
     private static final long serialVersionUID = 1;
-    /** Dialog manager. */
-    private final DialogManager dialogManager;
     /** Parent window. */
     private final Window owner;
     /** The OK button for this frame. */
@@ -56,27 +53,22 @@ public class StandardDialog extends JDialog {
     /**
      * Creates a new instance of StandardDialog.
      *
-     * @param dialogManager Dialog Manager used for disposal
      * @param owner The frame that owns this dialog
      * @param modal Whether to display modally or not
      */
-    public StandardDialog(final DialogManager dialogManager,
-            final Frame owner, final boolean modal) {
-        this(dialogManager, owner, modal ? ModalityType.APPLICATION_MODAL : ModalityType.MODELESS);
+    public StandardDialog(final Frame owner, final boolean modal) {
+        this(owner, modal ? ModalityType.APPLICATION_MODAL : ModalityType.MODELESS);
     }
 
     /**
      * Creates a new instance of StandardDialog.
      *
-     * @param dialogManager Dialog Manager used for disposal
      * @param owner The frame that owns this dialog
      * @param modal Whether to display modally or not
      */
-    public StandardDialog(final DialogManager dialogManager,
-            final Window owner, final ModalityType modal) {
+    public StandardDialog(final Window owner, final ModalityType modal) {
         super(owner, modal);
         this.owner = owner;
-        this.dialogManager = dialogManager;
 
         if (owner != null) {
             setIconImages(owner.getIconImages());
@@ -91,15 +83,6 @@ public class StandardDialog extends JDialog {
         super.setTitle("DMDirc: " + title);
     }
 
-    /** {@inheritDoc} */
-    @Override
-    public void dispose() {
-        if (dialogManager != null) {
-            dialogManager.dispose(this);
-        }
-        super.dispose();
-    }
-
     /**
      * Displays the dialog centering on the parent window.
      */

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

@@ -64,16 +64,15 @@ public abstract class StandardInputDialog extends StandardDialog {
     /**
      * Instantiates a new standard input dialog.
      *
-     * @param dialogManager Dialog manager
      * @param owner Dialog owner
      * @param modal modality type
      * @param title Dialog title
      * @param message Dialog message
      */
-    public StandardInputDialog(final DialogManager dialogManager,
+    public StandardInputDialog(
             final Window owner, final ModalityType modal,
             final String title, final String message) {
-        this(dialogManager, owner, modal, title, message, new Validator<String>() {
+        this(owner, modal, title, message, new Validator<String>() {
 
             /** {@inheritDoc} */
             @Override
@@ -86,18 +85,17 @@ public abstract class StandardInputDialog extends StandardDialog {
     /**
      * Instantiates a new standard input dialog.
      *
-     * @param dialogManager Dialog manager
      * @param owner Dialog owner
      * @param modal modality type
      * @param validator Textfield validator
      * @param title Dialog title
      * @param message Dialog message
      */
-    public StandardInputDialog(final DialogManager dialogManager,
+    public StandardInputDialog(
             final Window owner, final ModalityType modal,
             final String title, final String message,
             final Validator<String> validator) {
-        super(dialogManager, owner, modal);
+        super(owner, modal);
 
         this.validator = validator;
         this.message = message;

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

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.dialogs;
 
-import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
 
 import java.awt.Window;
@@ -50,16 +49,15 @@ public class StandardMessageDialog extends StandardDialog {
     /**
      * Instantiates a new standard input dialog.
      *
-     * @param controller Swing controller
      * @param owner Dialog owner
      * @param modal modality type
      * @param title Dialog title
      * @param message Dialog message
      */
-    public StandardMessageDialog(final SwingController controller,
+    public StandardMessageDialog(
             final Window owner, final ModalityType modal, final String title,
             final String message) {
-        super(controller.getDialogManager(), owner, modal);
+        super(owner, modal);
 
         this.message = message;
 

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

@@ -51,16 +51,15 @@ public abstract class StandardQuestionDialog extends StandardDialog {
     /**
      * Instantiates a new standard input dialog.
      *
-     * @param dialogManager Dialog manager
      * @param owner Dialog owner
      * @param modal modality type
      * @param title Dialog title
      * @param message Dialog message
      */
-    public StandardQuestionDialog(final DialogManager dialogManager,
+    public StandardQuestionDialog(
             final Window owner, final ModalityType modal, final String title,
             final String message) {
-        super(dialogManager, owner, modal);
+        super(owner, modal);
 
         this.message = message;
 

src/com/dmdirc/addons/ui_swing/dialogs/about/AboutDialog.java

@@ -22,14 +22,14 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.about;
 
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 
-import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
+import javax.inject.Inject;
 import javax.swing.JButton;
 import javax.swing.JTabbedPane;
 import javax.swing.WindowConstants;
@@ -51,16 +51,18 @@ public class AboutDialog extends StandardDialog implements ActionListener, Chang
     private CreditsPanel cp;
     /** Tab history. */
     private int history = 0;
+
     /**
      * Creates a new instance of AboutDialog.
      *
      * @param controller Swing controller
-     * @param dialogManager Dialog manager
      * @param parentWindow Parent window
      */
-    public AboutDialog(final DialogManager dialogManager, final Window parentWindow,
+    @Inject
+    public AboutDialog(
+            final MainFrame parentWindow,
             final SwingController controller) {
-        super(dialogManager, parentWindow, ModalityType.MODELESS);
+        super(parentWindow, ModalityType.MODELESS);
 
         initComponents(controller);
     }

src/com/dmdirc/addons/ui_swing/dialogs/actioneditor/ActionEditorDialog.java

@@ -22,17 +22,19 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.actioneditor;
 
+import com.dmdirc.ClientModule.GlobalConfig;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionFactory;
 import com.dmdirc.actions.ActionStatus;
 import com.dmdirc.actions.ActionSubstitutorFactory;
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+import com.dmdirc.addons.ui_swing.dialogs.actionsmanager.ActionsManagerDialog;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.IconManager;
+import com.dmdirc.util.annotations.factory.Factory;
+import com.dmdirc.util.annotations.factory.Unbound;
 
 import java.awt.Dimension;
-import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.beans.PropertyChangeEvent;
@@ -41,7 +43,6 @@ import java.beans.PropertyChangeListener;
 import javax.swing.JButton;
 import javax.swing.SwingUtilities;
 
-
 import net.miginfocom.swing.MigLayout;
 
 import org.slf4j.LoggerFactory;
@@ -49,6 +50,7 @@ import org.slf4j.LoggerFactory;
 /**
  * Action editor dialog.
  */
+@Factory(inject=true, singleton=true)
 public class ActionEditorDialog extends StandardDialog implements ActionListener,
         PropertyChangeListener {
 
@@ -88,7 +90,6 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
     /**
      * Instantiates the panel.
      *
-     * @param dialogManager Dialog manager
      * @param iconManager Icon manager
      * @param config Config
      * @param subsFactory Actions substitution factory
@@ -96,10 +97,14 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
      * @param parentWindow Parent window
      * @param group Action's group
      */
-    public ActionEditorDialog(final DialogManager dialogManager, final IconManager iconManager,
-            final AggregateConfigProvider config, final ActionSubstitutorFactory subsFactory,
-            final ActionFactory actionFactory, final Window parentWindow, final String group) {
-        super(dialogManager, parentWindow, ModalityType.DOCUMENT_MODAL);
+    public ActionEditorDialog(
+            @SuppressWarnings("qualifiers") @GlobalConfig final IconManager iconManager,
+            @SuppressWarnings("qualifiers") @GlobalConfig final AggregateConfigProvider config,
+            final ActionSubstitutorFactory subsFactory,
+            final ActionFactory actionFactory,
+            @Unbound final ActionsManagerDialog parentWindow,
+            @Unbound final String group) {
+        super(parentWindow, ModalityType.DOCUMENT_MODAL);
         LOG.debug("loading with group: " + group);
         setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
         setTitle("Action Editor");
@@ -119,7 +124,6 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
     /**
      * Instantiates the panel.
      *
-     * @param dialogManager Dialog manager
      * @param iconManager Icon manager
      * @param config Config
      * @param subsFactory Actions substitution factory
@@ -127,10 +131,14 @@ public class ActionEditorDialog extends StandardDialog implements ActionListener
      * @param parentWindow Parent window
      * @param action Action to be edited
      */
-    public ActionEditorDialog(final DialogManager dialogManager, final IconManager iconManager,
-            final AggregateConfigProvider config, final ActionSubstitutorFactory subsFactory,
-            final ActionFactory actionFactory, final Window parentWindow, final Action action) {
-        super(dialogManager, parentWindow, ModalityType.DOCUMENT_MODAL);
+    public ActionEditorDialog(
+            @SuppressWarnings("qualifiers") @GlobalConfig final IconManager iconManager,
+            @SuppressWarnings("qualifiers") @GlobalConfig final AggregateConfigProvider config,
+            final ActionSubstitutorFactory subsFactory,
+            final ActionFactory actionFactory,
+            @Unbound final ActionsManagerDialog parentWindow,
+            @Unbound final Action action) {
+        super(parentWindow, ModalityType.DOCUMENT_MODAL);
         LOG.debug("loading with action: " + action);
         setDefaultCloseOperation(DO_NOTHING_ON_CLOSE);
         setTitle("Action Editor");

src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsGroupPanel.java

@@ -28,13 +28,13 @@ import com.dmdirc.actions.ActionTypeComparator;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.addons.ui_swing.components.renderers.ActionTypeTableCellRenderer;
 import com.dmdirc.addons.ui_swing.components.renderers.ArrayCellRenderer;
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StringArrayComparator;
-import com.dmdirc.addons.ui_swing.dialogs.actioneditor.ActionEditorDialog;
+import com.dmdirc.addons.ui_swing.dialogs.actioneditor.ActionEditorDialogFactory;
+import com.dmdirc.util.annotations.factory.Factory;
+import com.dmdirc.util.annotations.factory.Unbound;
 
 import java.awt.Dialog.ModalityType;
-import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
@@ -57,6 +57,7 @@ import net.miginfocom.swing.MigLayout;
  * of the actions manager dialog. It shows the user all actions belonging to
  * a particular group.
  */
+@Factory(inject=true, singleton=true)
 public class ActionsGroupPanel extends JPanel implements ActionListener,
         ListSelectionListener {
 
@@ -66,10 +67,10 @@ public class ActionsGroupPanel extends JPanel implements ActionListener,
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    /** Dialog Manager */
-    private final DialogManager dialogManager;
+    /** Factory to use to create editor dialogs. */
+    private final ActionEditorDialogFactory editorDialogFactory;
     /** Parent dialog. */
-    private final Window parent;
+    private final ActionsManagerDialog parent;
     /** Table scrollpane. */
     private JScrollPane scrollPane;
     /** Actions table. */
@@ -88,15 +89,17 @@ public class ActionsGroupPanel extends JPanel implements ActionListener,
     /**
      * Creates a new instance of ActionsManagerDialog.
      *
-     * @param dialogManager Dialog Manager
+     * @param editorDialogFactory Factory to use to create editor dialogs.
      * @param parent Parent window
      * @param group Action group to display
      */
-    public ActionsGroupPanel(final DialogManager dialogManager,
-            final Window parent, final ActionGroup group) {
+    public ActionsGroupPanel(
+            final ActionEditorDialogFactory editorDialogFactory,
+            @Unbound final ActionsManagerDialog parent,
+            @Unbound final ActionGroup group) {
         super();
 
-        this.dialogManager = dialogManager;
+        this.editorDialogFactory = editorDialogFactory;
         this.parent = parent;
         this.group = group;
 
@@ -245,19 +248,17 @@ public class ActionsGroupPanel extends JPanel implements ActionListener,
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == add) {
-            dialogManager.showDialog(ActionEditorDialog.class, this, parent,
-                    group.getName());
+            editorDialogFactory.getActionEditorDialog(parent, group.getName()).display();
         } else if (e.getSource() == edit) {
-            dialogManager.showDialog(ActionEditorDialog.class, this, parent,
-                    model.getAction(
-                    table.getRowSorter().convertRowIndexToModel(table.
-                    getSelectedRow())));
+            editorDialogFactory.getActionEditorDialog(parent,
+                    model.getAction(table.getRowSorter().convertRowIndexToModel(
+                            table.getSelectedRow()))).display();
         } else if (e.getSource() == delete) {
             final Action action =
                     model.getAction(
                     table.getRowSorter().convertRowIndexToModel(table.
                     getSelectedRow()));
-            new StandardQuestionDialog(dialogManager, parent,
+            new StandardQuestionDialog(parent,
                     ModalityType.APPLICATION_MODAL, "Confirm deletion",
                     "Are you sure you wish to delete the action '" + action.
                     getName() + "'?") {

src/com/dmdirc/addons/ui_swing/dialogs/actionsmanager/ActionsManagerDialog.java

@@ -36,7 +36,6 @@ import com.dmdirc.addons.ui_swing.components.SortedListModel;
 import com.dmdirc.addons.ui_swing.components.frames.AppleJFrame;
 import com.dmdirc.addons.ui_swing.components.renderers.ActionGroupListCellRenderer;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardInputDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
@@ -78,8 +77,6 @@ public class ActionsManagerDialog extends StandardDialog implements
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    /** Dialog manager. */
-    private final DialogManager dialogManager;
     /** Config instance. */
     private final ConfigProvider config;
     /** Preferences setting component factory. */
@@ -108,29 +105,31 @@ public class ActionsManagerDialog extends StandardDialog implements
     private ActionGroupSettingsPanel activeSettings;
     /** Group panel. */
     private JPanel groupPanel;
+    /** Factory to use to create group panels. */
+    private final ActionsGroupPanelFactory groupPanelFactory;
 
     /**
      * Creates a new instance of ActionsManagerDialog.
      *
      * @param parentWindow Parent window
      * @param controller Parent controller
-     * @param dialogManager Dialog manager
      * @param config Config to save dialog state to
      * @param compFactory Prefs setting component factory
+     * @param groupPanelFactory Factory to use to create group panels.
      */
     @Inject
     public ActionsManagerDialog(
             final MainFrame parentWindow,
             final SwingController controller,
-            final DialogManager dialogManager,
             @UserConfig final ConfigProvider config,
-            final PrefsComponentFactory compFactory) {
-        super(dialogManager, Apple.isAppleUI()
+            final PrefsComponentFactory compFactory,
+            final ActionsGroupPanelFactory groupPanelFactory) {
+        super(Apple.isAppleUI()
                 ? new AppleJFrame(parentWindow, controller)
                 : parentWindow, ModalityType.MODELESS);
-        this.dialogManager = dialogManager;
         this.config = config;
         this.compFactory = compFactory;
+        this.groupPanelFactory = groupPanelFactory;
 
         initComponents();
         validator = new ValidatorChain<>(
@@ -155,7 +154,7 @@ public class ActionsManagerDialog extends StandardDialog implements
                 + " there for you to organise groups, add or remove them"
                 + " to suit your needs.");
         groups = new JList(new SortedListModel<>(new ActionGroupNameComparator()));
-        actions = new ActionsGroupPanel(dialogManager, this, null);
+        actions = groupPanelFactory.getActionsGroupPanel(this, null);
         info = new ActionGroupInformationPanel(null);
         settings = new HashMap<>();
         activeSettings = new ActionGroupSettingsPanel(compFactory, null, this);
@@ -312,7 +311,7 @@ public class ActionsManagerDialog extends StandardDialog implements
     private void addGroup() {
         final int index = groups.getSelectedIndex();
         groups.getSelectionModel().clearSelection();
-        new StandardInputDialog(dialogManager, this,
+        new StandardInputDialog(this,
                 ModalityType.DOCUMENT_MODAL, "New action group",
                 "Please enter the name of the new action group", validator) {
 
@@ -353,7 +352,7 @@ public class ActionsManagerDialog extends StandardDialog implements
         final String oldName =
                 ((ActionGroup) groups.getSelectedValue()).getName();
         final StandardInputDialog inputDialog = new StandardInputDialog(
-                dialogManager, this, ModalityType.DOCUMENT_MODAL,
+                this, ModalityType.DOCUMENT_MODAL,
                 "Edit action group",
                 "Please enter the new name of the action group", validator) {
 
@@ -392,7 +391,7 @@ public class ActionsManagerDialog extends StandardDialog implements
     private void delGroup() {
         final String group =
                 ((ActionGroup) groups.getSelectedValue()).getName();
-        new StandardQuestionDialog(dialogManager, this,
+        new StandardQuestionDialog(this,
                 ModalityType.APPLICATION_MODAL,
                 "Confirm deletion",
                 "Are you sure you wish to delete the '" + group

src/com/dmdirc/addons/ui_swing/dialogs/aliases/AliasManagerDialog.java

@@ -30,11 +30,11 @@ import com.dmdirc.actions.ActionSubstitutorFactory;
 import com.dmdirc.actions.CoreActionComparison;
 import com.dmdirc.actions.wrappers.Alias;
 import com.dmdirc.actions.wrappers.AliasWrapper;
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.addons.ui_swing.components.renderers.ActionConditionCellRenderer;
 import com.dmdirc.addons.ui_swing.components.renderers.ArrayCellRenderer;
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StringArrayComparator;
@@ -47,6 +47,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
+import javax.inject.Inject;
 import javax.swing.JButton;
 import javax.swing.JScrollPane;
 import javax.swing.JSplitPane;
@@ -76,8 +77,6 @@ public class AliasManagerDialog extends StandardDialog implements ActionListener
     private final SwingController controller;
     /** Actions substitutor factory. */
     private final ActionSubstitutorFactory substitutorFactory;
-    /** Dialog manager. */
-    private final DialogManager dialogManager;
     /** Table scrollpane. */
     private JScrollPane scrollPane;
     /** Error table. */
@@ -102,16 +101,15 @@ public class AliasManagerDialog extends StandardDialog implements ActionListener
      *
      * @param controller Swing controller
      * @param parentWindow Parent window
-     * @param dialogManager Dialog manager
      * @param substitutorFactory Actions substitution factory
      */
-    public AliasManagerDialog(final SwingController controller, final Window parentWindow,
-            final DialogManager dialogManager, final ActionSubstitutorFactory substitutorFactory) {
-        super(dialogManager, parentWindow, ModalityType.MODELESS);
+    @Inject
+    public AliasManagerDialog(final SwingController controller, final MainFrame parentWindow,
+            final ActionSubstitutorFactory substitutorFactory) {
+        super(parentWindow, ModalityType.MODELESS);
 
         this.controller = controller;
         this.substitutorFactory = substitutorFactory;
-        this.dialogManager = dialogManager;
         this.aliasWrapper = controller.getAliasWrapper();
         this.actionFactory = controller.getActionFactory();
 
@@ -297,7 +295,7 @@ public class AliasManagerDialog extends StandardDialog implements ActionListener
             }
             if (checkForDuplicates()) {
                 final StandardQuestionDialog dialog = new StandardQuestionDialog(
-                        dialogManager, this, ModalityType.APPLICATION_MODAL,
+                        this, ModalityType.APPLICATION_MODAL,
                         "Duplicate Aliases", "There are duplicate aliases in "
                         + "the table, these need to be removed before saving") {
 

src/com/dmdirc/addons/ui_swing/dialogs/channellist/ChannelListDialog.java

@@ -47,7 +47,7 @@ public class ChannelListDialog extends StandardDialog implements
     private JLabel total;
 
     public ChannelListDialog(final SwingController controller) {
-        super(controller.getDialogManager(), controller.getMainFrame(), ModalityType.MODELESS);
+        super(controller.getMainFrame(), ModalityType.MODELESS);
         setTitle("Channel List");
         total = new JLabel("No results.");
         list = new ChannelListPanel((Server) controller.getMainFrame().getActiveFrame()

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelListModesPane.java

@@ -277,7 +277,7 @@ public final class ChannelListModesPane extends JPanel implements ActionListener
             modeText = channel.getConfigManager().
                     getOption("server", "mode" + listModesArray[selectedIndex]);
         }
-        new StandardInputDialog(controller.getDialogManager(), parentWindow,
+        new StandardInputDialog(parentWindow,
                 ModalityType.DOCUMENT_MODAL, "Add new " + modeText,
                 "Please enter the hostmask for the new " + modeText,
                 new NotEmptyValidator()) {

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/ChannelSettingsDialog.java

@@ -23,13 +23,13 @@
 package com.dmdirc.addons.ui_swing.dialogs.channelsetting;
 
 import com.dmdirc.Channel;
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 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.expandingsettings.SettingsPanel;
 import com.dmdirc.addons.ui_swing.components.modes.ChannelModesPane;
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.config.prefs.PreferencesManager;
 import com.dmdirc.interfaces.config.ConfigProvider;
@@ -38,7 +38,6 @@ import com.dmdirc.interfaces.ui.InputWindow;
 import com.dmdirc.plugins.ServiceManager;
 import com.dmdirc.ui.IconManager;
 
-import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -87,7 +86,6 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
      * Creates a new instance of ChannelSettingsDialog.
      *
      * @param controller Swing controller
-     * @param dialogManager Dialog manager
      * @param identityFactory Identity factory
      * @param windowFactory Swing window factory
      * @param iconManager Icon manager
@@ -97,16 +95,17 @@ public class ChannelSettingsDialog extends StandardDialog implements ActionListe
      * @param newChannel The channel object that we're editing settings for
      * @param parentWindow Parent window
      */
-    public ChannelSettingsDialog(final SwingController controller,
-            final DialogManager dialogManager,
+    public ChannelSettingsDialog(
+            final SwingController controller,
             final IdentityFactory identityFactory,
             final SwingWindowFactory windowFactory,
             final IconManager iconManager,
             final ServiceManager serviceManager,
             final PreferencesManager preferencesManager,
             final PrefsComponentFactory compFactory,
-            final Channel newChannel, final Window parentWindow) {
-        super(dialogManager, parentWindow, ModalityType.MODELESS);
+            final Channel newChannel,
+            final MainFrame parentWindow) {
+        super(parentWindow, ModalityType.MODELESS);
 
         this.controller = controller;
         this.iconManager = iconManager;

src/com/dmdirc/addons/ui_swing/dialogs/error/ErrorListDialog.java

@@ -79,7 +79,7 @@ public final class ErrorListDialog extends StandardDialog implements
      * @param controller Swing controller
      */
     public ErrorListDialog(final SwingController controller) {
-        super(controller.getDialogManager(), controller.getMainFrame(), ModalityType.MODELESS);
+        super(controller.getMainFrame(), ModalityType.MODELESS);
 
         setTitle("Error list");
         setMinimumSize(new Dimension(600, 550));

src/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialog.java

@@ -81,7 +81,7 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
     public PasteDialog(final SwingController controller,
             final InputTextFrame newParent, final String text,
             final Window parentWindow) {
-        super(controller.getDialogManager(), parentWindow, ModalityType.MODELESS);
+        super(parentWindow, ModalityType.MODELESS);
 
         parent = newParent;
         this.parentWindow = parentWindow;

src/com/dmdirc/addons/ui_swing/dialogs/prefs/SwingPreferencesDialog.java

@@ -30,6 +30,8 @@ import com.dmdirc.addons.ui_swing.components.addonpanel.PluginPanel;
 import com.dmdirc.addons.ui_swing.components.addonpanel.ThemePanel;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.dialogs.updater.SwingRestartDialog;
+import com.dmdirc.addons.ui_swing.injection.DialogModule.ForSettings;
+import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.config.prefs.PreferencesCategory;
 import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.logger.ErrorLevel;
@@ -41,6 +43,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
+import javax.inject.Inject;
 import javax.swing.BorderFactory;
 import javax.swing.DefaultListModel;
 import javax.swing.JButton;
@@ -70,22 +73,29 @@ public final class SwingPreferencesDialog extends StandardDialog implements
     /** Preferences Manager. */
     private PreferencesDialogModel manager;
     /** Manager loading swing worker. */
-    private LoggingSwingWorker<PreferencesDialogModel, Void> worker;
+    private final LoggingSwingWorker<PreferencesDialogModel, Void> worker;
     /** Panel size. */
     private int panelSize = 500;
     /** Swing controller. */
     @Deprecated
     private final SwingController controller;
+    /** The provider to use for restart dialogs. */
+    private final DialogProvider<SwingRestartDialog> restartDialogProvider;
 
     /**
      * Creates a new instance of SwingPreferencesDialog.
      *
      * @param controller The controller which owns this preferences window.
+     * @param restartDialogProvider The provider to use for restart dialogs.
      */
-    public SwingPreferencesDialog(final SwingController controller) {
-        super(controller.getDialogManager(), controller.getMainFrame(), ModalityType.MODELESS);
+    @Inject
+    public SwingPreferencesDialog(
+            final SwingController controller,
+            @ForSettings final DialogProvider<SwingRestartDialog> restartDialogProvider) {
+        super(controller.getMainFrame(), ModalityType.MODELESS);
 
         this.controller = controller;
+        this.restartDialogProvider = restartDialogProvider;
 
         initComponents();
 
@@ -98,8 +108,10 @@ public final class SwingPreferencesDialog extends StandardDialog implements
                 PreferencesDialogModel prefsManager = null;
                 try {
                     prefsManager = new PreferencesDialogModel(
-                            new PluginPanel(controller.getMainFrame(), controller),
-                            new ThemePanel(controller.getMainFrame(), controller, controller.getThemeManager()),
+                            new PluginPanel(controller.getMainFrame(), controller,
+                                    SwingPreferencesDialog.this),
+                            new ThemePanel(controller.getMainFrame(), controller,
+                                    controller.getThemeManager(), SwingPreferencesDialog.this),
                             new UpdateConfigPanel(controller),
                             new URLConfigPanel(controller, controller.getMainFrame()),
                             controller.getGlobalConfig(),
@@ -312,8 +324,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
     public void saveOptions() {
         if (manager != null && manager.save()) {
             dispose();
-            controller.showDialog(SwingRestartDialog.class,
-                    ModalityType.APPLICATION_MODAL, "apply settings");
+            restartDialogProvider.displayOrRequestFocus();
         }
     }
 

src/com/dmdirc/addons/ui_swing/dialogs/prefs/URLConfigPanel.java

@@ -262,7 +262,7 @@ public class URLConfigPanel extends JPanel implements
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == add) {
-            new StandardInputDialog(controller.getDialogManager(), parentWindow,
+            new StandardInputDialog(parentWindow,
                     ModalityType.MODELESS, "New URL handler",
                     "Please enter the name of the new protocol.",
                     new URLProtocolValidator(controller.getGlobalConfig())) {

src/com/dmdirc/addons/ui_swing/dialogs/profiles/ProfileManagerDialog.java

@@ -128,7 +128,7 @@ public class ProfileManagerDialog extends StandardDialog {
      */
     @Inject
     public ProfileManagerDialog(final SwingController controller) {
-        super(controller.getDialogManager(), controller.getMainFrame(), ModalityType.MODELESS);
+        super(controller.getMainFrame(), ModalityType.MODELESS);
         this.model = new ProfileManagerModel(controller.getIdentityManager(), controller.getIdentityFactory());
         this.controller = new ProfileManagerController(this, model, controller.getIdentityFactory());
         final Bindings bindings = SwingUIBindings.extendedBindings();

src/com/dmdirc/addons/ui_swing/dialogs/serversetting/IgnoreListPanel.java

@@ -178,7 +178,7 @@ public final class IgnoreListPanel extends JPanel implements ActionListener,
     @Override
     public void actionPerformed(final ActionEvent e) {
         if (e.getSource() == addButton) {
-            new StandardInputDialog(controller.getDialogManager(), parentWindow,
+            new StandardInputDialog(parentWindow,
                     ModalityType.MODELESS, "New ignore list entry",
                     "Please enter the new ignore list entry",
                     viewToggle.isSelected() ? new ValidatorChain<>(
@@ -214,7 +214,7 @@ public final class IgnoreListPanel extends JPanel implements ActionListener,
             }.display();
         } else if (e.getSource() == delButton && list.getSelectedIndex()
                 != -1) {
-            new StandardQuestionDialog(controller.getDialogManager(), parentWindow,
+            new StandardQuestionDialog(parentWindow,
                     ModalityType.APPLICATION_MODAL,
                     "Confirm deletion",
                     "Are you sure you want to delete this item?") {

src/com/dmdirc/addons/ui_swing/dialogs/serversetting/ServerSettingsDialog.java

@@ -25,12 +25,12 @@ package com.dmdirc.addons.ui_swing.dialogs.serversetting;
 import com.dmdirc.Server;
 import com.dmdirc.ServerState;
 import com.dmdirc.actions.wrappers.PerformWrapper;
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.expandingsettings.SettingsPanel;
 import com.dmdirc.addons.ui_swing.components.modes.UserModesPane;
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.addons.ui_swing.dialogs.StandardQuestionDialog;
 import com.dmdirc.config.prefs.PreferencesManager;
@@ -38,7 +38,6 @@ import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.ui.IconManager;
 
-import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
@@ -55,8 +54,6 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
 
     /** Serial version UID. */
     private static final long serialVersionUID = 2;
-    /** Dialog Manager. */
-    private final DialogManager dialogManager;
     /** Parent server. */
     private final Server server;
     /** Perform wrapper for the perform panel. */
@@ -76,7 +73,6 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
      * Creates a new instance of ServerSettingsDialog.
      *
      * @param controller Swing controller
-     * @param dialogManager Dialog manager
      * @param iconManager Icon manager
      * @param compFactory Preferences setting component factory
      * @param performWrapper Wrapper for the perform tab.
@@ -85,15 +81,12 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
      */
     public ServerSettingsDialog(
             final SwingController controller,
-            final DialogManager dialogManager,
             final IconManager iconManager,
             final PrefsComponentFactory compFactory,
             final PerformWrapper performWrapper,
             final Server server,
-            final Window parentWindow) {
-        super(dialogManager, parentWindow, ModalityType.MODELESS);
-
-        this.dialogManager = dialogManager;
+            final MainFrame parentWindow) {
+        super(parentWindow, ModalityType.MODELESS);
         this.server = server;
         this.performWrapper = performWrapper;
 
@@ -169,7 +162,7 @@ public class ServerSettingsDialog extends StandardDialog implements ActionListen
     /** Saves the settings from this dialog. */
     public void saveSettings() {
         if (server.getState() != ServerState.CONNECTED) {
-            new StandardQuestionDialog(dialogManager, getOwner(),
+            new StandardQuestionDialog(getOwner(),
                     ModalityType.MODELESS,
                     "Server has been disconnected.", "Any changes you have " +
                     "made will be lost, are you sure you want to close this " +

src/com/dmdirc/addons/ui_swing/dialogs/sslcertificate/SSLCertificateDialog.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.ui_swing.dialogs.sslcertificate;
 
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
@@ -67,14 +66,13 @@ public class SSLCertificateDialog extends StandardDialog implements ActionListen
     /**
      * Creates a new instance of ActionsManagerDialog.
      *
-     * @param dialogManager Dialog manager
      * @param iconManager Icon manager
      * @param parent Parent window for the dialog
      * @param model dialog model
      */
-    public SSLCertificateDialog(final DialogManager dialogManager, final IconManager iconManager,
+    public SSLCertificateDialog(final IconManager iconManager,
             final Window parent, final SSLCertificateDialogModel model) {
-        super(dialogManager, parent, ModalityType.MODELESS);
+        super(parent, ModalityType.MODELESS);
 
         this.model = model;
         this.iconManager = iconManager;

src/com/dmdirc/addons/ui_swing/dialogs/updater/SwingRestartDialog.java

@@ -22,9 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.updater;
 
-import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.updater.components.LauncherComponent;
@@ -34,7 +32,6 @@ import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
-import javax.inject.Inject;
 import javax.swing.JButton;
 
 import net.miginfocom.swing.MigLayout;
@@ -51,34 +48,18 @@ public class SwingRestartDialog extends StandardDialog implements ActionListener
     /** Informational label. */
     private TextLabel info;
     /** Info text. */
-    private String cause;
+    private final String cause;
 
     /**
      * Dialog to restart the client.
      *
-     * @param dialogManager Dialog manager
-     * @param parentWindow Parent window
-     * @param lifecycleController Life cycle controller, for restarting client
-     */
-    @Inject
-    public SwingRestartDialog(
-            final DialogManager dialogManager,
-            final MainFrame parentWindow,
-            final LifecycleController lifecycleController) {
-        this(dialogManager, parentWindow, lifecycleController, "finish updating");
-    }
-
-    /**
-     * Dialog to restart the client.
-     *
-     * @param dialogManager Dialog manager
      * @param parentWindow Parent window
      * @param lifecycleController Life cycle controller, for restarting client
      * @param cause Reason for restart
      */
-    public SwingRestartDialog(final DialogManager dialogManager, final Window parentWindow,
+    public SwingRestartDialog(final Window parentWindow,
             final LifecycleController lifecycleController, final String cause) {
-        super(dialogManager, parentWindow, ModalityType.APPLICATION_MODAL);
+        super(parentWindow, ModalityType.APPLICATION_MODAL);
         this.cause = cause;
         this.lifecycleController = lifecycleController;
 

src/com/dmdirc/addons/ui_swing/dialogs/updater/SwingUpdaterDialog.java

@@ -29,8 +29,9 @@ import com.dmdirc.addons.ui_swing.components.PackingTable;
 import com.dmdirc.addons.ui_swing.components.renderers.UpdateComponentTableCellRenderer;
 import com.dmdirc.addons.ui_swing.components.renderers.UpdateStatusTableCellRenderer;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+import com.dmdirc.addons.ui_swing.injection.DialogModule.ForUpdates;
+import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.updater.UpdateComponent;
 import com.dmdirc.updater.manager.CachingUpdateManager;
 import com.dmdirc.updater.manager.UpdateManager;
@@ -39,14 +40,12 @@ import com.dmdirc.updater.manager.UpdateManagerStatus;
 import com.dmdirc.updater.manager.UpdateStatus;
 
 import java.awt.Dimension;
-import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.inject.Inject;
-import javax.inject.Provider;
 import javax.swing.JButton;
 import javax.swing.JScrollPane;
 import javax.swing.JTable;
@@ -65,8 +64,6 @@ public class SwingUpdaterDialog extends StandardDialog implements
 
     /** Serial version UID. */
     private static final long serialVersionUID = 3;
-    /** Dialog manager. */
-    private final DialogManager dialogManager;
     /** The update manager to use. */
     private final CachingUpdateManager updateManager;
     /** Update table. */
@@ -80,25 +77,22 @@ public class SwingUpdaterDialog extends StandardDialog implements
     /** Update.Status renderer. */
     private UpdateStatusTableCellRenderer updateStatusRenderer;
     /** Provider of restart dialogs. */
-    private final Provider<SwingRestartDialog> restartDialogProvider;
+    private final DialogProvider<SwingRestartDialog> restartDialogProvider;
 
     /**
      * Creates a new instance of the updater dialog.
      *
      * @param updateManager The update manager to use for information
-     * @param dialogManager Dialog manager
      * @param parentWindow Parent window
      * @param restartDialogProvider Provider of restart dialogs.
      */
     @Inject
     public SwingUpdaterDialog(
             final CachingUpdateManager updateManager,
-            final DialogManager dialogManager,
             final MainFrame parentWindow,
-            final Provider<SwingRestartDialog> restartDialogProvider) {
-        super(dialogManager, parentWindow, ModalityType.MODELESS);
+            @ForUpdates final DialogProvider<SwingRestartDialog> restartDialogProvider) {
+        super(parentWindow, ModalityType.MODELESS);
 
-        this.dialogManager = dialogManager;
         this.updateManager = updateManager;
         this.restartDialogProvider = restartDialogProvider;
 
@@ -210,7 +204,7 @@ public class SwingUpdaterDialog extends StandardDialog implements
             }.executeInExecutor();
 
             if (updateManager.getManagerStatus() == UpdateManagerStatus.IDLE_RESTART_NEEDED) {
-                restartDialogProvider.get().displayOrRequestFocus();
+                restartDialogProvider.displayOrRequestFocus();
                 dispose();
             }
         } else if (e.getSource().equals(getCancelButton())) {
@@ -238,7 +232,7 @@ public class SwingUpdaterDialog extends StandardDialog implements
 
                 if (status == UpdateManagerStatus.IDLE_RESTART_NEEDED) {
                     if (isVisible()) {
-                        restartDialogProvider.get().displayOrRequestFocus();
+                        restartDialogProvider.displayOrRequestFocus();
                     }
                     dispose();
                 } else {

src/com/dmdirc/addons/ui_swing/dialogs/url/URLDialog.java

@@ -22,12 +22,15 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.url;
 
+import com.dmdirc.ClientModule.UserConfig;
+import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.components.URLProtocolPanel;
 import com.dmdirc.addons.ui_swing.components.text.TextLabel;
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.ui.core.util.URLHandler;
+import com.dmdirc.util.annotations.factory.Factory;
+import com.dmdirc.util.annotations.factory.Unbound;
 
 import java.awt.Window;
 import java.awt.event.ActionEvent;
@@ -39,6 +42,7 @@ import javax.swing.JButton;
 import net.miginfocom.swing.MigLayout;
 
 /** URL Protocol dialog. */
+@Factory(inject=true, singleton=true)
 public class URLDialog extends StandardDialog implements ActionListener {
 
     /** Serial version UID. */
@@ -57,15 +61,17 @@ public class URLDialog extends StandardDialog implements ActionListener {
     /**
      * Instantiates the URLDialog.
      *
-     * @param dialogManager Dialog manager
      * @param url URL to open once added
      * @param config Config
      * @param parentWindow Parent window
      * @param urlHandler The URL Handler to use to handle clicked links
      */
-    public URLDialog(final DialogManager dialogManager, final URI url,
-            final ConfigProvider config, final Window parentWindow, final URLHandler urlHandler) {
-        super(dialogManager, parentWindow, ModalityType.MODELESS);
+    public URLDialog(
+            @Unbound final URI url,
+            @SuppressWarnings("qualifiers") @UserConfig final ConfigProvider config,
+            final MainFrame parentWindow,
+            final URLHandler urlHandler) {
+        super(parentWindow, ModalityType.MODELESS);
 
         this.url = url;
         this.parentWindow = parentWindow;

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

@@ -22,11 +22,33 @@
 
 package com.dmdirc.addons.ui_swing.injection;
 
+import com.dmdirc.Channel;
+import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.Server;
+import com.dmdirc.actions.wrappers.PerformWrapper;
+import com.dmdirc.addons.ui_swing.MainFrame;
+import com.dmdirc.addons.ui_swing.PrefsComponentFactory;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.addons.ui_swing.SwingWindowFactory;
+import com.dmdirc.addons.ui_swing.dialogs.FeedbackDialog;
 import com.dmdirc.addons.ui_swing.dialogs.NewServerDialog;
+import com.dmdirc.addons.ui_swing.dialogs.about.AboutDialog;
 import com.dmdirc.addons.ui_swing.dialogs.actionsmanager.ActionsManagerDialog;
+import com.dmdirc.addons.ui_swing.dialogs.aliases.AliasManagerDialog;
+import com.dmdirc.addons.ui_swing.dialogs.channelsetting.ChannelSettingsDialog;
+import com.dmdirc.addons.ui_swing.dialogs.prefs.SwingPreferencesDialog;
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
+import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
+import com.dmdirc.addons.ui_swing.dialogs.updater.SwingRestartDialog;
+import com.dmdirc.addons.ui_swing.dialogs.updater.SwingUpdaterDialog;
+import com.dmdirc.config.prefs.PreferencesManager;
+import com.dmdirc.interfaces.LifecycleController;
+import com.dmdirc.interfaces.config.IdentityFactory;
+import com.dmdirc.plugins.ServiceManager;
+import com.dmdirc.ui.IconManager;
 
 import javax.inject.Provider;
+import javax.inject.Qualifier;
 import javax.inject.Singleton;
 
 import dagger.Module;
@@ -38,6 +60,18 @@ import dagger.Provides;
 @Module(library = true, complete = false)
 public class DialogModule {
 
+    /**
+     * Qualifier that indicates a restart dialog is needed for updates to be applied.
+     */
+    @Qualifier
+    public static @interface ForUpdates {}
+
+    /**
+     * Qualifier that indicates a restart dialog is needed for settings to be applied.
+     */
+    @Qualifier
+    public static @interface ForSettings {}
+
     @Provides
     @Singleton
     public DialogProvider<NewServerDialog> getNewServerDialogProvider(
@@ -59,4 +93,109 @@ public class DialogModule {
         return new DialogProvider<>(provider);
     }
 
+    @Provides
+    @Singleton
+    public DialogProvider<AliasManagerDialog> getAliasManagerDialogProvider(
+            final Provider<AliasManagerDialog> provider) {
+        return new DialogProvider<>(provider);
+    }
+
+    @Provides
+    @Singleton
+    public DialogProvider<FeedbackDialog> getFeedbackDialogProvider(
+            final Provider<FeedbackDialog> provider) {
+        return new DialogProvider<>(provider);
+    }
+
+    @Provides
+    @Singleton
+    public DialogProvider<AboutDialog> getAboutDialogProvider(
+            final Provider<AboutDialog> provider) {
+        return new DialogProvider<>(provider);
+    }
+
+    @Provides
+    @Singleton
+    public KeyedDialogProvider<Server, ServerSettingsDialog> getServerSettingsDialogProvider(
+            final SwingController controller,
+            @GlobalConfig final IconManager iconManager,
+            final PrefsComponentFactory compFactory,
+            final PerformWrapper performWrapper,
+            final MainFrame parentWindow) {
+        return new KeyedDialogProvider<Server, ServerSettingsDialog>() {
+            @Override
+            protected ServerSettingsDialog getInstance(final Server key) {
+                return new ServerSettingsDialog(controller, iconManager, compFactory,
+                        performWrapper, key, parentWindow);
+            }
+        };
+    }
+
+    @Provides
+    @Singleton
+    public KeyedDialogProvider<Channel, ChannelSettingsDialog> getChannelSettingsDialogProvider(
+            final SwingController controller,
+            final IdentityFactory identityFactory,
+            final SwingWindowFactory windowFactory,
+            @GlobalConfig final IconManager iconManager,
+            final ServiceManager serviceManager,
+            final PreferencesManager preferencesManager,
+            final PrefsComponentFactory compFactory,
+            final MainFrame parentWindow) {
+        return new KeyedDialogProvider<Channel, ChannelSettingsDialog>() {
+            @Override
+            protected ChannelSettingsDialog getInstance(final Channel key) {
+                return new ChannelSettingsDialog(controller, identityFactory, windowFactory,
+                        iconManager, serviceManager, preferencesManager, compFactory, key,
+                        parentWindow);
+            }
+        };
+    }
+
+    @Provides
+    @Singleton
+    public DialogProvider<SwingPreferencesDialog> getSwingPreferencesDialogProvider(
+            final Provider<SwingPreferencesDialog> provider) {
+        return new DialogProvider<>(provider);
+    }
+
+    @Provides
+    @Singleton
+    public DialogProvider<SwingUpdaterDialog> getSwingUpdaterDialogProvider(
+            final Provider<SwingUpdaterDialog> provider) {
+        return new DialogProvider<>(provider);
+    }
+
+    @Provides
+    @Singleton
+    @ForUpdates
+    public DialogProvider<SwingRestartDialog> getSwingRestartDialogProviderForUpdates(
+            @ForUpdates final Provider<SwingRestartDialog> provider) {
+        return new DialogProvider<>(provider);
+    }
+
+    @Provides
+    @Singleton
+    @ForSettings
+    public DialogProvider<SwingRestartDialog> getSwingRestartDialogProviderForSettings(
+            @ForSettings final Provider<SwingRestartDialog> provider) {
+        return new DialogProvider<>(provider);
+    }
+
+    @Provides
+    @ForUpdates
+    public SwingRestartDialog getRestartDialogForUpdates(
+            final MainFrame mainFrame,
+            final LifecycleController lifecycleController) {
+        return new SwingRestartDialog(mainFrame, lifecycleController, "finish updating");
+    }
+
+    @Provides
+    @ForSettings
+    public SwingRestartDialog getRestartDialogForSettings(
+            final MainFrame mainFrame,
+            final LifecycleController lifecycleController) {
+        return new SwingRestartDialog(mainFrame, lifecycleController, "apply settings");
+    }
+
 }

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

@@ -0,0 +1,131 @@
+/*
+ * 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.injection;
+
+import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
+
+import java.awt.event.WindowAdapter;
+import java.awt.event.WindowEvent;
+import java.util.HashMap;
+import java.util.Map;
+
+import static com.dmdirc.addons.ui_swing.SwingPreconditions.checkOnEDT;
+
+/**
+ * Provider for {@link StandardDialog} based windows that correspond to some key.
+ *
+ * <p>This provider will cache instances that are created until the windows are closed. Once a
+ * window has been closed, the next call to {@link #get()} or {@link #displayOrRequestFocus()}
+ * will result in a new instance being created.
+ *
+ * <p>Dialogs with different keys may be open simultaneously, and are treated independently.
+ *
+ * @param <K> The type of key that dialogs are associated with.
+ * @param <T> The type of dialog that will be managed.
+ */
+public abstract class KeyedDialogProvider<K, T extends StandardDialog> {
+
+    /** The existing instances being displayed, if any. */
+    private final Map<K, T> instances = new HashMap<>();
+
+    /**
+     * Gets an instance of the dialog provided by this class.
+     *
+     * <p>If there is an existing instance with the same key that hasn't been closed, it will be
+     * returned. Otherwise a new instance will be created and returned. New instances will not be
+     * automatically be * displayed to the user - use
+     * {@link #displayOrRequestFocus(java.lang.Object)} to do so.
+     *
+     * <p>This method <em>must</em> be called on the Event Despatch Thread.
+     *
+     * @param key The key associated with the dialog to get.
+     * @return An instance of the dialog.
+     */
+    public T get(final K key) {
+        checkOnEDT();
+        if (!instances.containsKey(key)) {
+            final T instance = getInstance(key);
+            instance.addWindowListener(new Listener(key));
+            instances.put(key, instance);
+        }
+        return instances.get(key);
+    }
+
+    /**
+     * Disposes of the dialog associated with the given key, if it exists.
+     *
+     * <p>This method <em>must</em> be called on the Event Despatch Thread.
+     *
+     * @param key The key associated with the dialog to close.
+     */
+    public void dispose(final K key) {
+        checkOnEDT();
+        if (instances.containsKey(key)) {
+            instances.get(key).dispose();
+        }
+    }
+
+    /**
+     * Ensures the dialog is visible to the user.
+     *
+     * <p>If no dialog currently exists with the same key, a new one will be created and displayed
+     * to the user. If a dialog existed prior to this method being invoked, it will request focus
+     * to bring it to the user's attention.
+     *
+     * <p>This method <em>must</em> be called on the Event Despatch Thread.
+     *
+     * @param key The key associated with the dialog to display.
+     */
+    public void displayOrRequestFocus(final K key) {
+        checkOnEDT();
+        get(key).displayOrRequestFocus();
+    }
+
+    /**
+     * Returns a new instance of the dialog with the specified key.
+     *
+     * @param key The key to create a new dialog for.
+     * @return A new instance of this provider's dialog.
+     */
+    protected abstract T getInstance(final K key);
+
+    /**
+     * Listens to window closing events to remove the cached instance of the dialog.
+     */
+    private class Listener extends WindowAdapter {
+
+        private final K key;
+
+        public Listener(final K key) {
+            this.key = key;
+        }
+
+        @Override
+        public void windowClosing(final WindowEvent e) {
+            super.windowClosing(e);
+            instances.remove(key);
+        }
+
+    }
+
+}

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

@@ -36,7 +36,6 @@ 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.dialogs.DialogManager;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.ui.IconManager;
@@ -96,7 +95,6 @@ public class SwingModule {
     /**
      * Gets the main DMDirc window.
      *
-     * @param dialogManager Dialog manager
      * @param swingController The controller that will own the frame.
      * @param windowFactory The window factory to use to create and listen for windows.
      * @param lifecycleController The controller to use to quit the application.
@@ -109,7 +107,6 @@ public class SwingModule {
     @Provides
     @Singleton
     public MainFrame getMainFrame(
-            final DialogManager dialogManager,
             final SwingController swingController,
             final SwingWindowFactory windowFactory,
             final LifecycleController lifecycleController,
@@ -121,7 +118,7 @@ public class SwingModule {
             /** {@inheritDoc} */
             @Override
             public MainFrame call() {
-                return new MainFrame(dialogManager,
+                return new MainFrame(
                         swingController,
                         windowFactory,
                         lifecycleController,
@@ -152,9 +149,4 @@ public class SwingModule {
         return new URLHandler(swingController, globalConfig, serverManager, statusBarManager);
     }
 
-    @Provides
-    public DialogManager getDialogManager(final SwingController controller) {
-        return new DialogManager(controller);
-    }
-
 }

src/com/dmdirc/addons/ui_swing/wizard/WizardDialog.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.addons.ui_swing.wizard;
 
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.addons.ui_swing.dialogs.StandardDialog;
 import com.dmdirc.ui.CoreUIUtils;
 
@@ -52,14 +51,12 @@ public class WizardDialog extends StandardDialog implements ActionListener {
      *
      * @param title Title for the wizard
      * @param steps Steps for the wizard
-     * @param dialogManager Dialog manager
      * @param parentWindow Parent component
      * @param modality Modality
      */
-    public WizardDialog(final String title, final List<Step> steps,
-            final DialogManager dialogManager, final Window parentWindow,
+    public WizardDialog(final String title, final List<Step> steps, final Window parentWindow,
             final ModalityType modality) {
-        super(dialogManager, parentWindow, modality);
+        super(parentWindow, modality);
 
         setTitle(title);
         setDefaultCloseOperation(DISPOSE_ON_CLOSE);

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

@@ -29,7 +29,6 @@ import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
 import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.MainFrame;
-import com.dmdirc.addons.ui_swing.dialogs.DialogManager;
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
 import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.addons.ui_swing.wizard.Step;
@@ -77,7 +76,6 @@ public class SwingFirstRunWizard implements WizardListener, FirstRunWizard {
      *
      * @param parentWindow Parent window
      * @param config Global config
-     * @param dialogManager Dialog manager
      * @param actionsDirectory Actions directory
      * @param pluginExtractor Plugin extractor to use.
      * @param iconManager Manager to use to find icons.
@@ -87,7 +85,6 @@ public class SwingFirstRunWizard implements WizardListener, FirstRunWizard {
     public SwingFirstRunWizard(
             final MainFrame parentWindow,
             @UserConfig final ConfigProvider config,
-            final DialogManager dialogManager,
             @Directory(DirectoryType.ACTIONS) final String actionsDirectory,
             final CorePluginExtractor pluginExtractor,
             @GlobalConfig final IconManager iconManager,
@@ -98,7 +95,7 @@ public class SwingFirstRunWizard implements WizardListener, FirstRunWizard {
         this.profileDialogProvider = profileDialogProvider;
 
         wizardDialog = new WizardDialog("Setup wizard", new ArrayList<Step>(),
-                dialogManager, parentWindow, ModalityType.APPLICATION_MODAL);
+                parentWindow, ModalityType.APPLICATION_MODAL);
         wizardDialog.setIconImage(iconManager.getImage("icon"));
         wizardDialog.addWizardListener(this);
         if(Apple.isAppleUI()) {