Fix fallout from command changes

Change-Id: I8d60d7dd048915a173a9c566a58260ac4cb8f1db
Reviewed-on: http://gerrit.dmdirc.com/1117
Automatic-Compile: Gregory Holmes <greg@dmdirc.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>

src/com/dmdirc/addons/audio/AudioCommand.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.audio;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
@@ -46,7 +47,7 @@ public final class AudioCommand extends GlobalCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
                         final CommandArguments args) {
         final String filename = args.getArgumentsAsString();
         final File file = new File(filename);

src/com/dmdirc/addons/audio/BeepCommand.java

@@ -22,10 +22,10 @@
 
 package com.dmdirc.addons.audio;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.awt.Toolkit;
 
@@ -46,7 +46,7 @@ public final class BeepCommand extends GlobalCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
                         final CommandArguments args) {
         Toolkit.getDefaultToolkit().beep();
     }

src/com/dmdirc/addons/calc/CalcCommand.java

@@ -22,9 +22,10 @@
 
 package com.dmdirc.addons.calc;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.GlobalCommand;
-import com.dmdirc.ui.interfaces.InputWindow;
+
 import java.text.ParseException;
 
 /**
@@ -37,7 +38,7 @@ public class CalcCommand extends GlobalCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
         try {
             int offset = 0;

src/com/dmdirc/addons/dcc/DCCCommand.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.dcc;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Main;
 import com.dmdirc.Server;
 import com.dmdirc.actions.ActionManager;
@@ -35,7 +36,6 @@ import com.dmdirc.config.IdentityManager;
 import com.dmdirc.parser.interfaces.Parser;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompletionType;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.io.File;
 
@@ -66,7 +66,7 @@ public final class DCCCommand extends ServerCommand implements IntelligentComman
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length > 1) {
             final String type = args.getArguments()[0];
@@ -136,7 +136,7 @@ public final class DCCCommand extends ServerCommand implements IntelligentComman
      * @param filename The file to send
      * @since 0.6.3m1
      */
-    public void sendFile(final String target, final InputWindow origin,
+    public void sendFile(final String target, final FrameContainer origin,
             final Server server, final boolean isSilent, final String filename) {
         // New thread to ask the user what file to send
         final File givenFile = new File(filename);

src/com/dmdirc/addons/dcc/DCCCommandParser.java

@@ -22,13 +22,14 @@
 
 package com.dmdirc.addons.dcc;
 
+import com.dmdirc.FrameContainer;
+import com.dmdirc.WritableFrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.CommandType;
 import com.dmdirc.commandparser.commands.Command;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.parsers.CommandParser;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * DCC CommandParser
@@ -76,7 +77,8 @@ public class DCCCommandParser extends CommandParser {
      * @param args The arguments to the command
      */
     @Override
-    protected void executeCommand(final InputWindow origin, final boolean isSilent, final Command command, final CommandArguments args) {
+    protected void executeCommand(final FrameContainer origin,
+            final boolean isSilent, final Command command, final CommandArguments args) {
         ((GlobalCommand) command).execute(origin, isSilent, args);
     }
 
@@ -89,8 +91,8 @@ public class DCCCommandParser extends CommandParser {
      * @param line The line input by the user
      */
     @Override
-    protected void handleNonCommand(final InputWindow origin, final String line) {
-        origin.getContainer().sendLine(line);
+    protected void handleNonCommand(final FrameContainer origin, final String line) {
+        ((WritableFrameContainer) origin).sendLine(line);
     }
 
 }

src/com/dmdirc/addons/dcop/DcopCommand.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.dcop;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
@@ -47,7 +48,7 @@ public final class DcopCommand extends ServerCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length != 3) {
             showUsage(origin, isSilent, "dcop", "<app> <object> <function>");

src/com/dmdirc/addons/dns/DNSCommand.java

@@ -22,10 +22,10 @@
 
 package com.dmdirc.addons.dns;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.util.Timer;
 import java.util.TimerTask;
@@ -44,7 +44,7 @@ public final class DNSCommand extends GlobalCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
         if (args.getArguments().length == 0) {
             showUsage(origin, isSilent, "dns", "<IP|hostname>");

src/com/dmdirc/addons/freedesktop_notifications/FDNotifyCommand.java

@@ -22,10 +22,10 @@
 
 package com.dmdirc.addons.freedesktop_notifications;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The FDNotify Command shows a nice popup on using the FreeDesktop
@@ -50,7 +50,8 @@ public final class FDNotifyCommand extends GlobalCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent, final CommandArguments args) {
+    public void execute(final FrameContainer origin, final boolean isSilent,
+            final CommandArguments args) {
         myPlugin.showNotification("", args.getArgumentsAsString());
     }
     

src/com/dmdirc/addons/logging/LoggingCommand.java

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.logging;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
@@ -50,7 +51,7 @@ public final class LoggingCommand extends ServerCommand implements IntelligentCo
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
                         final boolean isSilent, final CommandArguments args) {
         final PluginInfo pluginInfo = PluginManager.getPluginManager().getPluginInfoByName("logging");
         if (pluginInfo == null) {
@@ -74,7 +75,7 @@ public final class LoggingCommand extends ServerCommand implements IntelligentCo
                     sendLine(origin, isSilent, FORMAT_ERROR, "Plugin failed to reload.");
                 }
             } else if (args.getArguments()[0].equalsIgnoreCase("history")) {
-                if (!plugin.showHistory(origin)) {
+                if (!plugin.showHistory((InputWindow) origin.getFrame())) {
                     sendLine(origin, isSilent, FORMAT_ERROR, "Unable to open history for this window.");
                 }
             } else if (args.getArguments()[0].equalsIgnoreCase("help")) {

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.nowplaying;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.MessageTarget;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
@@ -31,7 +32,6 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.util.Arrays;
 import java.util.List;
@@ -61,7 +61,7 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final MessageTarget target, final boolean isSilent, final CommandArguments args) {
         if (args.getArguments().length > 0 && args.getArguments()[0]
                 .equalsIgnoreCase("--sources")) {
@@ -104,7 +104,7 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
      * @param isSilent Whether this command is being silenced
      * @param format Format to be passed to getInformation
      */
-    private void doSourceList(final InputWindow origin, final boolean isSilent,
+    private void doSourceList(final FrameContainer origin, final boolean isSilent,
             final String format) {
         final List<MediaSource> sources = parent.getSources();
         

src/com/dmdirc/addons/osd/OsdCommand.java

@@ -22,12 +22,12 @@
 
 package com.dmdirc.addons.osd;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.ui.messages.Styliser;
 
 /**
@@ -70,7 +70,7 @@ public final class OsdCommand extends GlobalCommand implements IntelligentComman
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
         if (args.getArguments().length > 0
                 && "--close".equalsIgnoreCase(args.getArguments()[0])) {

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

@@ -22,6 +22,7 @@
 
 package com.dmdirc.addons.redirect;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.MessageTarget;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
@@ -29,7 +30,6 @@ import com.dmdirc.commandparser.commands.ChatCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The redirect command allows the user to redirect the output from another
@@ -45,9 +45,9 @@ public class RedirectCommand extends ChatCommand implements IntelligentCommand {
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final MessageTarget target, final boolean isSilent, final CommandArguments args) {
-        target.getFrame().getCommandParser().parseCommand(new FakeInputWindow(target),
+        target.getFrame().getCommandParser().parseCommand(target, // TODO: This doesn't redirect
                 args.getArgumentsAsString());
     }
     

src/com/dmdirc/addons/scriptplugin/ScriptCommand.java

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.scriptplugin;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.config.IdentityManager;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
-import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 
@@ -56,16 +56,9 @@ public final class ScriptCommand extends GlobalCommand implements IntelligentCom
         CommandManager.registerCommand(this);
     }
         
-    /**
-     * Executes this command.
-     *
-     * @param origin The frame in which this command was issued
-     * @param server The server object that this command is associated with
-     * @param isSilent Whether this command is silenced or not
-     * @param args The user supplied arguments
-     */
+    /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent, final CommandArguments commandArgs) {
+    public void execute(final FrameContainer origin, final boolean isSilent, final CommandArguments commandArgs) {
         final String[] args = commandArgs.getArguments();
     
         if (args.length > 0 && (args[0].equalsIgnoreCase("rehash") || args[0].equalsIgnoreCase("reload"))) {
@@ -178,13 +171,7 @@ public final class ScriptCommand extends GlobalCommand implements IntelligentCom
         }
     }
 
-    /**
-     * Returns a list of suggestions for the specified argument, given the list
-     * of previous arguments.
-     * @param arg The argument that is being completed
-     * @param previousArgs The contents of the previous arguments, if any
-     * @return A list of suggestions for the argument
-     */
+    /** {@inheritDoc} */
     @Override
     public AdditionalTabTargets getSuggestions(final int arg,
             final IntelligentCommandContext context) {

src/com/dmdirc/addons/systray/PopupCommand.java

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.systray;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.Server;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.ServerCommand;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The /popup command allows the user to show a popup message from the system
@@ -64,7 +64,7 @@ public final class PopupCommand extends ServerCommand {
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final Server server,
+    public void execute(final FrameContainer origin, final Server server,
             final boolean isSilent, final CommandArguments args) {
         showPopup("DMDirc", args.getArgumentsAsString());
     }

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

@@ -22,9 +22,10 @@
 
 package com.dmdirc.addons.time;
 
+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.InputWindow;
 
 import java.util.Timer;
 import java.util.TimerTask;
@@ -41,7 +42,7 @@ public final class TimedCommand extends TimerTask {
     private final String command;
     
     /** The window to use for executing commands. */
-    private final InputWindow origin;
+    private final FrameContainer origin;
     
     /** The timer we're using for scheduling this command. */
     private final Timer timer;
@@ -54,7 +55,7 @@ public final class TimedCommand extends TimerTask {
      * @param origin The command window to use for the execution
      */
     public TimedCommand(final int repetitions, final int delay,
-            final String command, final InputWindow origin) {
+            final String command, final FrameContainer origin) {
         super();
         
         this.repetitions = repetitions;
@@ -72,7 +73,7 @@ public final class TimedCommand extends TimerTask {
         if (origin == null) {
             parser = GlobalCommandParser.getGlobalCommandParser();
         } else {
-            parser = origin.getCommandParser();
+            parser = ((WritableFrameContainer) origin).getFrame().getCommandParser();
         }
         
         parser.parseCommand(origin, command);

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

@@ -22,13 +22,13 @@
 
 package com.dmdirc.addons.time;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.CommandManager;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 /**
  * The timer command allows users to schedule commands to occur after a certain
@@ -46,7 +46,7 @@ public final class TimerCommand extends GlobalCommand implements IntelligentComm
     
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent, 
+    public void execute(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
         if (args.getArguments().length < 3) {
             doUsage(origin, isSilent);
@@ -73,7 +73,7 @@ public final class TimerCommand extends GlobalCommand implements IntelligentComm
      * @param origin The window that the command was entered in
      * @param isSilent Whether this command is being silenced or not
      */
-    private void doUsage(final InputWindow origin, final boolean isSilent) {
+    private void doUsage(final FrameContainer origin, final boolean isSilent) {
         showUsage(origin, isSilent, "timer", "<repetitions> <interval> <command>");
     }
     

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

@@ -74,7 +74,7 @@ public class CommandAction extends AbstractAction {
      */
     @Override
     public void actionPerformed(final ActionEvent e) {
-        parser.parseCommand(window, command);
+        parser.parseCommand(window.getContainer(), command);
     }
     
 }

src/com/dmdirc/addons/urlcatcher/UrlListCommand.java

@@ -22,11 +22,11 @@
 
 package com.dmdirc.addons.urlcatcher;
 
+import com.dmdirc.FrameContainer;
 import com.dmdirc.commandparser.CommandArguments;
 import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.util.Map;
 
@@ -44,7 +44,7 @@ public class UrlListCommand extends GlobalCommand implements IntelligentCommand
 
     /** {@inheritDoc} */
     @Override
-    public void execute(final InputWindow origin, final boolean isSilent,
+    public void execute(final FrameContainer origin, final boolean isSilent,
             final CommandArguments args) {
         final String[] headers = {"URL", "Count"};
         final Map<String, Integer> map = plugin.getURLS();

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

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