Author: sebb
Date: Fri May 4 17:31:54 2007
New Revision: 535425
URL: http://svn.apache.org/viewvc?view=rev&rev=535425
Log:
Fixup description for optional parameters
Modified:
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/commons/cli/avalon/CLUtil.java
Modified:
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/commons/cli/avalon/CLUtil.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/commons/cli/avalon/CLUtil.java?view=diff&rev=535425&r1=535424&r2=535425
==============================================================================
---
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/commons/cli/avalon/CLUtil.java
(original)
+++
jakarta/jmeter/branches/rel-2-2/src/jorphan/org/apache/commons/cli/avalon/CLUtil.java
Fri May 4 17:31:54 2007
@@ -24,13 +24,19 @@
* CLUtil offers basic utility operations for use both internal and external to
* package.
*
- * @version $Revision$ $Date$
* @see CLOptionDescriptor
*/
public final class CLUtil {
private static final int MAX_DESCRIPTION_COLUMN_LENGTH = 60;
/**
+ * Private Constructor so that no instance can ever be created.
+ *
+ */
+ private CLUtil() {
+ }
+
+ /**
* Format options into StringBuffer and return. This is typically used
to
* print "Usage" text in response to a "--help" or invalid option.
*
@@ -47,6 +53,7 @@
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);
boolean twoArgumentsRequired = ((flags &
CLOptionDescriptor.ARGUMENTS_REQUIRED_2) ==
CLOptionDescriptor.ARGUMENTS_REQUIRED_2);
boolean needComma = false;
@@ -71,6 +78,9 @@
sb.append(name);
}
+ if (argumentOptional) {
+ sb.append(" [<argument>]");
+ }
if (argumentRequired) {
sb.append(" <argument>");
}
@@ -94,12 +104,5 @@
}
}
return sb;
- }
-
- /**
- * Private Constructor so that no instance can ever be created.
- *
- */
- private CLUtil() {
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
