Changes for intelligent command completion

Depends-On: I8d6b252b49ea7ae64d8bddd5c31dfb228465a4f6
Change-Id: Ib7f049ebe0c771bf7dc43334c6aed9568e0e8d72
Reviewed-on: http://gerrit.dmdirc.com/989
Automatic-Compile: Gregory Holmes <greg@dmdirc.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>

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

@@ -38,7 +38,6 @@ import com.dmdirc.ui.input.TabCompletionType;
 import com.dmdirc.ui.interfaces.InputWindow;
 
 import java.io.File;
-import java.util.List;
 
 import javax.swing.JFileChooser;
 import javax.swing.JFrame;
@@ -240,7 +239,8 @@ public final class DCCCommand extends ServerCommand implements IntelligentComman
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
 
         if (arg == 0) {

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

@@ -32,7 +32,6 @@ import com.dmdirc.plugins.PluginInfo;
 import com.dmdirc.plugins.PluginManager;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.interfaces.InputWindow;
-import java.util.List;
 
 /**
  * The dcop command retrieves information from a dcop application.
@@ -99,7 +98,8 @@ public final class LoggingCommand extends ServerCommand implements IntelligentCo
      * @return A list of suggestions for the argument
      */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
         if (arg == 0) {
             res.add("reload");

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

@@ -171,16 +171,16 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
     
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, 
-            final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
 
         if (arg == 0) {
             final AdditionalTabTargets res = TabCompleter.
-                    getIntelligentResults(arg, previousArgs, 0);
+                    getIntelligentResults(arg, context, 0);
             res.add("--sources");
             res.add("--source");
             return res;
-        } else if (arg == 1 && previousArgs.get(0).equalsIgnoreCase("--source")) {
+        } else if (arg == 1 && context.getPreviousArgs().get(0).equalsIgnoreCase("--source")) {
             final AdditionalTabTargets res = new AdditionalTabTargets();
             res.excludeAll();
             for (MediaSource source : parent.getSources()) {
@@ -189,11 +189,11 @@ public final class NowPlayingCommand extends ChatCommand implements IntelligentC
                 }
             }
             return res;
-        } else if (arg > 1 && previousArgs.get(0).equalsIgnoreCase("--source")) {
-            return TabCompleter.getIntelligentResults(arg, previousArgs, 2);
+        } else if (arg > 1 && context.getPreviousArgs().get(0).equalsIgnoreCase("--source")) {
+            return TabCompleter.getIntelligentResults(arg, context, 2);
         } else {
-            return TabCompleter.getIntelligentResults(arg, previousArgs,
-                    previousArgs.get(0).equalsIgnoreCase("--sources") ? 1 : 0);
+            return TabCompleter.getIntelligentResults(arg, context,
+                    context.getPreviousArgs().get(0).equalsIgnoreCase("--sources") ? 1 : 0);
         }
     }
 }

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

@@ -28,9 +28,7 @@ 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;
-import java.util.List;
 
 /**
  * The osd command shows an on screen message.
@@ -103,12 +101,13 @@ public final class OsdCommand extends GlobalCommand implements IntelligentComman
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
         
         if (arg == 0) {
             res.add("--close");
-        } else if (arg > 0 && previousArgs.get(0).equals("--close")) {
+        } else if (arg > 0 && context.getPreviousArgs().get(0).equals("--close")) {
             res.excludeAll();
         }
         

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

@@ -30,7 +30,6 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.interfaces.InputWindow;
-import java.util.List;
 
 /**
  * The redirect command allows the user to redirect the output from another
@@ -72,8 +71,9 @@ public class RedirectCommand extends ChatCommand implements IntelligentCommand {
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
-        return TabCompleter.getIntelligentResults(arg, previousArgs, 0);
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
+        return TabCompleter.getIntelligentResults(arg, context, 0);
     }
     
 }

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

@@ -29,7 +29,6 @@ import com.dmdirc.commandparser.commands.GlobalCommand;
 import com.dmdirc.ui.interfaces.InputWindow;
 import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
-import com.dmdirc.ui.input.TabCompletionType;
 
 import java.util.LinkedList;
 import java.util.List;
@@ -37,7 +36,6 @@ import java.util.Map;
 import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
-
 import java.lang.reflect.Method;
 
 /**
@@ -188,7 +186,8 @@ public final class ScriptCommand extends GlobalCommand implements IntelligentCom
      * @return A list of suggestions for the argument
      */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         final AdditionalTabTargets res = new AdditionalTabTargets();
         
         res.excludeAll();
@@ -202,11 +201,11 @@ public final class ScriptCommand extends GlobalCommand implements IntelligentCom
             res.add("savetobasefile");
         } else if (arg == 1) {
             final Map<String,ScriptEngineWrapper> scripts = myPlugin.getScripts();
-            if (previousArgs.get(0).equalsIgnoreCase("load")) {
+            if (context.getPreviousArgs().get(0).equalsIgnoreCase("load")) {
                 for (String filename : getPossibleScripts()) {
                     res.add(filename);
                 }
-            } else if (previousArgs.get(0).equalsIgnoreCase("unload")) {
+            } else if (context.getPreviousArgs().get(0).equalsIgnoreCase("unload")) {
                 for (String filename : scripts.keySet()) {
                     res.add(filename);
                 }

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

@@ -29,7 +29,6 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
 import com.dmdirc.ui.input.AdditionalTabTargets;
 import com.dmdirc.ui.input.TabCompleter;
 import com.dmdirc.ui.interfaces.InputWindow;
-import java.util.List;
 
 /**
  * The timer command allows users to schedule commands to occur after a certain
@@ -99,13 +98,14 @@ public final class TimerCommand extends GlobalCommand implements IntelligentComm
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         AdditionalTabTargets res;
         
         if (arg <= 1) {
             res = new AdditionalTabTargets().excludeAll();
         } else {
-            res = TabCompleter.getIntelligentResults(arg, previousArgs, 2);
+            res = TabCompleter.getIntelligentResults(arg, context, 2);
         }
         
         return res;

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

@@ -27,7 +27,7 @@ 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.List;
+
 import java.util.Map;
 
 /**
@@ -78,7 +78,8 @@ public class UrlListCommand extends GlobalCommand implements IntelligentCommand
 
     /** {@inheritDoc} */
     @Override
-    public AdditionalTabTargets getSuggestions(final int arg, final List<String> previousArgs) {
+    public AdditionalTabTargets getSuggestions(final int arg,
+            final IntelligentCommandContext context) {
         return new AdditionalTabTargets().excludeAll();
     }