Use ternary

Whitespace

Author: garydgregory

src/main/java/org/apache/commons/cli/DefaultParser.java

@@ -251,7 +251,6 @@ protected void checkRequiredOptions() throws MissingOptionException {
      */
     private String getLongPrefix(final String token) {
         final String t = Util.stripLeadingHyphens(token);
-
         int i;
         String opt = null;
         for (i = t.length() - 2; i > 1; i--) {
@@ -261,7 +260,6 @@ private String getLongPrefix(final String token) {
                 break;
             }
         }
-
         return opt;
     }
 
@@ -280,7 +278,6 @@ private List<String> getMatchingLongOptions(final String token) {
             final Option option = options.getOption(token);
             matches.add(option.getLongOpt());
         }
-
         return matches;
     }
 
@@ -307,7 +304,6 @@ private List<String> getMatchingLongOptions(final String token) {
     protected void handleConcatenatedOptions(final String token) throws ParseException {
         for (int i = 1; i < token.length(); i++) {
             final String ch = String.valueOf(token.charAt(i));
-
             if (!options.hasOption(ch)) {
                 handleUnknownToken(stopAtNonOption && i > 1 ? token.substring(i) : token);
                 break;
@@ -346,11 +342,8 @@ private void handleLongOption(final String token) throws ParseException {
      */
     private void handleLongOptionWithEqual(final String token) throws ParseException {
         final int pos = token.indexOf('=');
-
         final String value = token.substring(pos + 1);
-
         final String opt = token.substring(0, pos);
-
         final List<String> matchingOpts = getMatchingLongOptions(opt);
         if (matchingOpts.isEmpty()) {
             handleUnknownToken(currentToken);
@@ -359,7 +352,6 @@ private void handleLongOptionWithEqual(final String token) throws ParseException
         } else {
             final String key = options.hasLongOption(opt) ? opt : matchingOpts.get(0);
             final Option option = options.getOption(key);
-
             if (option.acceptsArg()) {
                 handleOption(option);
                 currentOption.addValueForProcessing(stripLeadingAndTrailingQuotesDefaultOff(value));
@@ -392,18 +384,10 @@ private void handleLongOptionWithoutEqual(final String token) throws ParseExcept
     private void handleOption(final Option option) throws ParseException {
         // check the previous option before handling the next one
         checkRequiredArgs();
-
         final Option copy = (Option) option.clone();
-
         updateRequiredOptions(copy);
-
         cmd.addOption(copy);
-
-        if (copy.hasArg()) {
-            currentOption = copy;
-        } else {
-            currentOption = null;
-        }
+        currentOption = copy.hasArg() ? copy : null;
     }
 
     /**
@@ -415,19 +399,15 @@ private void handleProperties(final Properties properties) throws ParseException
         if (properties == null) {
             return;
         }
-
         for (final Enumeration<?> e = properties.propertyNames(); e.hasMoreElements();) {
             final String option = e.nextElement().toString();
-
             final Option opt = options.getOption(option);
             if (opt == null) {
                 throw new UnrecognizedOptionException("Default option wasn't defined", option);
             }
-
             // if the option is part of a group, check if another option of the group has been selected
             final OptionGroup group = options.getOptionGroup(opt);
             final boolean selected = group != null && group.getSelected() != null;
-
             if (!cmd.hasOption(option) && !selected) {
                 // get the value from the properties
                 final String value = properties.getProperty(option);
@@ -440,7 +420,6 @@ private void handleProperties(final Properties properties) throws ParseException
                     // if the value is not yes, true or 1 then don't add the option to the CommandLine
                     continue;
                 }
-
                 handleOption(opt);
                 currentOption = null;
             }
@@ -458,9 +437,7 @@ private void handleProperties(final Properties properties) throws ParseException
      */
     private void handleShortAndLongOption(final String token) throws ParseException {
         final String t = Util.stripLeadingHyphens(token);
-
         final int pos = t.indexOf('=');
-
         if (t.length() == 1) {
             // -S
             if (options.hasShortOption(t)) {
@@ -529,7 +506,6 @@ private void handleShortAndLongOption(final String token) throws ParseException
      */
     private void handleToken(final String token) throws ParseException {
         currentToken = token;
-
         if (skipParsing) {
             cmd.addArg(token);
         } else if ("--".equals(token)) {
@@ -543,7 +519,6 @@ private void handleToken(final String token) throws ParseException {
         } else {
             handleUnknownToken(token);
         }
-
         if (currentOption != null && !currentOption.acceptsArg()) {
             currentOption = null;
         }
@@ -560,7 +535,6 @@ private void handleUnknownToken(final String token) throws ParseException {
         if (token.startsWith("-") && token.length() > 1 && !stopAtNonOption) {
             throw new UnrecognizedOptionException("Unrecognized option: " + token, token);
         }
-
         cmd.addArg(token);
         if (stopAtNonOption) {
             skipParsing = true;
@@ -582,7 +556,6 @@ private boolean isArgument(final String token) {
     private boolean isJavaProperty(final String token) {
         final String opt = token.isEmpty() ? null : token.substring(0, 1);
         final Option option = options.getOption(opt);
-
         return option != null && (option.getArgs() >= 2 || option.getArgs() == Option.UNLIMITED_VALUES);
     }
 
@@ -595,10 +568,8 @@ private boolean isLongOption(final String token) {
         if (token == null || !token.startsWith("-") || token.length() == 1) {
             return false;
         }
-
         final int pos = token.indexOf("=");
         final String t = pos == -1 ? token : token.substring(0, pos);
-
         if (!getMatchingLongOptions(t).isEmpty()) {
             // long or partial long options (--L, -L, --L=V, -L=V, --l, --l=V)
             return true;
@@ -607,7 +578,6 @@ private boolean isLongOption(final String token) {
             // -LV
             return true;
         }
-
         return false;
     }
 
@@ -644,7 +614,6 @@ private boolean isShortOption(final String token) {
         if (token == null || !token.startsWith("-") || token.length() == 1) {
             return false;
         }
-
         // remove leading "-" and "=value"
         final int pos = token.indexOf("=");
         final String optName = pos == -1 ? token.substring(1) : token.substring(1, pos);