[CLI-240] Small cleanup of Options class, thanks to Beluga Behr.

netomi · netomi · commit ce5ebdf348d9 · 2013-11-23T14:03:34.000Z
git-svn-id: https://svn.apache.org/repos/asf/commons/proper/cli/trunk@1544802 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -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
diff --git a/src/changes/changes.xml b/src/changes/changes.xml
@@ -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>
diff --git a/src/main/java/org/apache/commons/cli/Option.java b/src/main/java/org/apache/commons/cli/Option.java
@@ -177,12 +177,7 @@ public int getId()
     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 int getArgs()
      */
     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 @@ boolean requiresArg()
         }
         if (numberOfArgs == UNLIMITED_VALUES)
         {
-            return values.size() < 1;
-        }
-        else
-        {
-            return acceptsArg();
+            return values.isEmpty();
         }
+        return acceptsArg();
     }
     
     /**

Original file line number	Diff line number	Diff line change
`@@ -177,12 +177,7 @@ public int getId()`
`177`	`177`	`String getKey()`
`178`	`178`	`{`
`179`	`179`	`// if 'opt' is null, then it is a 'long' option`
`180`		`- if (opt == null)`
`181`		`- {`
`182`		`- return longOpt;`
`183`		`- }`
`184`		`-`
`185`		`- return opt;`
	`180`	`+ return (opt == null) ? longOpt : opt;`
`186`	`181`	`}`
`187`	`182`
`188`	`183`	`/**`
`@@ -435,14 +430,11 @@ public int getArgs()`
`435`	`430`	`*/`
`436`	`431`	`void addValueForProcessing(String value)`
`437`	`432`	`{`
`438`		`- switch (numberOfArgs)`
	`433`	`+ if (numberOfArgs == UNINITIALIZED)`
`439`	`434`	`{`
`440`		`- case UNINITIALIZED:`
`441`		`- throw new RuntimeException("NO_ARGS_ALLOWED");`
`442`		`-`
`443`		`- default:`
`444`		`- processValue(value);`
	`435`	`+ throw new RuntimeException("NO_ARGS_ALLOWED");`
`445`	`436`	`}`
	`437`	`+ processValue(value);`
`446`	`438`	`}`
`447`	`439`
`448`	`440`	`/**`
`@@ -743,12 +735,9 @@ boolean requiresArg()`
`743`	`735`	`}`
`744`	`736`	`if (numberOfArgs == UNLIMITED_VALUES)`
`745`	`737`	`{`
`746`		`- return values.size() < 1;`
`747`		`- }`
`748`		`- else`
`749`		`- {`
`750`		`- return acceptsArg();`
	`738`	`+ return values.isEmpty();`
`751`	`739`	`}`
	`740`	`+ return acceptsArg();`
`752`	`741`	`}`
`753`	`742`
`754`	`743`	`/**`