Parcourir la source

Plugin changes for core TabCompletion updates.

Change-Id: Ibfe55b87e9bde40638f3b169153c653d59c6d6f0
Depends-On: I80df12d3494a651bc63117d26b1caf94771a51dd
Reviewed-on: http://gerrit.dmdirc.com/3863
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
changes/63/3863/2
Chris Smith il y a 9 ans
Parent
révision
9290cf3d2d

+ 2
- 2
activewindow/src/com/dmdirc/addons/activewindow/ActiveCommand.java Voir le fichier

@@ -34,7 +34,7 @@ import com.dmdirc.commandparser.commands.IntelligentCommand;
34 34
 import com.dmdirc.commandparser.commands.context.CommandContext;
35 35
 import com.dmdirc.interfaces.CommandController;
36 36
 import com.dmdirc.ui.input.AdditionalTabTargets;
37
-import com.dmdirc.ui.input.TabCompleter;
37
+import com.dmdirc.ui.input.TabCompleterUtils;
38 38
 
39 39
 import javax.annotation.Nonnull;
40 40
 import javax.inject.Inject;
@@ -78,7 +78,7 @@ public class ActiveCommand extends Command implements IntelligentCommand {
78 78
     @Override
79 79
     public AdditionalTabTargets getSuggestions(final int arg,
80 80
             final IntelligentCommandContext context) {
81
-        return TabCompleter.getIntelligentResults(arg, context, 0);
81
+        return TabCompleterUtils.getIntelligentResults(arg, context, 0);
82 82
     }
83 83
 
84 84
 }

+ 6
- 6
nowplaying/src/com/dmdirc/addons/nowplaying/NowPlayingCommand.java Voir le fichier

@@ -35,7 +35,7 @@ import com.dmdirc.interfaces.CommandController;
35 35
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
36 36
 import com.dmdirc.plugins.PluginDomain;
37 37
 import com.dmdirc.ui.input.AdditionalTabTargets;
38
-import com.dmdirc.ui.input.TabCompleter;
38
+import com.dmdirc.ui.input.TabCompleterUtils;
39 39
 
40 40
 import java.util.Arrays;
41 41
 import java.util.List;
@@ -181,7 +181,7 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
181 181
         });
182 182
 
183 183
         if (arg == 0) {
184
-            final AdditionalTabTargets res = TabCompleter.
184
+            final AdditionalTabTargets res = TabCompleterUtils.
185 185
                     getIntelligentResults(arg, context, 0);
186 186
             res.add("--sources");
187 187
             res.add("--source");
@@ -197,14 +197,14 @@ public class NowPlayingCommand extends Command implements IntelligentCommand {
197 197
             }
198 198
             return res;
199 199
         } else if (arg > 1 && context.getPreviousArgs().get(0).equalsIgnoreCase("--source")) {
200
-            final AdditionalTabTargets res = TabCompleter
200
+            final AdditionalTabTargets res = TabCompleterUtils
201 201
                     .getIntelligentResults(arg, context, 2);
202 202
             res.addAll(subsList);
203 203
             return res;
204 204
         } else {
205
-            final AdditionalTabTargets res = TabCompleter
206
-                    .getIntelligentResults(arg, context, context
207
-                            .getPreviousArgs().get(0).equalsIgnoreCase("--sources") ? 1 : 0);
205
+            final AdditionalTabTargets res = TabCompleterUtils
206
+                    .getIntelligentResults(arg, context,
207
+                            context.getPreviousArgs().get(0).equalsIgnoreCase("--sources") ? 1 : 0);
208 208
             res.addAll(subsList);
209 209
             return res;
210 210
         }

+ 2
- 2
redirect/src/com/dmdirc/addons/redirect/RedirectCommand.java Voir le fichier

@@ -34,7 +34,7 @@ import com.dmdirc.commandparser.commands.context.CommandContext;
34 34
 import com.dmdirc.interfaces.CommandController;
35 35
 import com.dmdirc.messages.MessageSinkManager;
36 36
 import com.dmdirc.ui.input.AdditionalTabTargets;
37
-import com.dmdirc.ui.input.TabCompleter;
37
+import com.dmdirc.ui.input.TabCompleterUtils;
38 38
 import com.dmdirc.util.URLBuilder;
39 39
 
40 40
 import javax.annotation.Nonnull;
@@ -89,7 +89,7 @@ public class RedirectCommand extends Command implements IntelligentCommand {
89 89
     @Override
90 90
     public AdditionalTabTargets getSuggestions(final int arg,
91 91
             final IntelligentCommandContext context) {
92
-        return TabCompleter.getIntelligentResults(arg, context, 0);
92
+        return TabCompleterUtils.getIntelligentResults(arg, context, 0);
93 93
     }
94 94
 
95 95
 }

Chargement…
Annuler
Enregistrer