No need to nest in else.

Author: garydgregory

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

@@ -383,7 +383,7 @@ private boolean isLongOption(final String token)
             // long or partial long options (--L, -L, --L=V, -L=V, --l, --l=V)
             return true;
         }
-        else if (getLongPrefix(token) != null && !token.startsWith("--"))
+        if (getLongPrefix(token) != null && !token.startsWith("--"))
         {
             // -LV
             return true;
@@ -759,20 +759,16 @@ protected void handleConcatenatedOptions(final String token) throws ParseExcepti
         {
             final String ch = String.valueOf(token.charAt(i));
 
-            if (options.hasOption(ch))
-            {
-                handleOption(options.getOption(ch));
-
-                if (currentOption != null && token.length() != i + 1)
-                {
-                    // add the trail as an argument of the option
-                    currentOption.addValueForProcessing(token.substring(i + 1));
-                    break;
-                }
+            if (!options.hasOption(ch)) {
+                handleUnknownToken(stopAtNonOption && i > 1 ? token.substring(i) : token);
+                break;
             }
-            else
+            handleOption(options.getOption(ch));
+
+            if (currentOption != null && token.length() != i + 1)
             {
-                handleUnknownToken(stopAtNonOption && i > 1 ? token.substring(i) : token);
+                // add the trail as an argument of the option
+                currentOption.addValueForProcessing(token.substring(i + 1));
                 break;
             }
         }

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

@@ -93,14 +93,10 @@ public void setSelected(final Option option) throws AlreadySelectedException
         // if no option has already been selected or the
         // same option is being reselected then set the
         // selected member variable
-        if (selected == null || selected.equals(option.getKey()))
-        {
-            selected = option.getKey();
-        }
-        else
-        {
+        if ((selected != null) && !selected.equals(option.getKey())) {
             throw new AlreadySelectedException(this, option);
         }
+        selected = option.getKey();
     }
 
     /**

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

@@ -67,42 +67,39 @@ public static <T> T createValue(final String str, final Class<T> clazz) throws P
         {
             return (T) str;
         }
-        else if (PatternOptionBuilder.OBJECT_VALUE == clazz)
+        if (PatternOptionBuilder.OBJECT_VALUE == clazz)
         {
             return (T) createObject(str);
         }
-        else if (PatternOptionBuilder.NUMBER_VALUE == clazz)
+        if (PatternOptionBuilder.NUMBER_VALUE == clazz)
         {
             return (T) createNumber(str);
         }
-        else if (PatternOptionBuilder.DATE_VALUE == clazz)
+        if (PatternOptionBuilder.DATE_VALUE == clazz)
         {
             return (T) createDate(str);
         }
-        else if (PatternOptionBuilder.CLASS_VALUE == clazz)
+        if (PatternOptionBuilder.CLASS_VALUE == clazz)
         {
             return (T) createClass(str);
         }
-        else if (PatternOptionBuilder.FILE_VALUE == clazz)
+        if (PatternOptionBuilder.FILE_VALUE == clazz)
         {
             return (T) createFile(str);
         }
-        else if (PatternOptionBuilder.EXISTING_FILE_VALUE == clazz)
+        if (PatternOptionBuilder.EXISTING_FILE_VALUE == clazz)
         {
             return (T) openFile(str);
         }
-        else if (PatternOptionBuilder.FILES_VALUE == clazz)
+        if (PatternOptionBuilder.FILES_VALUE == clazz)
         {
             return (T) createFiles(str);
         }
-        else if (PatternOptionBuilder.URL_VALUE == clazz)
+        if (PatternOptionBuilder.URL_VALUE == clazz)
         {
             return (T) createURL(str);
         }
-        else
-        {
-            throw new ParseException("Unable to handle the class: " + clazz);
-        }
+        throw new ParseException("Unable to handle the class: " + clazz);
     }
 
     /**

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

@@ -40,7 +40,7 @@ static String stripLeadingHyphens(final String str)
         {
             return str.substring(2);
         }
-        else if (str.startsWith("-"))
+        if (str.startsWith("-"))
         {
             return str.substring(1);
         }

src/test/java/org/apache/commons/cli/ParserTestCase.java

@@ -930,11 +930,11 @@ public void testUnlimitedArgs() throws Exception
     private CommandLine parse(final CommandLineParser parser, final Options opts, final String[] args, final Properties properties) throws ParseException {
         if (parser instanceof Parser) {
             return ((Parser) parser).parse(opts, args, properties);
-        } else if (parser instanceof DefaultParser) {
+        }
+        if (parser instanceof DefaultParser) {
             return ((DefaultParser) parser).parse(opts, args, properties);
-        } else {
-            throw new UnsupportedOperationException("Default options not supported by this parser");
         }
+        throw new UnsupportedOperationException("Default options not supported by this parser");
     }
 
     @Test