minor updates

[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 a72984f..69b26dc 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,10 +1,10 @@
 /*
  * 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;
@@ -20,15 +20,32 @@ public class Parser {
 
        private final ArrayList<Parameter> parameters = new ArrayList<Parameter>();
 
-       public void addParameter(final Parameter parameter) {
+       public <E extends Parameter> E add(final E parameter) {
                parameters.add(parameter);
+               return parameter;
+       }
+
+       /**
+        * @return <code>true</code> if no errors were found. <code>false</code>
+        *         otherwise.
+        */
+       private boolean checkMandatoryArgumentsPresent() {
+
+               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 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))
@@ -47,7 +64,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: "
@@ -69,16 +86,7 @@ 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() {