You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@commons.apache.org by br...@apache.org on 2017/06/08 17:38:19 UTC
[30/40] commons-cli git commit: Add optional argument to help output
Add optional argument to help output
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/cli/branches/avalon-implementation@539899 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/commons-cli/repo
Commit: http://git-wip-us.apache.org/repos/asf/commons-cli/commit/5159f98d
Tree: http://git-wip-us.apache.org/repos/asf/commons-cli/tree/5159f98d
Diff: http://git-wip-us.apache.org/repos/asf/commons-cli/diff/5159f98d
Branch: refs/heads/avalon-implementation
Commit: 5159f98d14721feefb6ecb60b589b64bedd9683f
Parents: ebe542f
Author: Sebastian Bazley <se...@apache.org>
Authored: Sun May 20 18:10:17 2007 +0000
Committer: Sebastian Bazley <se...@apache.org>
Committed: Sun May 20 18:10:17 2007 +0000
----------------------------------------------------------------------
src/java/org/apache/commons/cli/avalon/CLUtil.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/commons-cli/blob/5159f98d/src/java/org/apache/commons/cli/avalon/CLUtil.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/commons/cli/avalon/CLUtil.java b/src/java/org/apache/commons/cli/avalon/CLUtil.java
index 1efd8d2..07fbf3b 100644
--- a/src/java/org/apache/commons/cli/avalon/CLUtil.java
+++ b/src/java/org/apache/commons/cli/avalon/CLUtil.java
@@ -46,12 +46,15 @@ public final class CLUtil
final String name = options[i].getName();
String description = options[i].getDescription();
int flags = options[i].getFlags();
+ boolean argumentOptional =
+ ((flags & CLOptionDescriptor.ARGUMENT_OPTIONAL) ==
+ CLOptionDescriptor.ARGUMENT_OPTIONAL);
boolean argumentRequired =
((flags & CLOptionDescriptor.ARGUMENT_REQUIRED) ==
- CLOptionDescriptor.ARGUMENT_REQUIRED);
+ CLOptionDescriptor.ARGUMENT_REQUIRED);
boolean twoArgumentsRequired =
((flags & CLOptionDescriptor.ARGUMENTS_REQUIRED_2) ==
- CLOptionDescriptor.ARGUMENTS_REQUIRED_2);
+ CLOptionDescriptor.ARGUMENTS_REQUIRED_2);
boolean needComma = false;
if( twoArgumentsRequired )
{
@@ -78,6 +81,10 @@ public final class CLUtil
sb.append( name );
}
+ if (argumentOptional)
+ {
+ sb.append(" [[=]<argument>]");
+ }
if( argumentRequired )
{
sb.append( " <argument>" );