Skip to content

Commit 6be4737

Browse files
Traqueur-devTraqueur-dev
committed
fix: rename class
1 parent db88021 commit 6be4737

File tree

8 files changed

+34
-36
lines changed

8 files changed

+34
-36
lines changed

‎src/main/java/fr/traqueur/commands/api/Command.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package fr.traqueur.commands.api;
22

33
import fr.traqueur.commands.api.arguments.Argument;
4-
import fr.traqueur.commands.api.arguments.TabConverter;
4+
import fr.traqueur.commands.api.arguments.TabCompleter;
55
import fr.traqueur.commands.api.exceptions.ArgsWithInfiniteArgumentException;
66
import fr.traqueur.commands.api.requirements.Requirement;
77
import org.bukkit.command.CommandSender;
@@ -323,7 +323,7 @@ public final void addArgs(String arg, Class<?> type) {
323323
this.addArgs(arg, type,null);
324324
}
325325

326-
public final void addArgs(String arg, TabConverter converter) {
326+
public final void addArgs(String arg, TabCompleter converter) {
327327
if(!arg.contains(CommandManager.TYPE_PARSER)) {
328328
this.addArgs(arg, String.class, converter);
329329
} else {
@@ -336,7 +336,7 @@ public final void addArgs(String arg, TabConverter converter) {
336336
* @param arg The argument to add.
337337
* @param converter The converter of the argument.
338338
*/
339-
public final void addArgs(String arg, Class<?> type, TabConverter converter) {
339+
public final void addArgs(String arg, Class<?> type, TabCompleter converter) {
340340
if (arg.contains(CommandManager.TYPE_PARSER) && type != null) {
341341
throw new IllegalArgumentException("You can't use the type parser in the command arguments.");
342342
}
@@ -388,7 +388,7 @@ public final void addOptionalArgs(String arg, Class<?> type) {
388388
this.addOptionalArgs(arg, type,null);
389389
}
390390

391-
public final void addOptionalArgs(String arg, TabConverter converter) {
391+
public final void addOptionalArgs(String arg, TabCompleter converter) {
392392
if (!arg.contains(CommandManager.TYPE_PARSER)) {
393393
this.addOptionalArgs(arg, String.class, converter);
394394
return;
@@ -401,7 +401,7 @@ public final void addOptionalArgs(String arg, TabConverter converter) {
401401
* @param arg The argument to add.
402402
* @param converter The converter of the argument.
403403
*/
404-
public final void addOptionalArgs(String arg, Class<?> type, TabConverter converter) {
404+
public final void addOptionalArgs(String arg, Class<?> type, TabCompleter converter) {
405405
if (arg.contains(CommandManager.TYPE_PARSER) && type != null) {
406406
throw new IllegalArgumentException("You can't use the type parser in the command arguments.");
407407
}
@@ -412,7 +412,7 @@ public final void addOptionalArgs(String arg, Class<?> type, TabConverter conver
412412
this.add(arg, converter, true);
413413
}
414414

415-
private void add(String arg, TabConverter converter, boolean opt) {
415+
private void add(String arg, TabCompleter converter, boolean opt) {
416416
try {
417417
if (this.infiniteArgs) {
418418
throw new ArgsWithInfiniteArgumentException(false);

‎src/main/java/fr/traqueur/commands/api/CommandManager.java‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
import com.google.common.collect.Lists;
44
import fr.traqueur.commands.api.arguments.Argument;
55
import fr.traqueur.commands.api.arguments.ArgumentConverter;
6-
import fr.traqueur.commands.api.arguments.TabConverter;
6+
import fr.traqueur.commands.api.arguments.TabCompleter;
77
import fr.traqueur.commands.api.exceptions.ArgumentIncorrectException;
88
import fr.traqueur.commands.api.exceptions.TypeArgumentNotExistException;
99
import fr.traqueur.commands.api.logging.Logger;
@@ -65,7 +65,7 @@ public class CommandManager {
6565
/**
6666
* The tab completers registered in the command manager.
6767
*/
68-
private final Map<String, Map<Integer, TabConverter>> completers;
68+
private final Map<String, Map<Integer, TabCompleter>> completers;
6969

7070
/**
7171
* The executor of the command manager.
@@ -381,12 +381,12 @@ private void addCompletionForArgs(String label, int commandSize, List<Argument>
381381
String[] parts = arg.arg().split(TYPE_PARSER);
382382
String type = parts[1].trim();
383383
ArgumentConverter<?> converter = this.typeConverters.get(type).getValue();
384-
TabConverter argConverter = arg.tabConverter();
384+
TabCompleter argConverter = arg.tabConverter();
385385
if (argConverter != null) {
386386
this.addCompletion(label,commandSize + i, argConverter);
387-
} else if (converter instanceof TabConverter) {
388-
TabConverter tabConverter = (TabConverter) converter;
389-
this.addCompletion(label,commandSize + i, tabConverter);
387+
} else if (converter instanceof TabCompleter) {
388+
TabCompleter tabCompleter = (TabCompleter) converter;
389+
this.addCompletion(label,commandSize + i, tabCompleter);
390390
} else {
391391
this.addCompletion(label, commandSize + i, (sender, argsInner) -> new ArrayList<>());
392392
}
@@ -399,10 +399,10 @@ private void addCompletionForArgs(String label, int commandSize, List<Argument>
399399
* @param commandSize The size of the command.
400400
* @param converter The converter of the tab completer.
401401
*/
402-
private void addCompletion(String label, int commandSize, TabConverter converter) {
403-
Map<Integer, TabConverter> mapInner = this.completers.getOrDefault(label, new HashMap<>());
404-
TabConverter newConverter;
405-
TabConverter converterInner = mapInner.getOrDefault(commandSize, null);
402+
private void addCompletion(String label, int commandSize, TabCompleter converter) {
403+
Map<Integer, TabCompleter> mapInner = this.completers.getOrDefault(label, new HashMap<>());
404+
TabCompleter newConverter;
405+
TabCompleter converterInner = mapInner.getOrDefault(commandSize, null);
406406
if(converterInner != null) {
407407
newConverter = (sender, args) -> {
408408
List<String> completions = new ArrayList<>(converterInner.onCompletion(sender, args));
@@ -535,7 +535,7 @@ public Map<String, Command<?>> getCommands() {
535535
* Get the completers of the command manager
536536
* @return The completers of command manager
537537
*/
538-
public Map<String, Map<Integer, TabConverter>> getCompleters() {
538+
public Map<String, Map<Integer, TabCompleter>> getCompleters() {
539539
return this.completers;
540540
}
541541
}

‎src/main/java/fr/traqueur/commands/api/Executor.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
package fr.traqueur.commands.api;
22

3-
import fr.traqueur.commands.api.arguments.TabConverter;
3+
import fr.traqueur.commands.api.arguments.TabCompleter;
44
import fr.traqueur.commands.api.exceptions.ArgumentIncorrectException;
55
import fr.traqueur.commands.api.exceptions.TypeArgumentNotExistException;
66
import fr.traqueur.commands.api.logging.Messages;
77
import fr.traqueur.commands.api.requirements.Requirement;
88
import org.bukkit.ChatColor;
99
import org.bukkit.command.CommandExecutor;
1010
import org.bukkit.command.CommandSender;
11-
import org.bukkit.command.TabCompleter;
12-
import org.bukkit.entity.Player;
1311
import org.bukkit.plugin.java.JavaPlugin;
1412

1513
import java.util.*;
@@ -18,7 +16,7 @@
1816
/**
1917
* Represents the executor of the commands.
2018
*/
21-
public class Executor implements CommandExecutor, TabCompleter {
19+
public class Executor implements CommandExecutor, org.bukkit.command.TabCompleter {
2220

2321
/**
2422
* The plugin that owns the executor.
@@ -38,7 +36,7 @@ public class Executor implements CommandExecutor, TabCompleter {
3836
/**
3937
* The completers registered.
4038
*/
41-
private final Map<String, Map<Integer, TabConverter>> completers;
39+
private final Map<String, Map<Integer, TabCompleter>> completers;
4240

4341
/**
4442
* The constructor of the executor.
@@ -185,7 +183,7 @@ public List<String> onTabComplete(CommandSender commandSender, org.bukkit.comman
185183
}
186184

187185
String cmdLabel = "";
188-
Map<Integer, TabConverter> map = null;
186+
Map<Integer, TabCompleter> map = null;
189187
for (int i = args.length; i >= 0; i--) {
190188
cmdLabel = getCommandLabel(labelLower, args, i);
191189
map = this.completers.getOrDefault(cmdLabel, null);
@@ -198,7 +196,7 @@ public List<String> onTabComplete(CommandSender commandSender, org.bukkit.comman
198196
return Collections.emptyList();
199197
}
200198

201-
TabConverter converter = map.get(args.length);
199+
TabCompleter converter = map.get(args.length);
202200
String argsBeforeString = (label +
203201
"." +
204202
String.join(".", Arrays.copyOf(args, args.length - 1)))

‎src/main/java/fr/traqueur/commands/api/arguments/Argument.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,19 @@
77
public class Argument {
88

99
private final String arg;
10-
private final TabConverter tabConverter;
10+
private final TabCompleter tabCompleter;
1111

12-
public Argument(String arg, TabConverter tabConverter) {
12+
public Argument(String arg, TabCompleter tabCompleter) {
1313
this.arg = arg;
14-
this.tabConverter = tabConverter;
14+
this.tabCompleter = tabCompleter;
1515
}
1616

1717
public String arg() {
1818
return this.arg;
1919
}
2020

21-
public TabConverter tabConverter() {
22-
return this.tabConverter;
21+
public TabCompleter tabConverter() {
22+
return this.tabCompleter;
2323
}
2424

2525
}

‎src/main/java/fr/traqueur/commands/api/arguments/TabConverter.java‎ renamed to ‎src/main/java/fr/traqueur/commands/api/arguments/TabCompleter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* </p>
1212
*/
1313
@FunctionalInterface
14-
public interface TabConverter {
14+
public interface TabCompleter {
1515

1616
/**
1717
* This method is called when the tabulation is used.

‎src/main/java/fr/traqueur/commands/impl/arguments/BooleanArgument.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package fr.traqueur.commands.impl.arguments;
22

33
import fr.traqueur.commands.api.arguments.ArgumentConverter;
4-
import fr.traqueur.commands.api.arguments.TabConverter;
4+
import fr.traqueur.commands.api.arguments.TabCompleter;
55
import org.bukkit.command.CommandSender;
66

77
import java.util.Arrays;
@@ -11,7 +11,7 @@
1111
* BooleanArgument is the argument that allow to get a boolean from a string.
1212
* It's used in the CommandManager to get a boolean from a string.
1313
*/
14-
public class BooleanArgument implements ArgumentConverter<Boolean>, TabConverter {
14+
public class BooleanArgument implements ArgumentConverter<Boolean>, TabCompleter {
1515

1616
@Override
1717
public Boolean apply(String s) {

‎src/main/java/fr/traqueur/commands/impl/arguments/OfflinePlayerArgument.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package fr.traqueur.commands.impl.arguments;
22

33
import fr.traqueur.commands.api.arguments.ArgumentConverter;
4-
import fr.traqueur.commands.api.arguments.TabConverter;
4+
import fr.traqueur.commands.api.arguments.TabCompleter;
55
import org.bukkit.Bukkit;
66
import org.bukkit.OfflinePlayer;
77
import org.bukkit.command.CommandSender;
@@ -13,7 +13,7 @@
1313
/**
1414
* Argument used to parse an {@link OfflinePlayer} from a string.
1515
*/
16-
public class OfflinePlayerArgument implements ArgumentConverter<OfflinePlayer>, TabConverter {
16+
public class OfflinePlayerArgument implements ArgumentConverter<OfflinePlayer>, TabCompleter {
1717

1818
/**
1919
* {@inheritDoc}

‎src/main/java/fr/traqueur/commands/impl/arguments/PlayerArgument.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package fr.traqueur.commands.impl.arguments;
22

33
import fr.traqueur.commands.api.arguments.ArgumentConverter;
4-
import fr.traqueur.commands.api.arguments.TabConverter;
4+
import fr.traqueur.commands.api.arguments.TabCompleter;
55
import org.bukkit.Bukkit;
66
import org.bukkit.command.CommandSender;
77
import org.bukkit.entity.Player;
@@ -12,7 +12,7 @@
1212
/**
1313
* Argument converter for {@link Player}.
1414
*/
15-
public class PlayerArgument implements ArgumentConverter<Player>, TabConverter {
15+
public class PlayerArgument implements ArgumentConverter<Player>, TabCompleter {
1616

1717
/**
1818
* {@inheritDoc}

0 commit comments

Comments
 (0)