more elegant parameter initialization

[svjatoslav_commons.git] / src / main / java / eu / svjatoslav / commons / commandline / parameterparser / Parser.java

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 2646bfb..e064cd5 100755 (executable)
--- a/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parser.java
+++ b/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parser.java
@@ -1,22 +1,16 @@
 /*
  * Svjatoslav Commons - shared library of common functionality.
- * Copyright ©2012-2013, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- * 
+ * Copyright ©2012-2014, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
+ *
  * This program is free software; you can redistribute it and/or
- * modify it under the terms of version 2 of the GNU General Public License
- * as published by the Free Software Foundation.
+ * modify it under the terms of version 3 of the GNU Lesser General Public License
+ * or later as published by the Free Software Foundation.
  */
 
 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;
-
 /**
  * <pre>
  * Single commandline parameter can have any amount of arguments.
@@ -26,36 +20,7 @@ public class Parser {
 
        private final ArrayList<Parameter> parameters = new ArrayList<Parameter>();
 
-       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);
-               parameters.add(parameter);
-               return parameter;
-       }
-
-       public StringParameter createStringParameter(final String description) {
-               final StringParameter parameter = new StringParameter(description);
+       public <E extends Parameter> E add(final E parameter) {
                parameters.add(parameter);
                return parameter;
        }
@@ -64,7 +29,7 @@ public class Parser {
         * Return parameter by given alias or <code>null</code> 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))
@@ -83,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: "