Inject the AMD.

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

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

@@ -44,6 +44,8 @@ import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 import java.util.Map;
 
+import javax.inject.Inject;
+import javax.inject.Singleton;
 import javax.swing.BorderFactory;
 import javax.swing.JCheckBox;
 import javax.swing.JComboBox;
@@ -63,6 +65,7 @@ import org.jdesktop.jxlayer.JXLayer;
 /**
  * Provides methods for constructing a JComponent from a PreferencesSetting.
  */
+@Singleton
 public final class PrefsComponentFactory {
 
     /** Swing Controller. */
@@ -73,9 +76,9 @@ public final class PrefsComponentFactory {
      *
      * @param controller Swing Controller
      */
-    protected PrefsComponentFactory(final SwingController controller) {
+    @Inject
+    public PrefsComponentFactory(final SwingController controller) {
         this.controller = controller;
-
     }
 
     /**

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

@@ -121,8 +121,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
     private final ConfigProvider addonIdentity;
     /** Global Swing UI Icon manager. */
     private final IconManager iconManager;
-    /** Prefs component factory instance. */
-    private final PrefsComponentFactory prefsComponentFactory;
     /** Action manager. */
     private final ActionManager actionManager;
     /** Action factory. */
@@ -204,7 +202,6 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         addonIdentity = identityManager.getAddonSettings();
         apple = new Apple(globalConfig, serverManager, eventBus);
         iconManager = new IconManager(globalConfig, urlBuilder);
-        prefsComponentFactory = new PrefsComponentFactory(this);
         setAntiAlias();
         windows = new ArrayList<>();
     }
@@ -241,7 +238,7 @@ public class SwingController extends BaseCommandPlugin implements UIController {
 
     @Deprecated
     public PrefsComponentFactory getPrefsComponentFactory() {
-        return prefsComponentFactory;
+        return swingManager.getPrefsComponentFactory();
     }
 
     @Deprecated

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

@@ -83,6 +83,9 @@ public class SwingManager {
     /** Provider of first run executors. */
     private final Provider<FirstRunWizardExecutor> firstRunExecutor;
 
+    /** The factory to use to create prefs components. */
+    private final PrefsComponentFactory prefsComponentFactory;
+
     /**
      * Creates a new instance of {@link SwingManager}.
      *
@@ -100,6 +103,7 @@ public class SwingManager {
      * @param dataLoaderWorkerFactory Factory used to create data loader workers.
      * @param cachingUpdateManager Update manager to use.
      * @param firstRunExecutor A provider of first run executors.
+     * @param prefsComponentFactory The factory to use to create prefs components.
      */
     @Inject
     public SwingManager(
@@ -116,7 +120,8 @@ public class SwingManager {
             final DialogKeyListener dialogKeyListener,
             final DataLoaderWorkerFactory dataLoaderWorkerFactory,
             final CachingUpdateManager cachingUpdateManager,
-            final Provider<FirstRunWizardExecutor> firstRunExecutor) {
+            final Provider<FirstRunWizardExecutor> firstRunExecutor,
+            final PrefsComponentFactory prefsComponentFactory) {
         this.dialogManager = dialogManager;
         this.eventQueue = eventQueue;
         this.windowFactory = windowFactory;
@@ -128,6 +133,7 @@ public class SwingManager {
         this.dataLoaderWorkerFactory = dataLoaderWorkerFactory;
         this.cachingUpdateManager = cachingUpdateManager;
         this.firstRunExecutor = firstRunExecutor;
+        this.prefsComponentFactory = prefsComponentFactory;
 
         this.mainFrame = mainFrame;
         this.mainFrame.setMenuBar(menuBar);
@@ -191,6 +197,11 @@ public class SwingManager {
         return cachingUpdateManager;
     }
 
+    @Deprecated
+    public PrefsComponentFactory getPrefsComponentFactory() {
+        return prefsComponentFactory;
+    }
+
     /**
      * Retrieves the window factory to use.
      *

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

@@ -50,14 +50,18 @@ public class SettingsMenu extends JMenu implements ActionListener {
     private final SwingController controller;
     /** Provider of profile manager dialogs. */
     private final Provider<ProfileManagerDialog> profileDialogProvider;
+    /** Provider of action manager dialogs. */
+    private final Provider<ActionsManagerDialog> actionsDialogProvider;
 
     @Inject
     public SettingsMenu(
             final SwingController controller,
-            final Provider<ProfileManagerDialog> profileDialogProvider) {
+            final Provider<ProfileManagerDialog> profileDialogProvider,
+            final Provider<ActionsManagerDialog> actionsDialogProvider) {
         super("Settings");
         this.controller = controller;
         this.profileDialogProvider = profileDialogProvider;
+        this.actionsDialogProvider = actionsDialogProvider;
 
         setMnemonic('e');
         initSettingsMenu();
@@ -111,7 +115,7 @@ public class SettingsMenu extends JMenu implements ActionListener {
                 profileDialogProvider.get().displayOrRequestFocus();
                 break;
             case "Actions":
-                controller.showDialog(ActionsManagerDialog.class);
+                actionsDialogProvider.get().displayOrRequestFocus();
                 break;
             case "Aliases":
                 controller.showDialog(AliasManagerDialog.class);

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.actionsmanager;
 
+import com.dmdirc.ClientModule.UserConfig;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionGroup;
 import com.dmdirc.actions.ActionManager;
@@ -51,6 +52,8 @@ import java.util.HashMap;
 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;
@@ -67,6 +70,7 @@ import net.miginfocom.swing.MigLayout;
 /**
  * Allows the user to manage actions.
  */
+@Singleton
 public class ActionsManagerDialog extends StandardDialog implements
         ActionListener, com.dmdirc.interfaces.ActionListener,
         ListSelectionListener {
@@ -119,14 +123,15 @@ public class ActionsManagerDialog extends StandardDialog implements
      * @param config Config to save dialog state to
      * @param compFactory Prefs setting component factory
      */
-    @SuppressWarnings("unchecked")
-    public ActionsManagerDialog(final Window parentWindow,
+    @Inject
+    public ActionsManagerDialog(
+            final MainFrame parentWindow,
             final SwingController controller,
             final DialogManager dialogManager,
-            final ConfigProvider config,
+            @UserConfig final ConfigProvider config,
             final PrefsComponentFactory compFactory) {
         super(dialogManager, Apple.isAppleUI()
-                ? new AppleJFrame((MainFrame) parentWindow, controller)
+                ? new AppleJFrame(parentWindow, controller)
                 : parentWindow, ModalityType.MODELESS);
         this.controller = controller;
         this.dialogManager = dialogManager;
@@ -159,8 +164,7 @@ public class ActionsManagerDialog extends StandardDialog implements
         actions = new ActionsGroupPanel(dialogManager, this, null);
         info = new ActionGroupInformationPanel(null);
         settings = new HashMap<>();
-        activeSettings = new ActionGroupSettingsPanel(controller
-                .getPrefsComponentFactory(), null, this);
+        activeSettings = new ActionGroupSettingsPanel(compFactory, null, this);
         settings.put(null, activeSettings);
         add = new JButton("Add");
         edit = new JButton("Edit");