X-Git-Url: http://www2.svjatoslav.eu/gitweb/?p=svjatoslav_commons.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fcommandline%2Fparameterparser%2FParser.java;h=bd4cb17ba86949eed4bdbf08c29e3e0aa45f62e1;hp=d2f623fc5c8a0a21e6f390365194d94dca2594f3;hb=ab4cc64cf105d4f03b8a0b94ab58d9b973820c8a;hpb=26f09b1ebcafae67855b55ad588d5332a107d202

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 d2f623f..bd4cb17 100755
--- a/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parser.java
+++ b/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parser.java
@@ -1,16 +1,23 @@
 /*
  * Svjatoslav Commons - shared library of common functionality.
- * Copyright (C) 2012, 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;
+import eu.svjatoslav.commons.commandline.parameterparser.parameter.StringParameters;
+
 /**
  * <pre>
  * Single commandline parameter can have any amount of arguments.
@@ -24,16 +31,52 @@ public class Parser {
 		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);
+		parameters.add(parameter);
+		return parameter;
+	}
+
+	public StringParameters createStringParameters(final String description) {
+		final StringParameters stingParameters = new StringParameters(
+				description);
+		parameters.add(stingParameters);
+		return stingParameters;
+	}
+
 	/**
 	 * 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) {
+		for (final Parameter parameter : parameters)
 			if (parameter.matchesAlias(alias))
 				return parameter;
-		}
 
 		return null;
 	}
@@ -60,10 +103,9 @@ public class Parser {
 					return false;
 
 			} else {
-				if (currentParameter != null) {
+				if (currentParameter != null)
 					if (!currentParameter.noMoreArguments())
 						return false;
-				}
 
 				parameterForAlias.setParameterSpecified(true);
 				currentParameter = parameterForAlias;
@@ -73,21 +115,19 @@ public class Parser {
 
 		// check if any mandatory parameters are missing
 
-		for (final Parameter parameter : parameters) {
+		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) {
+		for (final Parameter parameter : parameters)
 			System.out.println(parameter.getHelp());
-		}
 	}
 
 }