X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fcommandline%2Fparameterparser%2FParser.java;h=7ee27a04550b24a5c0bbf945cdf7320cdcd71595;hb=846af2def5b489670668b978e4ea703c8dfb22b6;hp=f5ecf72e8705ef3d816c86d19e200aafd20d1760;hpb=a2cdc870766514bc5b40e645eaabfd6ab51ba614;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 f5ecf72..7ee27a0 100755
--- 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.
@@ -24,57 +18,40 @@ 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 Parameter createCustomParameter(final Argument paramaterType,
-			final String description) {
-		final Parameter parameter = new Parameter(paramaterType, description,
-				ArgumentCount.SINGLE);
-		parameters.add(parameter);
-		return parameter;
-	}
+	private final ArrayList<Parameter<?>> parameters = new ArrayList<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;
 
@@ -82,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: "
@@ -113,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());
 	}