Tidy up Channel/ServerSettings dependencies.

Pass in a SwingController instead of jumping through 3 million
hoops to try and find one. It's simpler that way.

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

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

@@ -189,8 +189,8 @@ public class SwingController extends BaseCommandPlugin implements UIController {
         dialogManager = new DialogManager(this);
         setAntiAlias();
         windows = new ArrayList<java.awt.Window>();
-        registerCommand(new ServerSettings(), ServerSettings.INFO);
-        registerCommand(new ChannelSettings(), ChannelSettings.INFO);
+        registerCommand(new ServerSettings(this), ServerSettings.INFO);
+        registerCommand(new ChannelSettings(this), ChannelSettings.INFO);
         registerCommand(new Input(windowFactory), Input.INFO);
         registerCommand(new PopOutCommand(this), PopOutCommand.INFO);
         registerCommand(new PopInCommand(this), PopInCommand.INFO);

src/com/dmdirc/addons/ui_swing/commands/ChannelSettings.java

@@ -39,22 +39,31 @@ import com.dmdirc.ui.input.AdditionalTabTargets;
  * Opens the channel settings window for the channel.
  */
 @CommandOptions(allowOffline = false)
-public class ChannelSettings extends Command implements
-        IntelligentCommand {
+public class ChannelSettings extends Command implements IntelligentCommand {
 
     /** A command info object for this command. */
     public static final CommandInfo INFO = new BaseCommandInfo("channelsettings",
             "channelsettings - opens the channel settings window",
             CommandType.TYPE_CHANNEL);
 
+    /** The controller to use to show the settings window. */
+    private final SwingController controller;
+
+    /**
+     * Creates a new instance of the {@link ChannelSettings} command.
+     *
+     * @param controller The controller to use to show the settings window.
+     */
+    public ChannelSettings(final SwingController controller) {
+        this.controller = controller;
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        ((SwingController) getController().getMain().getPluginManager()
-                .getPluginInfoByName("ui_swing").getPlugin())
-                .showChannelSettingsDialog(((ChannelCommandContext) context)
-                .getChannel());
+        controller.showChannelSettingsDialog(
+                ((ChannelCommandContext) context).getChannel());
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/commands/ServerSettings.java

@@ -47,13 +47,23 @@ public class ServerSettings extends Command implements IntelligentCommand {
             "serversettings - opens the server settings window",
             CommandType.TYPE_SERVER);
 
+    /** The controller to use to show the settings window. */
+    private final SwingController controller;
+
+    /**
+     * Creates a new instance of the {@link ServerSettings} command.
+     *
+     * @param controller The controller to use to show the settings window.
+     */
+    public ServerSettings(final SwingController controller) {
+        this.controller = controller;
+    }
+
     /** {@inheritDoc} */
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        ((SwingController) getController().getMain().getPluginManager()
-                .getPluginInfoByName("ui_swing").getPlugin())
-                .showServerSettingsDialog(context.getSource().getServer());
+        controller.showServerSettingsDialog(context.getSource().getServer());
     }
 
     /** {@inheritDoc} */