DialogProvider<ActionsManagerDialog>.

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

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

@@ -34,7 +34,6 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
 import javax.inject.Inject;
-import javax.inject.Provider;
 import javax.inject.Singleton;
 import javax.swing.JMenu;
 import javax.swing.JMenuItem;
@@ -52,13 +51,13 @@ public class SettingsMenu extends JMenu implements ActionListener {
     /** Provider of profile manager dialogs. */
     private final DialogProvider<ProfileManagerDialog> profileDialogProvider;
     /** Provider of action manager dialogs. */
-    private final Provider<ActionsManagerDialog> actionsDialogProvider;
+    private final DialogProvider<ActionsManagerDialog> actionsDialogProvider;
 
     @Inject
     public SettingsMenu(
             final SwingController controller,
             final DialogProvider<ProfileManagerDialog> profileDialogProvider,
-            final Provider<ActionsManagerDialog> actionsDialogProvider) {
+            final DialogProvider<ActionsManagerDialog> actionsDialogProvider) {
         super("Settings");
         this.controller = controller;
         this.profileDialogProvider = profileDialogProvider;
@@ -116,7 +115,7 @@ public class SettingsMenu extends JMenu implements ActionListener {
                 profileDialogProvider.displayOrRequestFocus();
                 break;
             case "Actions":
-                actionsDialogProvider.get().displayOrRequestFocus();
+                actionsDialogProvider.displayOrRequestFocus();
                 break;
             case "Aliases":
                 controller.showDialog(AliasManagerDialog.class);

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

@@ -45,7 +45,6 @@ import com.dmdirc.interfaces.config.ConfigProvider;
 import com.dmdirc.util.validators.FileNameValidator;
 import com.dmdirc.util.validators.ValidatorChain;
 
-import java.awt.Window;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.util.HashMap;
@@ -53,7 +52,6 @@ import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
 import javax.inject.Inject;
-import javax.inject.Singleton;
 import javax.swing.BorderFactory;
 import javax.swing.DefaultListModel;
 import javax.swing.JButton;
@@ -70,7 +68,6 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Allows the user to manage actions.
  */
-@Singleton
 public class ActionsManagerDialog extends StandardDialog implements
         ActionListener, com.dmdirc.interfaces.ActionListener,
         ListSelectionListener {
@@ -81,8 +78,6 @@ public class ActionsManagerDialog extends StandardDialog implements
      * objects being unserialized with the new class).
      */
     private static final long serialVersionUID = 1;
-    /** Swing controller. */
-    private final SwingController controller;
     /** Dialog manager. */
     private final DialogManager dialogManager;
     /** Config instance. */
@@ -133,7 +128,6 @@ public class ActionsManagerDialog extends StandardDialog implements
         super(dialogManager, Apple.isAppleUI()
                 ? new AppleJFrame(parentWindow, controller)
                 : parentWindow, ModalityType.MODELESS);
-        this.controller = controller;
         this.dialogManager = dialogManager;
         this.config = config;
         this.compFactory = compFactory;

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.actionsmanager.ActionsManagerDialog;
 import com.dmdirc.addons.ui_swing.dialogs.profiles.ProfileManagerDialog;
 
 import javax.inject.Provider;
@@ -51,4 +52,11 @@ public class DialogModule {
         return new DialogProvider<>(provider);
     }
 
+    @Provides
+    @Singleton
+    public DialogProvider<ActionsManagerDialog> getActionsManagerDialogProvider(
+            final Provider<ActionsManagerDialog> provider) {
+        return new DialogProvider<>(provider);
+    }
+
 }