removed old getOption method, fixed new getOption impl, removed duff println

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

Author: John Keyes

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

@@ -124,7 +124,6 @@ public Options() {
                 // this will not happen ?
             }
         }
-        System.out.println( parser.getClass().getName() );
     }
 
     /**
@@ -394,7 +393,7 @@ public CommandLine parse(List inArgs, boolean stopAtNonOption)
         CommandLine cl = new CommandLine();
 
         List args = parser.parse( this, inArgs, stopAtNonOption );
-        
+
         ListIterator argIter = args.listIterator();
         String   eachArg = null;
         Option   eachOpt = null;
@@ -571,27 +570,27 @@ public List getOptions() {
         return Collections.unmodifiableList(options);
     }
 
-    /** <p>Retrieve the named {@link Option}<p>
+    /** <p>Retrieve the named {@link Option}</p>
      *
      * @param opt short single-character name of the {@link Option}
      * @return the option represented by opt
      */
     public Option getOption(String opt) {
-        if( opt.startsWith( "--" ) ) {
+
+        // short option
+        if( opt.length() == 1 ) {
+            return (Option) shortOpts.get( "-" + opt );
+        }
+        // long option
+        else if( opt.startsWith( "--" ) ) {
             return (Option) longOpts.get( opt );
         }
-        return (Option) shortOpts.get( "-" + opt );
+        // a just-in-case
+        else {
+            return (Option) shortOpts.get( opt );
+        }
     }
 
-    /** <p>Retrieve the named {@link Option}<p>
-     *
-     * @param longOpt long name of the {@link Option}
-     * @return the option represented by longOpt
-     */
-    /*public Option getOption(String longOpt) {
-        return (Option) longOpts.get( longOpt );
-    } */
-    
     /** <p>Dump state, suitable for debugging.</p>
      *
      * @return Stringified form of this object