projects
/
svjatoslav_commons.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tell if parameter is mandatory when showing help.
[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
d55407b
..
95df0c0
100755
(executable)
--- a/
src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parameter.java
+++ b/
src/main/java/eu/svjatoslav/commons/commandline/parameterparser/Parameter.java
@@
-14,9
+14,9
@@
import java.util.Collections;
public abstract class Parameter<T, I extends Parameter> {
public abstract class Parameter<T, I extends Parameter> {
- public String description;
+ public
final
String description;
public final ArrayList<String> arguments = new ArrayList<>();
public final ArrayList<String> arguments = new ArrayList<>();
- ArgumentCount argumentCount;
+
final
ArgumentCount argumentCount;
private final ArrayList<String> aliases = new ArrayList<>();
/**
* Indicates that at least one argument is mandatory for this parameter.
private final ArrayList<String> aliases = new ArrayList<>();
/**
* Indicates that at least one argument is mandatory for this parameter.
@@
-52,7
+52,7
@@
public abstract class Parameter<T, I extends Parameter> {
// save aliases
Collections.addAll(aliases, aliasArray);
// save aliases
Collections.addAll(aliases, aliasArray);
- return (I)this;
+ return (I)
this;
}
/**
}
/**
@@
-116,7
+116,11
@@
public abstract class Parameter<T, I extends Parameter> {
// first line
buffer.append(getAliases());
if (!argumentCount.equals(ArgumentCount.NONE)) {
// first line
buffer.append(getAliases());
if (!argumentCount.equals(ArgumentCount.NONE)) {
- buffer.append(" (" + describeFormat() + ")");
+ buffer
+ .append(" (")
+ .append(isMandatory() ? "mandatory, " : "")
+ .append(describeFormat())
+ .append(")");
if (argumentCount.equals(ArgumentCount.MULTI))
buffer.append("...");
if (argumentCount.equals(ArgumentCount.MULTI))
buffer.append("...");
@@
-182,7
+186,7
@@
public abstract class Parameter<T, I extends Parameter> {
@SuppressWarnings("unchecked")
public I setMandatory() {
mandatory = true;
@SuppressWarnings("unchecked")
public I setMandatory() {
mandatory = true;
- return (I)this;
+ return (I)
this;
}
/**
}
/**