improved javadoc

[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 47b13d7..7ee27a0 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,7 +1,7 @@
 /*
  * Svjatoslav Commons - shared library of common functionality.
  * 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 3 of the GNU Lesser General Public License
  * or later as published by the Free Software Foundation.
@@ -11,12 +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;
-
 /**
  * <pre>
  * Single commandline parameter can have any amount of arguments.
@@ -24,49 +18,40 @@ import eu.svjatoslav.commons.commandline.parameterparser.parameter.StringParamet
  */
 public class Parser {
 
-       private final ArrayList<Parameter> parameters = new ArrayList<Parameter>();
+       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);
+       public <E extends Parameter<?>> E add(final E parameter) {
                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;
-       }
+       /**
+        * @return <code>true</code> if no errors were found. <code>false</code>
+        *         otherwise.
+        */
+       private boolean checkMandatoryArgumentsPresent() {
 
-       public NullParameter createNullParameter(final String description) {
-               final NullParameter parameter = new NullParameter(description);
-               parameters.add(parameter);
-               return parameter;
-       }
+               for (final Parameter<?> parameter : parameters)
+                       if (parameter.isMandatory() && (!parameter.isParameterSpecified())) {
+                               System.out.println("Error! Mandatory parameter ("
+                                               + parameter.getAliases() + ") is not specified.");
+                               return false;
+                       }
 
-       public StringParameter createStringParameter(final String description) {
-               final StringParameter parameter = new StringParameter(description);
-               parameters.add(parameter);
-               return parameter;
+               return true;
        }
 
        /**
         * Return parameter by given alias or <code>null</code> if no parameter
         * exists for given alias.
+        *
+        * @param alias
+        *            parameter alias
+        * @return found parameter or <code>null</code> if parameter was not found.
         */
-       public Parameter getParameterByAlias(final String alias) {
+       public Parameter<?> findParameterByAlias(final String alias) {
 
-               for (final Parameter parameter : parameters)
+               for (final Parameter<?> parameter : parameters)
                        if (parameter.matchesAlias(alias))
                                return parameter;
 
@@ -74,16 +59,18 @@ public class Parser {
        }
 
        /**
+        * @param args
+        *            commandline arguments
         * @return <code>true</code> if no errors were found. <code>false</code>
         *         otherwise.
         */
        public boolean parse(final String[] args) {
 
-               Parameter currentParameter = null;
+               Parameter<?> currentParameter = null;
 
                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: "
@@ -105,20 +92,11 @@ public class Parser {
 
                }
 
-               // check if any mandatory parameters are missing
-
-               for (final Parameter parameter : parameters)
-                       if (parameter.isMandatory() && (!parameter.isParameterSpecified())) {
-                               System.out.println("Error! Mandatory parameter ("
-                                               + parameter.getAliases() + ") is not specified.");
-                               return false;
-                       }
-
-               return true;
+               return checkMandatoryArgumentsPresent();
        }
 
        public void showHelp() {
-               for (final Parameter parameter : parameters)
+               for (final Parameter<?> parameter : parameters)
                        System.out.println(parameter.getHelp());
        }