From cbb03e7827017f26995f12275d597850ba4ce5e2 Mon Sep 17 00:00:00 2001 From: Vlammar Date: Sat, 12 Dec 2020 14:10:02 +0100 Subject: [PATCH] refactor of rename command --- .../imageonmap/commands/IoMCommand.java | 37 +++++++++++++++ .../commands/maptool/RenameCommand.java | 47 ------------------- 2 files changed, 37 insertions(+), 47 deletions(-) diff --git a/src/main/java/fr/moribus/imageonmap/commands/IoMCommand.java b/src/main/java/fr/moribus/imageonmap/commands/IoMCommand.java index 4bbb6e4..00868b1 100644 --- a/src/main/java/fr/moribus/imageonmap/commands/IoMCommand.java +++ b/src/main/java/fr/moribus/imageonmap/commands/IoMCommand.java @@ -53,6 +53,43 @@ public abstract class IoMCommand extends Command { return getMapFromArgs(playerSender(), 0, true); } + protected ArrayList getArgs() { + ArrayList arguments = new ArrayList<>(); + + //State of the automaton, can read word like: + //name_here; "name here" + int state = 0; + StringBuilder s = new StringBuilder(); + for (String arg : args) { + switch (state) { + case 0: + if (arg.startsWith("\"")) { + state = 1; + arg = arg.substring(1); + + s = s.append(arg); + } else { + arguments.add(arg.toString()); + } + break; + case 1: + if (arg.endsWith("\"")) { + arg = arg.substring(0, arg.length() - 1); + s = s.append(" " + arg); + arguments.add(s.toString()); + s = new StringBuilder(); + state = 0; + } else { + s = s.append(" " + arg); + } + break; + default: + throw new IllegalStateException("Unexpected value: " + state); + } + } + return arguments; + } + //TODO:Add the quote system to zlib and refactor this protected ImageMap getMapFromArgs(Player player, int index) throws CommandException { if (args.length <= index) { diff --git a/src/main/java/fr/moribus/imageonmap/commands/maptool/RenameCommand.java b/src/main/java/fr/moribus/imageonmap/commands/maptool/RenameCommand.java index d347df7..f6c89f9 100644 --- a/src/main/java/fr/moribus/imageonmap/commands/maptool/RenameCommand.java +++ b/src/main/java/fr/moribus/imageonmap/commands/maptool/RenameCommand.java @@ -25,7 +25,6 @@ import fr.moribus.imageonmap.map.MapManager; import fr.zcraft.quartzlib.components.commands.CommandException; import fr.zcraft.quartzlib.components.commands.CommandInfo; import fr.zcraft.quartzlib.components.i18n.I; -import fr.zcraft.quartzlib.tools.PluginLogger; import java.util.ArrayList; import java.util.List; import org.bukkit.command.CommandSender; @@ -33,52 +32,6 @@ import org.bukkit.command.CommandSender; @CommandInfo(name = "rename", usageParameters = " ") public class RenameCommand extends IoMCommand { - private ArrayList getArgs() { - ArrayList arguments = new ArrayList<>(); - - //State of the automaton, can read word like: - //name_here; "name here" - int state = 0; - StringBuilder s = new StringBuilder(); - for (String arg : args) { - - PluginLogger.info("arg " + arg); - switch (state) { - case 0: - if (arg.startsWith("\"")) { - PluginLogger.info("start with "); - state = 1; - arg = arg.substring(1); - - s = s.append(arg); - } else { - PluginLogger.info("not start with "); - arguments.add(arg.toString()); - } - break; - case 1: - if (arg.endsWith("\"")) { - PluginLogger.info("end with "); - arg = arg.substring(0, arg.length() - 1); - s = s.append(" " + arg); - arguments.add(s.toString()); - s = new StringBuilder(); - state = 0; - } else { - PluginLogger.info("not end with "); - s = s.append(" " + arg); - } - break; - default: - throw new IllegalStateException("Unexpected value: " + state); - } - //arguments.add(arg.toString()); - - - } - return arguments; - } - @Override protected void run() throws CommandException {