X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=svjatoslav_commons.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fcommandline%2Fparameterparser%2FParameter.java;h=f259f7f078653618bb32cca4572b8ebd262e5d9c;hp=004a48ad45148366d1a3b6ec3d745c6061bcbd5d;hb=d9c673d58d131597ec01c260b45131689059abc3;hpb=2212fc002e4e8602550372a3115c2c1469be0729 diff --git a/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parameter.java b/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parameter.java index 004a48a..f259f7f 100755 --- a/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parameter.java +++ b/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parameter.java @@ -11,7 +11,7 @@ package eu.svjatoslav.commons.commandline.parameterparser; import java.util.ArrayList; -public abstract class Parameter { +public abstract class Parameter { /** * Indicates that at least one argument is mandatory for this parameter. @@ -22,7 +22,7 @@ public abstract class Parameter { public final String description; - protected final ArrayList arguments = new ArrayList(); + public final ArrayList arguments = new ArrayList(); final ArgumentCount argumentCount; @@ -51,15 +51,13 @@ public abstract class Parameter { this.argumentCount = argumentCount; } - public abstract Object addAliases(final String... aliasArray); - - protected Parameter addAliasesProtected(final String... aliasArray) { + public T addAliases(final String... aliasArray) { // save aliases for (final String alias : aliasArray) aliases.add(alias); - return this; + return (T) this; } /** @@ -70,8 +68,8 @@ public abstract class Parameter { // check if arguments are allowed for this parameter if (argumentCount.equals(ArgumentCount.NONE)) { System.out - .println("Error! No arguments are allowed for parameters: " - + getAliases()); + .println("Error! No arguments are allowed for parameters: " + + getAliases()); return false; } @@ -79,8 +77,8 @@ public abstract class Parameter { if ((arguments.size() > 0) && (argumentCount.equals(ArgumentCount.SINGLE))) { System.out - .println("Error! Only single argument is allowed for parameters: " - + getAliases()); + .println("Error! Only single argument is allowed for parameters: " + + getAliases()); return false; } @@ -116,31 +114,6 @@ public abstract class Parameter { return buffer.toString(); } - // public List getArgumentsAsFiles() { - // final ArrayList result = new ArrayList(); - // - // for (final String argument : arguments) { - // final File file = new File(argument); - // result.add(file); - // } - // - // return result; - // } - // - // public List getArgumentsAsIntegers() { - // final ArrayList result = new ArrayList(); - // - // for (final String argument : arguments) - // result.add(Integer.valueOf(argument)); - // - // return result; - // } - // - // public List getArgumentsAsStrings() { - // final ArrayList result = new ArrayList(arguments); - // return result; - // } - public String getHelp() { final StringBuffer buffer = new StringBuffer(); @@ -204,11 +177,9 @@ public abstract class Parameter { return true; } - public abstract Parameter setMandatory(); - - protected Parameter setMandatoryProtected() { + public T setMandatory() { mandatory = true; - return this; + return (T) this; } /**