Remove windows from commands

Change-Id: I895be099fa526e4e4b566e7178120b5d1ad0912c
Depends-On: I5b6e7e2ca81d114028fef6cac0d88498def62ea0
Reviewed-on: http://gerrit.dmdirc.com/2012
Automatic-Compile: DMDirc Build Manager
Reviewed-by: Chris Smith <chris@dmdirc.com>

src/com/dmdirc/addons/activewindow/ActiveCommand.java

@@ -66,7 +66,7 @@ public class ActiveCommand extends Command implements IntelligentCommand {
         final TextFrame frame = mainFrame.getActiveFrame();
         if (frame.getContainer() instanceof WritableFrameContainer) {
             ((WritableFrameContainer) frame.getContainer()).getCommandParser()
-                    .parseCommand(frame.getContainer(), context.getSource(),
+                    .parseCommand(frame.getContainer(),
                     args.getArgumentsAsString());
         }
     }

src/com/dmdirc/addons/debug/commands/FirstRun.java

@@ -25,8 +25,10 @@ package com.dmdirc.addons.debug.commands;
 import com.dmdirc.FrameContainer;
 import com.dmdirc.addons.debug.Debug;
 import com.dmdirc.addons.debug.DebugCommand;
+import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.plugins.PluginManager;
 
 /**
  * Opens the DMDirc first run wizard.
@@ -58,7 +60,9 @@ public class FirstRun extends DebugCommand {
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        context.getSource().getController().showFirstRunWizard();
+        ((SwingController) PluginManager.getPluginManager()
+                .getPluginInfoByName("ui_swing").getPlugin())
+                .showFirstRunWizard();
     }
 
 }

src/com/dmdirc/addons/debug/commands/Time.java

@@ -31,7 +31,6 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.commandparser.commands.context.CommandContext;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
-import com.dmdirc.ui.interfaces.Window;
 
 /**
  * Times how long it takes to execute commands.
@@ -63,7 +62,7 @@ public class Time extends DebugCommand implements IntelligentCommand {
     @Override
     public void execute(final FrameContainer origin,
             final CommandArguments args, final CommandContext context) {
-        doTime(origin, context.getSource(), args);
+        doTime(origin, args);
     }
 
     /**
@@ -73,7 +72,7 @@ public class Time extends DebugCommand implements IntelligentCommand {
      * @param window The window to be passed on to the timed command, if any
      * @param args The arguments that were passed to the command
      */
-    private void doTime(final FrameContainer origin, final Window window,
+    private void doTime(final FrameContainer origin,
             final CommandArguments args) {
         if (args.getArguments().length == 0) {
             showUsage(origin, args.isSilent(), getName(), getUsage());
@@ -84,7 +83,7 @@ public class Time extends DebugCommand implements IntelligentCommand {
             final WritableFrameContainer container
                     = (WritableFrameContainer) origin;
             final long start = System.currentTimeMillis();
-            container.getCommandParser().parseCommand(origin, window,
+            container.getCommandParser().parseCommand(origin,
                     args.getArgumentsAsString(0));
             final long end = System.currentTimeMillis();
             sendLine(origin, args.isSilent(), FORMAT_OUTPUT,

src/com/dmdirc/addons/nowplaying/NowPlayingCommand.java

@@ -80,7 +80,7 @@ public final class NowPlayingCommand extends Command implements
                     if (source.getState() == MediaSourceState.CLOSED) {
                         sendLine(origin, args.isSilent(), FORMAT_ERROR, "Source is not running.");
                     } else {
-                        target.getCommandParser().parseCommand(origin, context.getSource(),
+                        target.getCommandParser().parseCommand(origin,
                                 getInformation(source, args.getArgumentsAsString(2)));
                     }
                 }
@@ -90,7 +90,7 @@ public final class NowPlayingCommand extends Command implements
             }
         } else {
             if (parent.hasRunningSource()) {
-                target.getCommandParser().parseCommand(origin, context.getSource(),
+                target.getCommandParser().parseCommand(origin,
                         getInformation(parent.getBestSource(), args.
                         getArgumentsAsString(0)));
             } else {

src/com/dmdirc/addons/redirect/RedirectCommand.java

@@ -49,7 +49,7 @@ public class RedirectCommand extends Command implements IntelligentCommand,
         final MessageTarget target = ((ChatCommandContext) context)
                 .getChat();
         target.getCommandParser().parseCommand(new FakeWriteableFrameContainer(
-                target), context.getSource(), args.getArgumentsAsString());
+                target), args.getArgumentsAsString());
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/tabcompletion_bash/BashStyle.java

@@ -22,12 +22,12 @@
 
 package com.dmdirc.addons.tabcompletion_bash;
 
+import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompleterResult;
 import com.dmdirc.ui.input.tabstyles.TabCompletionResult;
 import com.dmdirc.ui.input.tabstyles.TabCompletionStyle;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.awt.Toolkit;
 
@@ -46,7 +46,7 @@ public class BashStyle implements TabCompletionStyle {
     protected final TabCompleter tabCompleter;
 
     /** The input window that we use. */
-    protected final InputWindow window;
+    protected final WritableFrameContainer window;
 
     /**
      * Creates a new Bash-style tab completer.
@@ -54,7 +54,7 @@ public class BashStyle implements TabCompletionStyle {
      * @param completer The tab completer this style is for
      * @param window The window this tab style is for
      */
-    public BashStyle(final TabCompleter completer, final InputWindow window) {
+    public BashStyle(final TabCompleter completer, final WritableFrameContainer window) {
         this.tabCompleter = completer;
         this.window = window;
     }
@@ -92,7 +92,7 @@ public class BashStyle implements TabCompletionStyle {
 
             final String sub = res.getBestSubstring();
             if (sub.equalsIgnoreCase(word) && tabCount >= 2) {
-                window.getContainer().addLine("tabCompletion", res.toString());
+                window.addLine("tabCompletion", res.toString());
 
                 return null;
             } else {

src/com/dmdirc/addons/tabcompletion_bash/BashStylePlugin.java

@@ -22,10 +22,10 @@
 
 package com.dmdirc.addons.tabcompletion_bash;
 
+import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.tabstyles.TabCompletionStyle;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 public class BashStylePlugin extends BasePlugin {
 
@@ -49,7 +49,7 @@ public class BashStylePlugin extends BasePlugin {
      * @return A relevant TabCompletionStyle
      */
     public TabCompletionStyle getCompletionStyle(final TabCompleter completer,
-            final InputWindow window) {
+            final WritableFrameContainer window) {
         return new BashStyle(completer, window);
     }
 

src/com/dmdirc/addons/tabcompletion_mirc/MircStyle.java

@@ -23,12 +23,12 @@
 package com.dmdirc.addons.tabcompletion_mirc;
 
 import com.dmdirc.Channel;
+import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.TabCompleterResult;
 import com.dmdirc.ui.input.tabstyles.TabCompletionResult;
 import com.dmdirc.ui.input.tabstyles.TabCompletionStyle;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.awt.Toolkit;
 import java.util.Collections;
@@ -45,7 +45,7 @@ public class MircStyle implements TabCompletionStyle {
     protected final TabCompleter tabCompleter;
 
     /** The input window that we use. */
-    protected final InputWindow window;
+    protected final WritableFrameContainer window;
 
     /**
      * Creates a new mIRC-style tab completer.
@@ -53,7 +53,7 @@ public class MircStyle implements TabCompletionStyle {
      * @param completer The tab completer this style is for
      * @param window The window this tab style is for
      */
-    public MircStyle(final TabCompleter completer, final InputWindow window) {
+    public MircStyle(final TabCompleter completer, final WritableFrameContainer window) {
         this.tabCompleter = completer;
         this.window = window;
     }
@@ -83,10 +83,10 @@ public class MircStyle implements TabCompletionStyle {
             } else {
                 Collections.sort(res.getResults(), String.CASE_INSENSITIVE_ORDER);
 
-                if (word.length() > 0 && window.getContainer() instanceof Channel
-                        && ((Channel) window.getContainer())
+                if (word.length() > 0 && window instanceof Channel
+                        && ((Channel) window)
                         .getChannelInfo().getName().startsWith(word)) {
-                    target = ((Channel) window.getContainer()).getChannelInfo().getName();
+                    target = ((Channel) window).getChannelInfo().getName();
                 } else {
                     target = res.getResults().get(0);
                 }

src/com/dmdirc/addons/tabcompletion_mirc/MircStylePlugin.java

@@ -22,10 +22,10 @@
 
 package com.dmdirc.addons.tabcompletion_mirc;
 
+import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.plugins.BasePlugin;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.input.tabstyles.TabCompletionStyle;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 public class MircStylePlugin extends BasePlugin {
 
@@ -49,7 +49,7 @@ public class MircStylePlugin extends BasePlugin {
      * @return A relevant TabCompletionStyle
      */
     public TabCompletionStyle getCompletionStyle(final TabCompleter completer,
-            final InputWindow window) {
+            final WritableFrameContainer window) {
         return new MircStyle(completer, window);
     }
 

src/com/dmdirc/addons/time/TimedCommand.java

@@ -27,7 +27,6 @@ import com.dmdirc.FrameContainer;
 import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.commandparser.parsers.GlobalCommandParser;
-import com.dmdirc.ui.interfaces.Window;
 
 import java.util.Timer;
 import java.util.TimerTask;
@@ -46,9 +45,6 @@ public final class TimedCommand extends TimerTask {
     /** The container to use for executing commands. */
     private final FrameContainer origin;
 
-    /** The window the command came from. */
-    private final Window window;
-
     /** The timer we're using for scheduling this command. */
     private final Timer timer;
 
@@ -69,14 +65,13 @@ public final class TimedCommand extends TimerTask {
      */
     public TimedCommand(final TimerManager manager, final int timerKey,
             final int repetitions, final int delay, final String command,
-            final FrameContainer origin, final Window window) {
+            final FrameContainer origin) {
         super();
 
         this.timerKey = timerKey;
         this.repetitions = repetitions;
         this.command = command;
         this.origin = origin;
-        this.window = window;
         this.manager = manager;
 
         timer = new Timer("Timed Command Timer");
@@ -113,7 +108,7 @@ public final class TimedCommand extends TimerTask {
             parser = ((WritableFrameContainer) origin).getCommandParser();
         }
 
-        parser.parseCommand(origin, window, command);
+        parser.parseCommand(origin, command);
 
         if (--repetitions <= 0) {
             manager.removeTimer(timerKey);

src/com/dmdirc/addons/time/TimerCommand.java

@@ -119,7 +119,7 @@ public final class TimerCommand extends Command implements IntelligentCommand,
                     }
 
                     manager.addTimer(repetitions, interval, command,
-                            origin, context.getSource());
+                            origin);
 
                     sendLine(origin, args.isSilent(), FORMAT_OUTPUT, "Command scheduled.");
                 }

src/com/dmdirc/addons/time/TimerManager.java

@@ -23,7 +23,6 @@
 package com.dmdirc.addons.time;
 
 import com.dmdirc.FrameContainer;
-import com.dmdirc.ui.interfaces.Window;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -52,16 +51,14 @@ public class TimerManager {
      * @param interval Interval between repetitions
      * @param command Command to be run when the timer fires
      * @param origin The frame container to use for the execution
-     * @param commandContext The window the command came from
      */
     public void addTimer(final int repetitions, final int interval,
-            final String command, final FrameContainer origin,
-            final Window commandContext) {
+            final String command, final FrameContainer origin) {
 
         synchronized (this) {
             final int timerKey = findFreeKey();
             timerList.put(timerKey, new TimedCommand(this, timerKey,
-                    repetitions, interval, command, origin, commandContext));
+                    repetitions, interval, command, origin));
         }
     }
 

src/com/dmdirc/addons/ui_dummy/DummyInputHandler.java

@@ -22,10 +22,10 @@
 
 package com.dmdirc.addons.ui_dummy;
 
+import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.InputField;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * Dummy input handler.
@@ -40,7 +40,9 @@ public class DummyInputHandler extends InputHandler {
      * @param commandParser The command parser to use for this text field.
      * @param parentWindow The window that owns this input handler
      */
-    public DummyInputHandler(final InputField target, final CommandParser commandParser, final InputWindow parentWindow) {
+    public DummyInputHandler(final InputField target,
+            final CommandParser commandParser,
+            final WritableFrameContainer parentWindow) {
         super(target, commandParser, parentWindow);
     }
 

src/com/dmdirc/addons/ui_dummy/DummyInputWindow.java

@@ -50,7 +50,8 @@ public class DummyInputWindow implements InputWindow {
     /** {@inheritDoc} */
     @Override
     public InputHandler getInputHandler() {
-        return new DummyInputHandler(new DummyInputField(), null, this);
+        return new DummyInputHandler(new DummyInputField(), null,
+                getContainer());
     }
 
     /** {@inheritDoc} */

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.addons.ui_swing.commands.*; //NOPMD
 import com.dmdirc.addons.ui_swing.components.addonpanel.AddonPanel;
 import com.dmdirc.addons.ui_swing.components.addonpanel.PluginPanel;
 import com.dmdirc.addons.ui_swing.components.addonpanel.ThemePanel;
@@ -42,6 +43,8 @@ import com.dmdirc.addons.ui_swing.dialogs.serversetting.ServerSettingsDialog;
 import com.dmdirc.addons.ui_swing.dialogs.url.URLDialog;
 import com.dmdirc.addons.ui_swing.wizard.WizardListener;
 import com.dmdirc.addons.ui_swing.wizard.firstrun.SwingFirstRunWizard;
+import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.config.Identity;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.config.prefs.PluginPreferencesCategory;
@@ -114,6 +117,8 @@ public class SwingController extends BasePlugin implements UIController {
     private DMDircEventQueue eventQueue;
     /** Key listener to handle dialog key events. */
     private DialogKeyListener keyListener;
+    /** List of commands to load and unload. */
+    private final List<CommandInfo> commands = new ArrayList<CommandInfo>();
 
     /** Instantiates a new SwingController. */
     public SwingController() {
@@ -491,9 +496,21 @@ public class SwingController extends BasePlugin implements UIController {
                     "Main frame not created. Unable to continue.");
         }
 
+        loadCommands();
+
         WindowManager.getWindowManager().addListenerAndSync(windowFactory);
     }
 
+    /** Loads the commands provided by this plugin. */
+    private void loadCommands() {
+        commands.add(ServerSettings.INFO);
+        commands.add(ChannelSettings.INFO);
+        CommandManager.getCommandManager().registerCommand(
+                new ServerSettings(), ServerSettings.INFO);
+        CommandManager.getCommandManager().registerCommand(
+                new ChannelSettings(), ChannelSettings.INFO);
+    }
+
     /** {@inheritDoc} */
     @Override
     public void onUnload() {
@@ -509,6 +526,14 @@ public class SwingController extends BasePlugin implements UIController {
         for (java.awt.Window window : getTopLevelWindows()) {
             window.dispose();
         }
+        unloadCommands();
+    }
+
+    /** Unloads the commands loaded by this plugin. */
+    private void unloadCommands() {
+        for (CommandInfo command : commands) {
+            CommandManager.getCommandManager().unregisterCommand(command);
+        }
     }
 
     /** {@inheritDoc} */

src/com/dmdirc/addons/ui_swing/actions/CommandAction.java

@@ -75,7 +75,7 @@ public class CommandAction extends AbstractAction {
     @Override
     public void actionPerformed(final ActionEvent e) {
         for (String line : command.split("\n")) {
-            parser.parseCommand(window.getContainer(), window, line);
+            parser.parseCommand(window.getContainer(), line);
         }
     }
 

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

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing.commands;
+
+import com.dmdirc.FrameContainer;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.commandparser.BaseCommandInfo;
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.commandparser.CommandType;
+import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.CommandOptions;
+import com.dmdirc.commandparser.commands.IntelligentCommand;
+import com.dmdirc.commandparser.commands.context.ChannelCommandContext;
+import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.ui.input.AdditionalTabTargets;
+
+/**
+ * Opens the channel settings window for the channel.
+ */
+@CommandOptions(allowOffline = false)
+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);
+
+    /** {@inheritDoc} */
+    @Override
+    public void execute(final FrameContainer origin,
+            final CommandArguments args, final CommandContext context) {
+        ((SwingController) PluginManager.getPluginManager()
+                .getPluginInfoByName("ui_swing").getPlugin())
+                .showChannelSettingsDialog(((ChannelCommandContext) context)
+                .getChannel());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
+        return new AdditionalTabTargets().excludeAll();
+    }
+}

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

@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes,
+ * Simon Mott
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+package com.dmdirc.addons.ui_swing.commands;
+
+import com.dmdirc.FrameContainer;
+import com.dmdirc.addons.ui_swing.SwingController;
+import com.dmdirc.commandparser.BaseCommandInfo;
+import com.dmdirc.commandparser.CommandArguments;
+import com.dmdirc.commandparser.CommandInfo;
+import com.dmdirc.commandparser.CommandType;
+import com.dmdirc.commandparser.commands.Command;
+import com.dmdirc.commandparser.commands.CommandOptions;
+import com.dmdirc.commandparser.commands.IntelligentCommand;
+import com.dmdirc.commandparser.commands.context.CommandContext;
+import com.dmdirc.plugins.PluginManager;
+import com.dmdirc.ui.input.AdditionalTabTargets;
+
+/**
+ * Opens the server settings window for the server.
+ *
+ * @since 0.6.4
+ */
+@CommandOptions(allowOffline=false)
+public class ServerSettings extends Command implements IntelligentCommand {
+
+    /** A command info object for this command. */
+    public static final CommandInfo INFO = new BaseCommandInfo("serversettings",
+            "serversettings - opens the server settings window",
+            CommandType.TYPE_SERVER);
+
+    /** {@inheritDoc} */
+    @Override
+    public void execute(final FrameContainer origin,
+            final CommandArguments args, final CommandContext context) {
+        ((SwingController) PluginManager.getPluginManager()
+                .getPluginInfoByName("ui_swing").getPlugin())
+                .showServerSettingsDialog(context.getSource().getServer());
+    }
+
+    /** {@inheritDoc} */
+    @Override
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
+        return new AdditionalTabTargets().excludeAll();
+    }
+}

src/com/dmdirc/addons/ui_swing/components/TopicBar.java

@@ -101,7 +101,7 @@ public class TopicBar extends JComponent implements ActionListener,
     /**
      * Instantiates a new topic bar.
      *
-     * @param window Parent window
+     * @param parentWindow Parent window
      * @param channelFrame Parent channel frame
      */
     public TopicBar(final Window parentWindow,
@@ -129,7 +129,8 @@ public class TopicBar extends JComponent implements ActionListener,
                 getIcon("close-active"));
 
         final SwingInputHandler handler = new SwingInputHandler(topicText,
-                channelFrame.getContainer().getCommandParser(), channelFrame);
+                channelFrame.getContainer().getCommandParser(),
+                channelFrame.getContainer());
         handler.setTypes(true, false, true, false);
         handler.setTabCompleter(channel.getTabCompleter());
 

src/com/dmdirc/addons/ui_swing/components/frames/ChannelFrame.java

@@ -98,7 +98,7 @@ public final class ChannelFrame extends InputTextFrame implements ActionListener
                 CoreActionType.CLIENT_CLOSING);
 
         setInputHandler(new SwingInputHandler(getInputField(),
-                owner.getCommandParser(), this));
+                owner.getCommandParser(), getContainer()));
 
         identity = IdentityManager.getChannelConfig(owner.getServer().
                 getNetwork(), owner.getChannelInfo().getName());

src/com/dmdirc/addons/ui_swing/components/frames/CustomInputFrame.java

@@ -55,7 +55,7 @@ public class CustomInputFrame extends InputTextFrame {
         super(controller, owner);
 
         setInputHandler(new SwingInputHandler(getInputField(),
-                owner.getCommandParser(), this));
+                owner.getCommandParser(), getContainer()));
 
         initComponents();
     }

src/com/dmdirc/addons/ui_swing/components/frames/ServerFrame.java

@@ -74,7 +74,7 @@ public final class ServerFrame extends InputTextFrame implements
         initComponents();
 
         setInputHandler(new SwingInputHandler(getInputField(),
-                owner.getCommandParser(), this));
+                owner.getCommandParser(), getContainer()));
 
         owner.addCertificateProblemListener(this);
     }

src/com/dmdirc/addons/ui_swing/components/frames/TextFrame.java

@@ -169,7 +169,7 @@ public abstract class TextFrame extends JPanel implements Window,
      * Initialises the components for this frame.
      */
     private void initComponents() {
-        setTextPane(new TextPane(this));
+        setTextPane(new TextPane(getController(), this));
 
         searchBar = new SwingSearchBar(this);
         searchBar.setVisible(false);
@@ -251,14 +251,14 @@ public abstract class TextFrame extends JPanel implements Window,
 
     /** {@inheritDoc} */
     @Override
-    public void mouseClicked(final ClickTypeValue clickType,
+    public void mouseClicked(final ClickTypeValue clicktype,
             final MouseEventType eventType, final MouseEvent event) {
         if (event.isPopupTrigger()) {
-            showPopupMenuInternal(clickType, event.getPoint());
+            showPopupMenuInternal(clicktype, event.getPoint());
         }
         if (eventType == MouseEventType.CLICK
                 && event.getButton() == MouseEvent.BUTTON1) {
-            handleLinkClick(clickType);
+            handleLinkClick(clicktype);
         }
     }
 

src/com/dmdirc/addons/ui_swing/components/inputfields/SwingInputHandler.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_swing.components.inputfields;
 
+import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.addons.ui_swing.Apple;
 import com.dmdirc.addons.ui_swing.UIUtilities;
 import com.dmdirc.addons.ui_swing.components.LoggingSwingWorker;
@@ -30,7 +31,6 @@ import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.interfaces.InputField;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
@@ -57,7 +57,8 @@ public class SwingInputHandler extends InputHandler implements KeyListener {
      * @param parentWindow The window that owns this input handler
      */
     public SwingInputHandler(final InputField target,
-            final CommandParser commandParser, final InputWindow parentWindow) {
+            final CommandParser commandParser,
+            final WritableFrameContainer parentWindow) {
         super(target, commandParser, parentWindow);
     }
 

src/com/dmdirc/addons/ui_swing/dialogs/channelsetting/TopicDisplayPane.java

@@ -110,7 +110,7 @@ public class TopicDisplayPane extends JPanel implements DocumentListener {
         topicText.setRows(5);
         topicText.setColumns(30);
         final SwingInputHandler handler = new SwingInputHandler(topicText,
-                channel.getCommandParser(), channelWindow);
+                channel.getCommandParser(), channelWindow.getContainer());
         handler.setTypes(true, false, true, false);
         handler.setTabCompleter(channel.getTabCompleter());
 

src/com/dmdirc/addons/ui_swing/dialogs/paste/PasteDialog.java

@@ -125,7 +125,7 @@ public final class PasteDialog extends StandardDialog implements ActionListener,
         textField.setRows(10);
 
         new SwingInputHandler(textField, parent.getContainer()
-                .getCommandParser(), parent)
+                .getCommandParser(), parent.getContainer())
                 .setTypes(false, false, true,false);
 
         scrollPane.setViewportView(textField);

src/com/dmdirc/addons/ui_swing/textpane/TextPane.java

@@ -24,6 +24,7 @@ package com.dmdirc.addons.ui_swing.textpane;
 
 import com.dmdirc.addons.ui_swing.SwingController;
 import com.dmdirc.addons.ui_swing.UIUtilities;
+import com.dmdirc.addons.ui_swing.components.frames.TextFrame;
 import com.dmdirc.interfaces.ConfigChangeListener;
 import com.dmdirc.ui.interfaces.Window;
 import com.dmdirc.ui.messages.IRCDocument;
@@ -81,9 +82,10 @@ public final class TextPane extends JComponent implements MouseWheelListener,
     /**
      * Creates a new instance of TextPane.
      *
+     * @param controller Parent swing controller
      * @param frame Parent Frame
      */
-    public TextPane(final Window frame) {
+    public TextPane(final SwingController controller, final TextFrame frame) {
         super();
         this.frame = frame;
 
@@ -106,9 +108,8 @@ public final class TextPane extends JComponent implements MouseWheelListener,
         add(scrollBar, "dock east");
         scrollBar.addAdjustmentListener(this);
         scrollBar.addAdjustmentListener(canvas);
-        frame.getContainer().getConfigManager().addChangeListener(
-                ((SwingController) frame.getController()).getDomain(),
-                "textpanelinenotification", this);
+        frame.getContainer().getConfigManager().addChangeListener(controller
+                .getDomain(), "textpanelinenotification", this);
         configChanged("", "textpanelinenotification");
 
         addMouseWheelListener(this);

src/com/dmdirc/addons/ui_web/uicomponents/WebInputHandler.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.ui_web.uicomponents;
 
+import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.parsers.CommandParser;
 import com.dmdirc.ui.input.InputHandler;
 import com.dmdirc.ui.input.TabCompleter;
@@ -35,7 +36,7 @@ public class WebInputHandler extends InputHandler {
 
     public WebInputHandler(final InputField thisTarget,
                            final CommandParser thisCommandParser,
-                           final WebInputWindow thisParentWindow) {
+                           final WritableFrameContainer thisParentWindow) {
         super(thisTarget, thisCommandParser, thisParentWindow);
     }
 

src/com/dmdirc/addons/ui_web/uicomponents/WebInputWindow.java

@@ -52,7 +52,7 @@ public class WebInputWindow extends WebWindow implements InputWindow {
         this.parent = parent;
         this.commandparser = parent.getCommandParser();
         this.inputhandler = new WebInputHandler(new WebInputField(),
-                commandparser, this);
+                commandparser, getContainer());
     }
 
     /** {@inheritDoc} */
@@ -64,7 +64,7 @@ public class WebInputWindow extends WebWindow implements InputWindow {
     public InputHandler getInputHandler(final String clientID) {
         if (!inputHandlers.containsKey(clientID)) {
             final WebInputHandler ih = new WebInputHandler(
-                    new WebInputField(clientID), commandparser, this);
+                    new WebInputField(clientID), commandparser, getContainer());
             ih.setTabCompleter(inputhandler.getTabCompleter());
             inputHandlers.put(clientID, ih);
         }

test/com/dmdirc/addons/redirect/RedirectCommandTest.java

@@ -52,8 +52,8 @@ public class RedirectCommandTest {
         when(window.getContainer().getConfigManager()).thenReturn(IdentityManager.getGlobalConfig());
 
         command.execute(target, new CommandArguments("/redirect /echo test"),
-                new ChatCommandContext(window, command, target));
-        
+                new ChatCommandContext(window.getContainer(), command, target));
+
         verify(target).sendLine("test");
     }