X-Git-Url: http://www2.svjatoslav.eu/gitweb/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Feu%2Fsvjatoslav%2Fcommons%2Fcommandline%2Fparameterparser%2FParameter.java;h=f259f7f078653618bb32cca4572b8ebd262e5d9c;hb=d9c673d58d131597ec01c260b45131689059abc3;hp=2e1c03ab06db5cf2020540c6cc74ae39946ba6dd;hpb=b34ba4499cfbca09bc794a810e460bf1c86dcd34;p=svjatoslav_commons.git

diff --git a/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parameter.java b/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parameter.java
index 2e1c03a..f259f7f 100755
--- a/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parameter.java
+++ b/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parameter.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.
@@ -9,11 +9,9 @@
 
 package eu.svjatoslav.commons.commandline.parameterparser;
 
-import java.io.File;
 import java.util.ArrayList;
-import java.util.List;
 
-public abstract class Parameter {
+public abstract class Parameter<T> {
 
 	/**
 	 * Indicates that at least one argument is mandatory for this parameter.
@@ -24,9 +22,9 @@ public abstract class Parameter {
 
 	public final String description;
 
-	protected final ArrayList<String> arguments = new ArrayList<String>();
+	public final ArrayList<String> arguments = new ArrayList<String>();
 
-	ArgumentCount argumentCount;
+	final ArgumentCount argumentCount;
 
 	/**
 	 * If this parameter was present in the commandline, then this boolean will
@@ -53,13 +51,13 @@ public abstract class Parameter {
 		this.argumentCount = argumentCount;
 	}
 
-	public Parameter addAliases(final String... aliasArray) {
+	public T addAliases(final String... aliasArray) {
 
 		// save aliases
 		for (final String alias : aliasArray)
 			aliases.add(alias);
 
-		return this;
+		return (T) this;
 	}
 
 	/**
@@ -70,8 +68,8 @@ public abstract class Parameter {
 		// check if arguments are allowed for this parameter
 		if (argumentCount.equals(ArgumentCount.NONE)) {
 			System.out
-					.println("Error! No arguments are allowed for parameters: "
-							+ getAliases());
+			.println("Error! No arguments are allowed for parameters: "
+					+ getAliases());
 			return false;
 		}
 
@@ -79,8 +77,8 @@ public abstract class Parameter {
 		if ((arguments.size() > 0)
 				&& (argumentCount.equals(ArgumentCount.SINGLE))) {
 			System.out
-					.println("Error! Only single argument is allowed for parameters: "
-							+ getAliases());
+			.println("Error! Only single argument is allowed for parameters: "
+					+ getAliases());
 			return false;
 		}
 
@@ -116,31 +114,6 @@ public abstract class Parameter {
 		return buffer.toString();
 	}
 
-	public List<File> getArgumentsAsFiles() {
-		final ArrayList<File> result = new ArrayList<File>();
-
-		for (final String argument : arguments) {
-			final File file = new File(argument);
-			result.add(file);
-		}
-
-		return result;
-	}
-
-	public List<Integer> getArgumentsAsIntegers() {
-		final ArrayList<Integer> result = new ArrayList<Integer>();
-
-		for (final String argument : arguments)
-			result.add(Integer.valueOf(argument));
-
-		return result;
-	}
-
-	public List<String> getArgumentsAsStrings() {
-		final ArrayList<String> result = new ArrayList<String>(arguments);
-		return result;
-	}
-
 	public String getHelp() {
 		final StringBuffer buffer = new StringBuffer();
 
@@ -160,6 +133,8 @@ public abstract class Parameter {
 		return buffer.toString();
 	}
 
+	public abstract Object getValue();
+
 	public boolean isMandatory() {
 		return mandatory;
 	}
@@ -185,7 +160,7 @@ public abstract class Parameter {
 	/**
 	 * Notifies this parameter that no more arguments will follow. This gives
 	 * parameter chance to verify if this is ok.
-	 * 
+	 *
 	 * @return <code>true</code> if no errors were found. <code>false</code>
 	 *         otherwise.
 	 */
@@ -202,9 +177,9 @@ public abstract class Parameter {
 		return true;
 	}
 
-	public Parameter setMandatory() {
+	public T setMandatory() {
 		mandatory = true;
-		return this;
+		return (T) this;
 	}
 
 	/**