Associated changes for prefs tidy up.

Change-Id: Id8e090709271b6a908bc56273b9ff8dfd180370d
Depends-On: I428aa1596e7d41e6842175d805d88a4421c1b764
Depends-On: Iadcf92d4390034828d005a9c9e92d9a8ba189c99
Reviewed-on: http://gerrit.dmdirc.com/2453
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

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

@@ -25,6 +25,7 @@ package com.dmdirc.addons.ui_swing;
 import com.dmdirc.Channel;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
+import com.dmdirc.actions.ActionManager;
 import com.dmdirc.addons.ui_swing.commands.ChannelSettings;
 import com.dmdirc.addons.ui_swing.commands.Input;
 import com.dmdirc.addons.ui_swing.commands.PopInCommand;
@@ -58,6 +59,7 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.plugins.PluginInfo;
+import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.WindowManager;
 import com.dmdirc.ui.core.components.StatusBarManager;
@@ -139,6 +141,12 @@ public class SwingController extends BasePlugin implements UIController {
     /** Dialog manager. */
     @Getter
     private final DialogManager dialogManager;
+    /** Action manager. */
+    @Getter
+    private final ActionManager actionManager;
+    /** Plugin manager. */
+    @Getter
+    private final PluginManager pluginManager;
     /** Apple handler, deals with Mac specific code. */
     @Getter
     private final Apple apple;
@@ -150,10 +158,14 @@ public class SwingController extends BasePlugin implements UIController {
      * @param identityManager Identity Manager
      */
     public SwingController(final PluginInfo pluginInfo,
-            final IdentityManager identityManager) {
+            final IdentityManager identityManager,
+            final PluginManager pluginManager,
+            final ActionManager actionManager) {
         super();
         this.pluginInfo = pluginInfo;
         this.identityManager = identityManager;
+        this.actionManager = actionManager;
+        this.pluginManager = pluginManager;
         apple = new Apple(getGlobalConfig());
         globalConfig = identityManager.getGlobalConfiguration();
         globalIdentity = identityManager.getGlobalConfigIdentity();

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

@@ -98,7 +98,9 @@ public final class SwingPreferencesDialog extends StandardDialog implements
                             new UpdateConfigPanel(controller),
                             new URLConfigPanel(controller, getMainFrame()),
                             controller.getGlobalConfig(),
-                            controller.getGlobalIdentity());
+                            controller.getGlobalIdentity(),
+                            controller.getActionManager(),
+                            controller.getPluginManager());
                 } catch (IllegalArgumentException ex) {
                     mainPanel.setError(ex.getMessage());
                     Logger.appError(ErrorLevel.HIGH, "Unable to load the" +