simplified commandline helper API

[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 d9e78da..58282c5 100755 (executable)
--- a/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parameter.java
+++ b/src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parameter.java
@@ -13,15 +13,13 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
-public class Parameter {
+public abstract class Parameter {
 
        /**
         * Indicates that at least one argument is mandatory for this parameter.
         */
        protected boolean mandatory;
 
-       private final Argument argumentType;
-
        private final ArrayList<String> aliases = new ArrayList<String>();
 
        public final String description;
@@ -36,20 +34,16 @@ public class Parameter {
         */
        private boolean parameterSpecified;
 
-       public Parameter(final Argument argumentType, final String description,
-                       final ArgumentCount argumentCount) {
-
+       public Parameter(final String description, final ArgumentCount argumentCount) {
                this.description = description;
-               this.argumentType = argumentType;
                this.argumentCount = argumentCount;
        };
 
        public Parameter(final boolean mandatory,
-                       final ArgumentCount argumentCount, final Argument argumentType,
-                       final String description, final String... aliases2) {
+                       final ArgumentCount argumentCount, final String description,
+                       final String... aliases2) {
 
                this.mandatory = mandatory;
-               this.argumentType = argumentType;
                this.description = description;
                this.argumentCount = argumentCount;
 
@@ -90,10 +84,10 @@ public class Parameter {
                        return false;
                }
 
-               if (!argumentType.validate(argumentString)) {
+               if (!validate(argumentString)) {
 
                        System.out.println("Error! Invalid argument \"" + argumentString
-                                       + "\". It shall be " + argumentType.describeFormat() + ".");
+                                       + "\". It shall be " + describeFormat() + ".");
                        return false;
 
                }
@@ -148,7 +142,7 @@ public class Parameter {
                // first line
                buffer.append(getAliases());
                if (!argumentCount.equals(ArgumentCount.NONE)) {
-                       buffer.append(" (" + argumentType.describeFormat() + ")");
+                       buffer.append(" (" + describeFormat() + ")");
 
                        if (argumentCount.equals(ArgumentCount.MULTI))
                                buffer.append("...");
@@ -216,4 +210,15 @@ public class Parameter {
                this.parameterSpecified = parameterSpecified;
        }
 
+       /**
+        * @return Single line argument type description.
+        */
+       public abstract String describeFormat();
+
+       /**
+        * @return <code>true</code> if value is correct, <code>false</code>
+        *         otherwise.
+        */
+       public abstract boolean validate(String value);
+
 }