From 661df11ee74da0a6e970d36329a7c82f1a2f11fb Mon Sep 17 00:00:00 2001 From: BuildTools Date: Fri, 12 Feb 2016 17:20:24 +0100 Subject: [PATCH] TypeCombined separators --- .../command/type/combined/TypeCombined.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/com/massivecraft/massivecore/command/type/combined/TypeCombined.java b/src/com/massivecraft/massivecore/command/type/combined/TypeCombined.java index a6df5c92..87a5d7f7 100644 --- a/src/com/massivecraft/massivecore/command/type/combined/TypeCombined.java +++ b/src/com/massivecraft/massivecore/command/type/combined/TypeCombined.java @@ -17,13 +17,21 @@ import com.massivecraft.massivecore.command.type.TypeAbstract; import com.massivecraft.massivecore.util.Txt; public abstract class TypeCombined extends TypeAbstract -{ +{ + // -------------------------------------------- // + // CONSTANTS + // -------------------------------------------- // + + public static final String SEPARATORS_DEFAULT = ", "; + public static final String SEPARATORS_LENIENT = " .,:-#"; + // -------------------------------------------- // // FIELDS // -------------------------------------------- // private Pattern separatorsPattern = null; public Pattern getSeparatorsPattern() { return this.separatorsPattern; } + public void setSeparatorsPattern(Pattern separatorsPattern) { this.separatorsPattern = separatorsPattern; } private void buildSeparatorsPattern() { this.separatorsPattern = buildSeparatorsPattern(this.separators); } private String separators = null; @@ -72,7 +80,7 @@ public abstract class TypeCombined extends TypeAbstract public TypeCombined(Type... innerTypes) { this.setInnerTypes(innerTypes); - this.setSeparators(", "); + this.setSeparators(SEPARATORS_DEFAULT); } // -------------------------------------------- // @@ -218,7 +226,7 @@ public abstract class TypeCombined extends TypeAbstract // Fill List innerArgs = this.getArgs(arg); - if (innerArgs.size() > this.getInnerTypes().size()) throw new MassiveException().addMsg("Too many arguments!"); + if (innerArgs.size() > this.getInnerTypes().size()) throw new MassiveException().addMsg("Too many arguments."); for (int i = 0; i < innerArgs.size(); i++) {