projects
/
svjatoslav_commons.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
22cc927
..
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;
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;
/**
* 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;
private final ArrayList<String> aliases = new ArrayList<String>();
public final String description;
@@
-36,20
+34,16
@@
public class Parameter {
*/
private boolean parameterSpecified;
*/
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.description = description;
- this.argumentType = argumentType;
this.argumentCount = argumentCount;
};
public Parameter(final boolean mandatory,
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.mandatory = mandatory;
- this.argumentType = argumentType;
this.description = description;
this.argumentCount = argumentCount;
this.description = description;
this.argumentCount = argumentCount;
@@
-90,10
+84,10
@@
public class Parameter {
return false;
}
return false;
}
- if (!
argumentType.
validate(argumentString)) {
+ if (!validate(argumentString)) {
System.out.println("Error! Invalid argument \"" + argumentString
System.out.println("Error! Invalid argument \"" + argumentString
- + "\". It shall be " +
argumentType.
describeFormat() + ".");
+ + "\". It shall be " + describeFormat() + ".");
return false;
}
return false;
}
@@
-117,13
+111,6
@@
public class Parameter {
return buffer.toString();
}
return buffer.toString();
}
- public File getArgumentAsFile() {
- if (arguments.size() != 1)
- throw new RuntimeException("Parameter " + description
- + " shall have exactly 1 argument.");
- return new File(arguments.get(0));
- }
-
public List<File> getArgumentsAsFiles() {
final ArrayList<File> result = new ArrayList<File>();
public List<File> getArgumentsAsFiles() {
final ArrayList<File> result = new ArrayList<File>();
@@
-155,7
+142,7
@@
public class Parameter {
// first line
buffer.append(getAliases());
if (!argumentCount.equals(ArgumentCount.NONE)) {
// first line
buffer.append(getAliases());
if (!argumentCount.equals(ArgumentCount.NONE)) {
- buffer.append(" (" +
argumentType.
describeFormat() + ")");
+ buffer.append(" (" + describeFormat() + ")");
if (argumentCount.equals(ArgumentCount.MULTI))
buffer.append("...");
if (argumentCount.equals(ArgumentCount.MULTI))
buffer.append("...");
@@
-223,4
+210,15
@@
public class Parameter {
this.parameterSpecified = parameterSpecified;
}
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);
+
}
}