Make fields final where possible

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

Author: britter

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

@@ -34,7 +34,7 @@ public class AmbiguousOptionException extends UnrecognizedOptionException
     private static final long serialVersionUID = 5829816121277947229L;
 
     /** The list of options matching the partial name specified */
-    private Collection<String> matchingOptions;
+    private final Collection<String> matchingOptions;
 
     /**
      * Constructs a new AmbiguousOptionException.

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

@@ -51,7 +51,7 @@ public class Option implements Cloneable, Serializable
     private static final long serialVersionUID = 1L;
 
     /** the name of the option */
-    private String opt;
+    private final String opt;
 
     /** the long representation of the option */
     private String longOpt;

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

@@ -57,7 +57,7 @@ public final class OptionBuilder
     private static char valuesep;
 
     /** option builder instance */
-    private static OptionBuilder instance = new OptionBuilder();
+    private static final OptionBuilder instance = new OptionBuilder();
 
     static
     {

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

@@ -34,7 +34,7 @@ public class OptionGroup implements Serializable
     private static final long serialVersionUID = 1L;
 
     /** hold the options */
-    private Map<String, Option> optionMap = new HashMap<String, Option>();
+    private final Map<String, Option> optionMap = new HashMap<String, Option>();
 
     /** the name of the selected option */
     private String selected;

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

@@ -47,18 +47,18 @@ public class Options implements Serializable
     private static final long serialVersionUID = 1L;
 
     /** a map of the options with the character key */
-    private Map<String, Option> shortOpts = new LinkedHashMap<String, Option>();
+    private final Map<String, Option> shortOpts = new LinkedHashMap<String, Option>();
 
     /** a map of the options with the long key */
-    private Map<String, Option> longOpts = new LinkedHashMap<String, Option>();
+    private final Map<String, Option> longOpts = new LinkedHashMap<String, Option>();
 
     /** a map of the required options */
     // N.B. This can contain either a String (addOption) or an OptionGroup (addOptionGroup)
     // TODO this seems wrong
-    private List<Object> requiredOpts = new ArrayList<Object>();
+    private final List<Object> requiredOpts = new ArrayList<Object>();
 
     /** a map of the option groups */
-    private Map<String, OptionGroup> optionGroups = new HashMap<String, OptionGroup>();
+    private final Map<String, OptionGroup> optionGroups = new HashMap<String, OptionGroup>();
 
     /**
      * Add the specified option group.

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

@@ -33,7 +33,7 @@
 public class PosixParser extends Parser
 {
     /** holder for flattened tokens */
-    private List<String> tokens = new ArrayList<String>();
+    private final List<String> tokens = new ArrayList<String>();
 
     /** specifies if bursting should continue */
     private boolean eatTheRest;

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

@@ -31,7 +31,7 @@
 public class OptionGroupTest
 {
     private Options _options = null;
-    private Parser parser = new PosixParser();
+    private final Parser parser = new PosixParser();
 
     @Before
     public void setUp()

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

@@ -29,7 +29,7 @@
 public class ValueTest
 {
     private CommandLine _cl = null;
-    private Options opts = new Options();
+    private final Options opts = new Options();
 
     @Before
     public void setUp() throws Exception