use generics for more elegant code

[svjatoslav_commons.git] / src / main / java / eu / svjatoslav / commons / commandline / parameterparser / Parameter.java

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 004a48a..f259f7f 100755 (executable)
--- a/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parameter.java
+++ b/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parameter.java
@@ -11,7 +11,7 @@ package eu.svjatoslav.commons.commandline.parameterparser;
 
 import java.util.ArrayList;
 
-public abstract class Parameter {
+public abstract class Parameter<T> {
 
        /**
         * Indicates that at least one argument is mandatory for this parameter.
@@ -22,7 +22,7 @@ public abstract class Parameter {
 
        public final String description;
 
-       protected final ArrayList<String> arguments = new ArrayList<String>();
+       public final ArrayList<String> arguments = new ArrayList<String>();
 
        final ArgumentCount argumentCount;
 
@@ -51,15 +51,13 @@ public abstract class Parameter {
                this.argumentCount = argumentCount;
        }
 
-       public abstract Object addAliases(final String... aliasArray);
-
-       protected Parameter addAliasesProtected(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();
 
@@ -204,11 +177,9 @@ public abstract class Parameter {
                return true;
        }
 
-       public abstract Parameter setMandatory();
-
-       protected Parameter setMandatoryProtected() {
+       public T setMandatory() {
                mandatory = true;
-               return this;
+               return (T) this;
        }
 
        /**