Author: tn
Date: Sat Nov 23 14:03:34 2013
New Revision: 1544802
URL: http://svn.apache.org/r1544802
Log:
[CLI-240] Small cleanup of Options class, thanks to Beluga Behr.
Modified:
commons/proper/cli/trunk/RELEASE-NOTES.txt
commons/proper/cli/trunk/src/changes/changes.xml
commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/Option.java
Modified: commons/proper/cli/trunk/RELEASE-NOTES.txt
URL:
http://svn.apache.org/viewvc/commons/proper/cli/trunk/RELEASE-NOTES.txt?rev=1544802&r1=1544801&r2=1544802&view=diff
==============================================================================
--- commons/proper/cli/trunk/RELEASE-NOTES.txt (original)
+++ commons/proper/cli/trunk/RELEASE-NOTES.txt Sat Nov 23 14:03:34 2013
@@ -72,6 +72,8 @@ BUG FIXES:
CHANGES:
+ * Small cleanup of Option class. Thanks to Beluga Behr. (CLI-240)
+
* Options.getRequiredOptions() now returns an unmodifiable list. (CLI-230)
* Clarify javadoc for CommandLine.getOptionValue() that the first specified
Modified: commons/proper/cli/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/changes/changes.xml?rev=1544802&r1=1544801&r2=1544802&view=diff
==============================================================================
--- commons/proper/cli/trunk/src/changes/changes.xml (original)
+++ commons/proper/cli/trunk/src/changes/changes.xml Sat Nov 23 14:03:34 2013
@@ -23,6 +23,9 @@
<body>
<release version="1.3" date="in SVN" description="This is a maintenance
release containing bug fixes.">
+ <action type="update" dev="tn" issue="CLI-240" due-to="Beluga Behr">
+ Small cleanup of Option class.
+ </action>
<action type="update" dev="tn" issue="CLI-231" due-to="Duncan Jones">
Removed DoubleCheckedLocking test from checkstyle configuration.
</action>
Modified:
commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/Option.java
URL:
http://svn.apache.org/viewvc/commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/Option.java?rev=1544802&r1=1544801&r2=1544802&view=diff
==============================================================================
--- commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/Option.java
(original)
+++ commons/proper/cli/trunk/src/main/java/org/apache/commons/cli/Option.java
Sat Nov 23 14:03:34 2013
@@ -177,12 +177,7 @@ public class Option implements Cloneable
String getKey()
{
// if 'opt' is null, then it is a 'long' option
- if (opt == null)
- {
- return longOpt;
- }
-
- return opt;
+ return (opt == null) ? longOpt : opt;
}
/**
@@ -435,14 +430,11 @@ public class Option implements Cloneable
*/
void addValueForProcessing(String value)
{
- switch (numberOfArgs)
+ if (numberOfArgs == UNINITIALIZED)
{
- case UNINITIALIZED:
- throw new RuntimeException("NO_ARGS_ALLOWED");
-
- default:
- processValue(value);
+ throw new RuntimeException("NO_ARGS_ALLOWED");
}
+ processValue(value);
}
/**
@@ -743,12 +735,9 @@ public class Option implements Cloneable
}
if (numberOfArgs == UNLIMITED_VALUES)
{
- return values.size() < 1;
- }
- else
- {
- return acceptsArg();
+ return values.isEmpty();
}
+ return acceptsArg();
}
/**
