Use DialogProvider for the profile manager dialog.

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

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

@@ -28,6 +28,7 @@ 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;
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
+import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
@@ -49,14 +50,14 @@ public class SettingsMenu extends JMenu implements ActionListener {
     /** Swing controller. */
     private final SwingController controller;
     /** Provider of profile manager dialogs. */
-    private final Provider<ProfileManagerDialog> profileDialogProvider;
+    private final DialogProvider<ProfileManagerDialog> profileDialogProvider;
     /** Provider of action manager dialogs. */
     private final Provider<ActionsManagerDialog> actionsDialogProvider;
 
     @Inject
     public SettingsMenu(
             final SwingController controller,
-            final Provider<ProfileManagerDialog> profileDialogProvider,
+            final DialogProvider<ProfileManagerDialog> profileDialogProvider,
             final Provider<ActionsManagerDialog> actionsDialogProvider) {
         super("Settings");
         this.controller = controller;
@@ -112,7 +113,7 @@ public class SettingsMenu extends JMenu implements ActionListener {
                 controller.showDialog(SwingPreferencesDialog.class);
                 break;
             case "Profile":
-                profileDialogProvider.get().displayOrRequestFocus();
+                profileDialogProvider.displayOrRequestFocus();
                 break;
             case "Actions":
                 actionsDialogProvider.get().displayOrRequestFocus();

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

@@ -32,6 +32,7 @@ import com.dmdirc.addons.ui_swing.components.vetoable.VetoableChangeEvent;
 import com.dmdirc.addons.ui_swing.components.vetoable.VetoableComboBoxModel;
 import com.dmdirc.addons.ui_swing.components.vetoable.VetoableComboBoxSelectionListener;
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
+import com.dmdirc.addons.ui_swing.injection.DialogProvider;
 import com.dmdirc.interfaces.Connection;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
 import com.dmdirc.interfaces.config.ConfigProvider;
@@ -51,7 +52,6 @@ import java.net.URISyntaxException;
 import java.util.List;
 
 import javax.inject.Inject;
-import javax.inject.Provider;
 import javax.swing.BorderFactory;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JButton;
@@ -100,7 +100,7 @@ public class NewServerDialog extends StandardDialog implements
     /**  Opening new server? */
     private boolean openingServer = false;
     /** Provider to use to retrieve PMDs. */
-    private final Provider<ProfileManagerDialog> profileDialogProvider;
+    private final DialogProvider<ProfileManagerDialog> profileDialogProvider;
 
     /**
      * Creates a new instance of the dialog.
@@ -121,7 +121,7 @@ public class NewServerDialog extends StandardDialog implements
             @GlobalConfig final IconManager iconManager,
             final IdentityController identityController,
             final ServerManager serverManager,
-            final Provider<ProfileManagerDialog> profileDialogProvider) {
+            final DialogProvider<ProfileManagerDialog> profileDialogProvider) {
         super(dialogManager, mainFrame, ModalityType.MODELESS);
         this.identityController = identityController;
         this.serverManager = serverManager;
@@ -317,7 +317,7 @@ public class NewServerDialog extends StandardDialog implements
         if (e.getSource() == getOkButton()) {
             save();
         } else if (e.getSource() == editProfileButton) {
-            profileDialogProvider.get().displayOrRequestFocus();
+            profileDialogProvider.displayOrRequestFocus();
         } else if (e.getSource() == getCancelButton()) {
             dispose();
         }

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

@@ -41,7 +41,6 @@ import com.palantir.ptoss.cinch.swing.BoundSelection;
 import com.palantir.ptoss.cinch.swing.EnabledIf;
 
 import javax.inject.Inject;
-import javax.inject.Singleton;
 import javax.swing.Box;
 import javax.swing.JButton;
 import javax.swing.JLabel;
@@ -52,7 +51,6 @@ import javax.swing.ListSelectionModel;
 import net.miginfocom.swing.MigLayout;
 
 /** Profile editing dialog. */
-@Singleton
 @SuppressWarnings("unused")
 public class ProfileManagerDialog extends StandardDialog {
 

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

@@ -23,6 +23,7 @@
 package com.dmdirc.addons.ui_swing.injection;
 
 import com.dmdirc.addons.ui_swing.dialogs.NewServerDialog;
+import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
 
 import javax.inject.Provider;
 import javax.inject.Singleton;
@@ -43,4 +44,11 @@ public class DialogModule {
         return new DialogProvider<>(provider);
     }
 
+    @Provides
+    @Singleton
+    public DialogProvider<ProfileManagerDialog> getProfileManagerDialogProvider(
+            final Provider<ProfileManagerDialog> provider) {
+        return new DialogProvider<>(provider);
+    }
+
 }

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

@@ -31,6 +31,7 @@ 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;
 import com.dmdirc.addons.ui_swing.wizard.WizardDialog;
 import com.dmdirc.addons.ui_swing.wizard.WizardListener;
@@ -54,7 +55,6 @@ import java.util.Map;
 import java.util.Map.Entry;
 
 import javax.inject.Inject;
-import javax.inject.Provider;
 import javax.inject.Singleton;
 
 /** First run wizard, used to initially setup the client for the user. */
@@ -70,7 +70,7 @@ public class SwingFirstRunWizard implements WizardListener, FirstRunWizard {
     /** Actions directory. */
     private final String actionsDirectory;
     /** Provider to use to obtain PMDs. */
-    private final Provider<ProfileManagerDialog> profileDialogProvider;
+    private final DialogProvider<ProfileManagerDialog> profileDialogProvider;
 
     /**
      * Instantiate the wizard.
@@ -91,7 +91,7 @@ public class SwingFirstRunWizard implements WizardListener, FirstRunWizard {
             @Directory(DirectoryType.ACTIONS) final String actionsDirectory,
             final CorePluginExtractor pluginExtractor,
             @GlobalConfig final IconManager iconManager,
-            final Provider<ProfileManagerDialog> profileDialogProvider) {
+            final DialogProvider<ProfileManagerDialog> profileDialogProvider) {
         this.corePluginExtractor = pluginExtractor;
         this.config = config;
         this.actionsDirectory = actionsDirectory;
@@ -132,7 +132,7 @@ public class SwingFirstRunWizard implements WizardListener, FirstRunWizard {
                 @Override
                 public void processEvent(final ActionType type,
                         final StringBuffer format, final Object... arguments) {
-                    profileDialogProvider.get().displayOrRequestFocus();
+                    profileDialogProvider.displayOrRequestFocus();
                 }
             }, CoreActionType.CLIENT_OPENED);