Improved generics usage.

[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 6e29ba6..d55407b 100755 (executable)
--- a/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parameter.java
+++ b/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parameter.java
@@ -12,11 +12,11 @@ package eu.svjatoslav.commons.commandline.parameterparser;
 import java.util.ArrayList;
 import java.util.Collections;
 
-public abstract class Parameter<T> {
+public abstract class Parameter<T, I extends Parameter> {
 
-    public final String description;
+    public String description;
     public final ArrayList<String> arguments = new ArrayList<>();
-    final ArgumentCount argumentCount;
+    ArgumentCount argumentCount;
     private final ArrayList<String> aliases = new ArrayList<>();
     /**
      * Indicates that at least one argument is mandatory for this parameter.
@@ -26,7 +26,7 @@ public abstract class Parameter<T> {
      * If this parameter was present in the commandline, then this boolean will
      * be set to <code>true</code>.
      */
-    private boolean parameterSpecified;
+    private boolean specified;
 
     public Parameter(final boolean mandatory,
                      final ArgumentCount argumentCount, final String description,
@@ -47,12 +47,12 @@ public abstract class Parameter<T> {
     }
 
     @SuppressWarnings("unchecked")
-    public T addAliases(final String... aliasArray) {
+    public I addAliases(final String... aliasArray) {
 
         // save aliases
         Collections.addAll(aliases, aliasArray);
 
-        return (T) this;
+        return (I)this;
     }
 
     /**
@@ -129,7 +129,7 @@ public abstract class Parameter<T> {
         return buffer.toString();
     }
 
-    public abstract Object getValue();
+    public abstract T getValue();
 
     public boolean isMandatory() {
         return mandatory;
@@ -138,15 +138,15 @@ public abstract class Parameter<T> {
     /**
      * @return the parameterSpecified
      */
-    public boolean isParameterSpecified() {
-        return parameterSpecified;
+    public boolean isSpecified() {
+        return specified;
     }
 
     /**
-     * @param parameterSpecified the parameterSpecified to set
+     * @param specified the parameterSpecified to set
      */
-    public void setParameterSpecified(final boolean parameterSpecified) {
-        this.parameterSpecified = parameterSpecified;
+    protected void setSpecified(final boolean specified) {
+        this.specified = specified;
     }
 
     /**
@@ -180,9 +180,9 @@ public abstract class Parameter<T> {
     }
 
     @SuppressWarnings("unchecked")
-    public T setMandatory() {
+    public I setMandatory() {
         mandatory = true;
-        return (T) this;
+        return (I)this;
     }
 
     /**