Add final modifier to local variables.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/cli/trunk@1797673 13f79535-47bb-0310-9956-ffa450edef68

Author: garydgregory

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

@@ -66,11 +66,11 @@ public Collection<String> getMatchingOptions()
      */
     private static String createMessage(String option, Collection<String> matchingOptions)
     {
-        StringBuilder buf = new StringBuilder("Ambiguous option: '");
+        final StringBuilder buf = new StringBuilder("Ambiguous option: '");
         buf.append(option);
         buf.append("'  (could be: ");
 
-        Iterator<String> it = matchingOptions.iterator();
+        final Iterator<String> it = matchingOptions.iterator();
         while (it.hasNext())
         {
             buf.append("'");

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

@@ -104,7 +104,7 @@ public Object getOptionObject(String opt)
         {
             return getParsedOptionValue(opt);
         }
-        catch (ParseException pe)
+        catch (final ParseException pe)
         {
             System.err.println("Exception found converting " + opt + " to desired type: " + pe.getMessage());
             return null;
@@ -126,7 +126,7 @@ public Object getParsedOptionValue(Option option) throws ParseException
         {
             return null;
         }
-        String res = getOptionValue(option);
+        final String res = getOptionValue(option);
         if (res == null)
         {
             return null;
@@ -188,7 +188,7 @@ public String getOptionValue(Option option)
         {
             return null;
         }
-        String[] values = getOptionValues(option);
+        final String[] values = getOptionValues(option);
         return (values == null) ? null : values[0];
     }
 
@@ -226,9 +226,9 @@ public String getOptionValue(char opt)
      */
     public String[] getOptionValues(Option option)
     {
-        List<String> values = new ArrayList<String>();
+        final List<String> values = new ArrayList<String>();
 
-        for (Option processedOption : options)
+        for (final Option processedOption : options)
         {
             if (processedOption.equals(option))
             {
@@ -260,7 +260,7 @@ public String[] getOptionValues(String opt)
     private Option resolveOption(String opt)
     {
         opt = Util.stripLeadingHyphens(opt);
-        for (Option option : options)
+        for (final Option option : options)
         {
             if (opt.equals(option.getOpt()))
             {
@@ -300,7 +300,7 @@ public String[] getOptionValues(char opt)
      */
     public String getOptionValue(Option option, String defaultValue)
     {
-        String answer = getOptionValue(option);
+        final String answer = getOptionValue(option);
         return (answer != null) ? answer : defaultValue;
     }
 
@@ -347,13 +347,13 @@ public String getOptionValue(char opt, String defaultValue)
      */
     public Properties getOptionProperties(Option option)
     {
-        Properties props = new Properties();
+        final Properties props = new Properties();
 
-        for (Option processedOption : options)
+        for (final Option processedOption : options)
         {
             if (processedOption.equals(option))
             {
-                List<String> values = processedOption.getValuesList();
+                final List<String> values = processedOption.getValuesList();
                 if (values.size() >= 2)
                 {
                     // use the first 2 arguments as the key/value pair
@@ -385,13 +385,13 @@ else if (values.size() == 1)
      */
     public Properties getOptionProperties(String opt)
     {
-        Properties props = new Properties();
+        final Properties props = new Properties();
 
-        for (Option option : options)
+        for (final Option option : options)
         {
             if (opt.equals(option.getOpt()) || opt.equals(option.getLongOpt()))
             {
-                List<String> values = option.getValuesList();
+                final List<String> values = option.getValuesList();
                 if (values.size() >= 2)
                 {
                     // use the first 2 arguments as the key/value pair
@@ -415,7 +415,7 @@ else if (values.size() == 1)
      */
     public String[] getArgs()
     {
-        String[] answer = new String[args.size()];
+        final String[] answer = new String[args.size()];
 
         args.toArray(answer);
 
@@ -492,10 +492,10 @@ public Iterator<Option> iterator()
      */
     public Option[] getOptions()
     {
-        Collection<Option> processed = options;
+        final Collection<Option> processed = options;
 
         // reinitialise array
-        Option[] optionsArray = new Option[processed.size()];
+        final Option[] optionsArray = new Option[processed.size()];
 
         // return the array
         return processed.toArray(optionsArray);

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

@@ -106,7 +106,7 @@ public CommandLine parse(Options options, String[] arguments, Properties propert
         expectedOpts = new ArrayList(options.getRequiredOptions());
 
         // clear the data from the groups
-        for (OptionGroup group : options.getOptionGroups())
+        for (final OptionGroup group : options.getOptionGroups())
         {
             group.setSelected(null);
         }
@@ -115,7 +115,7 @@ public CommandLine parse(Options options, String[] arguments, Properties propert
 
         if (arguments != null)
         {
-            for (String argument : arguments)
+            for (final String argument : arguments)
             {
                 handleToken(argument);
             }
@@ -144,24 +144,24 @@ private void handleProperties(Properties properties) throws ParseException
             return;
         }
 
-        for (Enumeration<?> e = properties.propertyNames(); e.hasMoreElements();)
+        for (final Enumeration<?> e = properties.propertyNames(); e.hasMoreElements();)
         {
-            String option = e.nextElement().toString();
+            final String option = e.nextElement().toString();
 
-            Option opt = options.getOption(option);
+            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
-            OptionGroup group = options.getOptionGroup(opt);
-            boolean selected = group != null && group.getSelected() != null;
+            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
-                String value = properties.getProperty(option);
+                final String value = properties.getProperty(option);
 
                 if (opt.hasArg())
                 {
@@ -275,7 +275,7 @@ private boolean isNegativeNumber(String token)
             Double.parseDouble(token);
             return true;
         }
-        catch (NumberFormatException e)
+        catch (final NumberFormatException e)
         {
             return false;
         }
@@ -305,8 +305,8 @@ private boolean isShortOption(String token)
         }
 
         // remove leading "-" and "=value"
-        int pos = token.indexOf("=");
-        String optName = pos == -1 ? token.substring(1) : token.substring(1, pos);
+        final int pos = token.indexOf("=");
+        final String optName = pos == -1 ? token.substring(1) : token.substring(1, pos);
         if (options.hasShortOption(optName))
         {
             return true;
@@ -327,8 +327,8 @@ private boolean isLongOption(String token)
             return false;
         }
 
-        int pos = token.indexOf("=");
-        String t = pos == -1 ? token : token.substring(0, pos);
+        final int pos = token.indexOf("=");
+        final String t = pos == -1 ? token : token.substring(0, pos);
 
         if (!options.getMatchingOptions(t).isEmpty())
         {
@@ -401,7 +401,7 @@ private void handleLongOption(String token) throws ParseException
      */
     private void handleLongOptionWithoutEqual(String token) throws ParseException
     {
-        List<String> matchingOpts = options.getMatchingOptions(token);
+        final List<String> matchingOpts = options.getMatchingOptions(token);
         if (matchingOpts.isEmpty())
         {
             handleUnknownToken(currentToken);
@@ -428,13 +428,13 @@ else if (matchingOpts.size() > 1)
      */
     private void handleLongOptionWithEqual(String token) throws ParseException
     {
-        int pos = token.indexOf('=');
+        final int pos = token.indexOf('=');
 
-        String value = token.substring(pos + 1);
+        final String value = token.substring(pos + 1);
 
-        String opt = token.substring(0, pos);
+        final String opt = token.substring(0, pos);
 
-        List<String> matchingOpts = options.getMatchingOptions(opt);
+        final List<String> matchingOpts = options.getMatchingOptions(opt);
         if (matchingOpts.isEmpty())
         {
             handleUnknownToken(currentToken);
@@ -445,7 +445,7 @@ else if (matchingOpts.size() > 1)
         }
         else
         {
-            Option option = options.getOption(matchingOpts.get(0));
+            final Option option = options.getOption(matchingOpts.get(0));
 
             if (option.acceptsArg())
             {
@@ -481,9 +481,9 @@ else if (matchingOpts.size() > 1)
      */
     private void handleShortAndLongOption(String token) throws ParseException
     {
-        String t = Util.stripLeadingHyphens(token);
+        final String t = Util.stripLeadingHyphens(token);
 
-        int pos = t.indexOf('=');
+        final int pos = t.indexOf('=');
 
         if (t.length() == 1)
         {
@@ -512,7 +512,7 @@ else if (!options.getMatchingOptions(t).isEmpty())
             else
             {
                 // look for a long prefix (-Xmx512m)
-                String opt = getLongPrefix(t);
+                final String opt = getLongPrefix(t);
 
                 if (opt != null && options.getOption(opt).acceptsArg())
                 {
@@ -537,13 +537,13 @@ else if (isJavaProperty(t))
         else
         {
             // equal sign found (-xxx=yyy)
-            String opt = t.substring(0, pos);
-            String value = t.substring(pos + 1);
+            final String opt = t.substring(0, pos);
+            final String value = t.substring(pos + 1);
 
             if (opt.length() == 1)
             {
                 // -S=V
-                Option option = options.getOption(opt);
+                final Option option = options.getOption(opt);
                 if (option != null && option.acceptsArg())
                 {
                     handleOption(option);
@@ -578,13 +578,13 @@ else if (isJavaProperty(opt))
      */
     private String getLongPrefix(String token)
     {
-        String t = Util.stripLeadingHyphens(token);
+        final String t = Util.stripLeadingHyphens(token);
 
         int i;
         String opt = null;
         for (i = t.length() - 2; i > 1; i--)
         {
-            String prefix = t.substring(0, i);
+            final String prefix = t.substring(0, i);
             if (options.hasLongOption(prefix))
             {
                 opt = prefix;
@@ -600,8 +600,8 @@ private String getLongPrefix(String token)
      */
     private boolean isJavaProperty(String token)
     {
-        String opt = token.substring(0, 1);
-        Option option = options.getOption(opt);
+        final String opt = token.substring(0, 1);
+        final Option option = options.getOption(opt);
 
         return option != null && (option.getArgs() >= 2 || option.getArgs() == Option.UNLIMITED_VALUES);
     }
@@ -642,7 +642,7 @@ private void updateRequiredOptions(Option option) throws AlreadySelectedExceptio
         // if the option is in an OptionGroup make that option the selected option of the group
         if (options.getOptionGroup(option) != null)
         {
-            OptionGroup group = options.getOptionGroup(option);
+            final OptionGroup group = options.getOptionGroup(option);
 
             if (group.isRequired())
             {
@@ -684,7 +684,7 @@ protected void handleConcatenatedOptions(String token) throws ParseException
     {
         for (int i = 1; i < token.length(); i++)
         {
-            String ch = String.valueOf(token.charAt(i));
+            final String ch = String.valueOf(token.charAt(i));
 
             if (options.hasOption(ch))
             {

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

@@ -50,13 +50,13 @@ public class GnuParser extends Parser
     @Override
     protected String[] flatten(Options options, String[] arguments, boolean stopAtNonOption)
     {
-        List<String> tokens = new ArrayList<String>();
+        final List<String> tokens = new ArrayList<String>();
 
         boolean eatTheRest = false;
 
         for (int i = 0; i < arguments.length; i++)
         {
-            String arg = arguments[i];
+            final String arg = arguments[i];
 
             if ("--".equals(arg))
             {
@@ -69,7 +69,7 @@ else if ("-".equals(arg))
             }
             else if (arg.startsWith("-"))
             {
-                String opt = Util.stripLeadingHyphens(arg);
+                final String opt = Util.stripLeadingHyphens(arg);
 
                 if (options.hasOption(opt))
                 {