X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fcommandline%2Fparameterparser%2FParser.java;h=ff15a4e9bff29505d8709ea744b95eb81cc132fa;hb=6846681d727a07385bcd3e0eb856f70a7e96448c;hp=4ab529d093ec6266059449e5a1616db1d9e28ced;hpb=5fecd6b03f114cab04e0389bd1900b27726c73ea;p=svjatoslav_commons.git

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 4ab529d..ff15a4e 100755
--- a/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parser.java
+++ b/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parser.java
@@ -1,18 +1,16 @@
 /*
  * Svjatoslav Commons - shared library of common functionality.
- * Copyright ©2012-2013, Svjatoslav Agejenko, svjatoslav@svjatoslav.eu
- * 
+ * Copyright ©2012-2017, 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.StringParameter;
-
 /**
  * <pre>
  * Single commandline parameter can have any amount of arguments.
@@ -20,78 +18,84 @@ import eu.svjatoslav.commons.commandline.parameterparser.parameter.StringParamet
  */
 public class Parser {
 
-	private final ArrayList<Parameter> parameters = new ArrayList<Parameter>();
-
-	public void addParameter(final Parameter parameter) {
-		parameters.add(parameter);
-	}
-
-	public StringParameter createStringParameter(final String description) {
-		final StringParameter parameter = new StringParameter(description);
-		parameters.add(parameter);
-		return parameter;
-	}
-
-	/**
-	 * Return parameter by given alias or <code>null</code> if no parameter
-	 * exists for given alias.
-	 */
-	public Parameter getParameterByAlias(final String alias) {
-
-		for (final Parameter parameter : parameters)
-			if (parameter.matchesAlias(alias))
-				return parameter;
-
-		return null;
-	}
-
-	/**
-	 * @return <code>true</code> if no errors were found. <code>false</code>
-	 *         otherwise.
-	 */
-	public boolean parse(final String[] args) {
-
-		Parameter currentParameter = null;
-
-		for (final String argument : args) {
-
-			final Parameter parameterForAlias = getParameterByAlias(argument);
-			if (parameterForAlias == null) {
-				if (currentParameter == null) {
-					System.out.println("Unknown commandline parameter: "
-							+ argument);
-					return false;
-				}
-
-				if (!currentParameter.addArgument(argument))
-					return false;
-
-			} else {
-				if (currentParameter != null)
-					if (!currentParameter.noMoreArguments())
-						return false;
-
-				parameterForAlias.setParameterSpecified(true);
-				currentParameter = parameterForAlias;
-			}
-
-		}
-
-		// 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;
-	}
-
-	public void showHelp() {
-		for (final Parameter parameter : parameters)
-			System.out.println(parameter.getHelp());
-	}
+    private final ArrayList<Parameter<?>> parameters = new ArrayList<>();
+
+    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.
+     *
+     * @param alias parameter alias
+     * @return found parameter or <code>null</code> if parameter was not found.
+     */
+    public Parameter<?> findParameterByAlias(final String alias) {
+
+        for (final Parameter<?> parameter : parameters)
+            if (parameter.matchesAlias(alias))
+                return parameter;
+
+        return null;
+    }
+
+    /**
+     * @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;
+
+        for (final String argument : args) {
+
+            final Parameter<?> parameterForAlias = findParameterByAlias(argument);
+            if (parameterForAlias == null) {
+                if (currentParameter == null) {
+                    System.out.println("Unknown commandline parameter: "
+                            + argument);
+                    return false;
+                }
+
+                if (!currentParameter.addArgument(argument))
+                    return false;
+
+            } else {
+                if (currentParameter != null)
+                    if (!currentParameter.noMoreArguments())
+                        return false;
+
+                parameterForAlias.setParameterSpecified(true);
+                currentParameter = parameterForAlias;
+            }
+
+        }
+
+        return checkMandatoryArgumentsPresent();
+    }
+
+    public void showHelp() {
+        for (final Parameter<?> parameter : parameters)
+            System.out.println(parameter.getHelp());
+    }
 
 }