removed use of options list, reduced concatenation

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

Author: John Keyes

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

@@ -64,8 +64,6 @@
 import java.util.Collection;
 import java.util.Map;
 import java.util.HashMap;
-import java.util.List;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.Collections;
 
@@ -86,9 +84,6 @@
  */
 public class Options {
 
-    /** the list of options */
-    private List options      = new ArrayList();
-
     /** a map of the options with the character key */
     private Map  shortOpts    = new HashMap();
 
@@ -206,9 +201,10 @@ public Options addOption(String opt, String longOpt, boolean hasArg, String desc
      * <p>Adds an option instance</p>
      *
      * @param opt the option that is to be added 
+     * @return the resulting Options instance
      */
     public Options addOption(Option opt)  {
-        String shortOptStr = "-" + opt.getOpt();
+        String shortOpt = "-" + opt.getOpt();
 
         // add it to the long option list
         if ( opt.hasLongOpt() ) {
@@ -217,21 +213,20 @@ public Options addOption(Option opt)  {
 
         // if the option is required add it to the required list
         if ( opt.isRequired() ) {
-            requiredOpts.put( "-" + opt.getOpt(), opt );
+            requiredOpts.put( shortOpt, opt );
         }
 
-        shortOpts.put( "-" + opt.getOpt(), opt );
+        shortOpts.put( shortOpt, opt );
 
-        options.add( opt );
         return this;
     }
 
     /** <p>Retrieve a read-only list of options in this set</p>
      *
-     * @return read-only List of {@link Option} objects in this descriptor
+     * @return read-only Collection of {@link Option} objects in this descriptor
      */
-    public List getOptions() {
-        return Collections.unmodifiableList(options);
+    public Collection getOptions() {
+        return Collections.unmodifiableCollection( shortOpts.values() );
     }
 
     /** <p>Returns the required options as a