X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=svjatoslav_commons.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fcommandline%2Fparameterparser%2FParser.java;h=e064cd53475b959fe51e0e280385dd1740430aa5;hp=bd4cb17ba86949eed4bdbf08c29e3e0aa45f62e1;hb=be3c81cebf77e98c2723b61b26969ebdbc7a3082;hpb=d9c673d58d131597ec01c260b45131689059abc3 diff --git a/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parser.java b/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parser.java index bd4cb17..e064cd5 100755 --- a/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parser.java +++ b/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parser.java @@ -11,13 +11,6 @@ package eu.svjatoslav.commons.commandline.parameterparser; import java.util.ArrayList; -import eu.svjatoslav.commons.commandline.parameterparser.parameter.DirectoryParameter; -import eu.svjatoslav.commons.commandline.parameterparser.parameter.FileParameter; -import eu.svjatoslav.commons.commandline.parameterparser.parameter.IntegerParameter; -import eu.svjatoslav.commons.commandline.parameterparser.parameter.NullParameter; -import eu.svjatoslav.commons.commandline.parameterparser.parameter.StringParameter; -import eu.svjatoslav.commons.commandline.parameterparser.parameter.StringParameters; - /** *
* Single commandline parameter can have any amount of arguments. @@ -27,52 +20,16 @@ public class Parser { private final ArrayListparameters = new ArrayList (); - public void addParameter(final Parameter parameter) { - parameters.add(parameter); - } - - public DirectoryParameter createDirectoryParameter(final String description) { - final DirectoryParameter parameter = new DirectoryParameter(description); - parameters.add(parameter); - return parameter; - } - - public FileParameter createFileParameter(final String description) { - final FileParameter parameter = new FileParameter(description); - parameters.add(parameter); - return parameter; - } - - public IntegerParameter createIntegerParameter(final String description) { - final IntegerParameter parameter = new IntegerParameter(description); - parameters.add(parameter); - return parameter; - } - - public NullParameter createNullParameter(final String description) { - final NullParameter parameter = new NullParameter(description); + public E add(final E parameter) { parameters.add(parameter); return parameter; } - public StringParameter createStringParameter(final String description) { - final StringParameter parameter = new StringParameter(description); - parameters.add(parameter); - return parameter; - } - - public StringParameters createStringParameters(final String description) { - final StringParameters stingParameters = new StringParameters( - description); - parameters.add(stingParameters); - return stingParameters; - } - /** * Return parameter by given alias or null
if no parameter * exists for given alias. */ - public Parameter getParameterByAlias(final String alias) { + public Parameter findParameterByAlias(final String alias) { for (final Parameter parameter : parameters) if (parameter.matchesAlias(alias)) @@ -91,7 +48,7 @@ public class Parser { for (final String argument : args) { - final Parameter parameterForAlias = getParameterByAlias(argument); + final Parameter parameterForAlias = findParameterByAlias(argument); if (parameterForAlias == null) { if (currentParameter == null) { System.out.println("Unknown commandline parameter: "