Inject some prefs panel dependencies.

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

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

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.components.addonpanel;
 
 import com.dmdirc.actions.ActionManager;
 import com.dmdirc.actions.CoreActionType;
+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.dialogs.prefs.SwingPreferencesDialog;
@@ -31,11 +32,11 @@ import com.dmdirc.interfaces.ActionListener;
 import com.dmdirc.interfaces.actions.ActionType;
 import com.dmdirc.plugins.PluginInfo;
 
-import java.awt.Window;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import javax.inject.Inject;
 import javax.swing.JTable;
 import javax.swing.table.DefaultTableModel;
 
@@ -59,8 +60,9 @@ public class PluginPanel extends AddonPanel implements ActionListener {
      * @param controller Swing Controller
      * @param prefsDialog The prefs dialog that contains this panel
      */
+    @Inject
     public PluginPanel(
-            final Window parentWindow,
+            final MainFrame parentWindow,
             final SwingController controller,
             final SwingPreferencesDialog prefsDialog) {
         super(parentWindow, controller, prefsDialog);

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

@@ -22,17 +22,18 @@
 
 package com.dmdirc.addons.ui_swing.components.addonpanel;
 
+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.dialogs.prefs.SwingPreferencesDialog;
 import com.dmdirc.ui.themes.Theme;
 import com.dmdirc.ui.themes.ThemeManager;
 
-import java.awt.Window;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+import javax.inject.Inject;
 import javax.swing.JTable;
 import javax.swing.table.DefaultTableModel;
 
@@ -60,8 +61,9 @@ public class ThemePanel extends AddonPanel {
      * @param themeManager Manager to retrieve themes from.
      * @param prefsDialog The prefs dialog that contains this panel
      */
+    @Inject
     public ThemePanel(
-            final Window parentWindow,
+            final MainFrame parentWindow,
             final SwingController controller,
             final ThemeManager themeManager,
             final SwingPreferencesDialog prefsDialog) {

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

@@ -22,13 +22,10 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
-import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.ListScroller;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
-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;
@@ -45,6 +42,7 @@ import java.util.List;
 import java.util.concurrent.ExecutionException;
 
 import javax.inject.Inject;
+import javax.inject.Provider;
 import javax.swing.BorderFactory;
 import javax.swing.DefaultListModel;
 import javax.swing.JButton;
@@ -89,12 +87,13 @@ public final class SwingPreferencesDialog extends StandardDialog implements
      * @param controller The controller which owns this preferences window.
      * @param restartDialogProvider The provider to use for restart dialogs.
      * @param actionsManager Actions manager to use.
+     * @param dialogModelProvider The provider to use to get a dialog model.
      */
     @Inject
     public SwingPreferencesDialog(
             final SwingController controller,
             @ForSettings final DialogProvider<SwingRestartDialog> restartDialogProvider,
-            final ActionManager actionsManager) {
+            final Provider<PreferencesDialogModel> dialogModelProvider) {
         super(controller.getMainFrame(), ModalityType.MODELESS);
 
         this.controller = controller;
@@ -110,17 +109,7 @@ public final class SwingPreferencesDialog extends StandardDialog implements
                 mainPanel.setWaiting(true);
                 PreferencesDialogModel prefsManager = null;
                 try {
-                    prefsManager = new PreferencesDialogModel(
-                            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(),
-                            controller.getGlobalIdentity(),
-                            actionsManager,
-                            controller.getPluginManager());
+                    prefsManager = dialogModelProvider.get();
                 } catch (IllegalArgumentException ex) {
                     mainPanel.setError(ex.getMessage());
                     Logger.appError(ErrorLevel.HIGH, "Unable to load the" +

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.dialogs.prefs;
 
+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.URLProtocolPanel;
@@ -42,6 +43,7 @@ import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Set;
 
+import javax.inject.Inject;
 import javax.swing.JButton;
 import javax.swing.JPanel;
 import javax.swing.JScrollPane;
@@ -90,8 +92,10 @@ public class URLConfigPanel extends JPanel implements
      * @param controller Swing controller
      * @param parentWindow Parent window
      */
-    public URLConfigPanel(final SwingController controller,
-            final Window parentWindow) {
+    @Inject
+    public URLConfigPanel(
+            final SwingController controller,
+            final MainFrame parentWindow) {
         super();
 
         this.controller = controller;

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

@@ -36,6 +36,7 @@ import com.dmdirc.updater.UpdateChecker;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 
+import javax.inject.Inject;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.JButton;
 import javax.swing.JCheckBox;
@@ -72,14 +73,21 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
     private JComboBox updateChannel;
     /** Swing controller. */
     private final SwingController controller;
+    /** The prefs dialog that will be hosting the panel. */
+    private final SwingPreferencesDialog prefsDialog;
 
     /**
      * Instantiates a new update config panel.
      *
      * @param controller Swing controller
+     * @param prefsDialog The prefs dialog that will be hosting the panel.
      */
-    public UpdateConfigPanel(final SwingController controller) {
+    @Inject
+    public UpdateConfigPanel(
+            final SwingController controller,
+            final SwingPreferencesDialog prefsDialog) {
         this.controller = controller;
+        this.prefsDialog = prefsDialog;
 
         initComponents();
         addListeners();
@@ -148,8 +156,7 @@ public class UpdateConfigPanel extends JPanel implements ActionListener,
      * Lays out the components.
      */
     private void layoutComponents() {
-        setLayout(new MigLayout("fill, ins 0, hmax " + controller.getPrefsDialog().
-                getPanelHeight()));
+        setLayout(new MigLayout("fill, ins 0, hmax " + prefsDialog.getPanelHeight()));
 
         add(new JLabel("Update checking:"), "split");
         add(enable, "growx");

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

@@ -24,7 +24,9 @@ package com.dmdirc.addons.ui_swing.injection;
 
 import com.dmdirc.ClientModule;
 import com.dmdirc.ClientModule.GlobalConfig;
+import com.dmdirc.ClientModule.UserConfig;
 import com.dmdirc.ServerManager;
+import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.ui_swing.MainFrame;
 import com.dmdirc.addons.ui_swing.QuitWorker;
 import com.dmdirc.addons.ui_swing.SwingController;
@@ -36,8 +38,15 @@ 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.components.addonpanel.PluginPanel;
+import com.dmdirc.addons.ui_swing.components.addonpanel.ThemePanel;
+import com.dmdirc.addons.ui_swing.dialogs.prefs.URLConfigPanel;
+import com.dmdirc.addons.ui_swing.dialogs.prefs.UpdateConfigPanel;
+import com.dmdirc.config.prefs.PreferencesDialogModel;
 import com.dmdirc.interfaces.LifecycleController;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
+import com.dmdirc.interfaces.config.ConfigProvider;
+import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
@@ -169,4 +178,18 @@ public class SwingModule {
         return new URLHandler(swingController, globalConfig, serverManager, statusBarManager);
     }
 
+    @Provides
+    public PreferencesDialogModel getPrefsDialogModel(
+            final PluginPanel pluginPanel,
+            final ThemePanel themePanel,
+            final UpdateConfigPanel updatePanel,
+            final URLConfigPanel urlPanel,
+            @GlobalConfig final AggregateConfigProvider configManager,
+            @UserConfig final ConfigProvider identity,
+            final ActionManager actionManager,
+            final PluginManager pluginManager) {
+        return new PreferencesDialogModel(pluginPanel, themePanel, updatePanel, urlPanel,
+                configManager, identity, actionManager, pluginManager);
+    }
+
 }