added fix for Rob's problem (2), so it is now possible to query using either the opt or longOpt

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

Author: John Keyes

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

@@ -91,6 +91,9 @@ public class CommandLine {
     /** the processed options */
     private Map options = new HashMap();
 
+    /** the option name map */
+    private Map names   = new HashMap();
+
     /** Map of unique options for ease to get complete list of options */
     private Map hashcodeMap = new HashMap();
 
@@ -179,8 +182,13 @@ public String getOptionValue( char opt ) {
     public String[] getOptionValues( String opt ) {
         List values = new java.util.ArrayList();
 
-        if( options.containsKey( opt ) ) {
-            List opts = (List)options.get( opt );
+        String key = opt;
+        if( names.containsKey( opt ) ) {
+            key = (String)names.get( opt );
+        }
+
+        if( options.containsKey( key ) ) {
+            List opts = (List)options.get( key );
             Iterator iter = opts.iterator();
 
             while( iter.hasNext() ) {
@@ -290,6 +298,9 @@ void addOption( Option opt ) {
         if( " ".equals(key) ) {
             key = opt.getLongOpt();
         }
+        else {
+            names.put( opt.getLongOpt(), key );
+        }
 
         if( options.get( key ) != null ) {
             ((java.util.List)options.get( key )).add( opt );

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

@@ -87,6 +87,7 @@ public void testSimpleLong()
             assertTrue( "Confirm -a is set", cl.hasOption("a") );
             assertTrue( "Confirm -b is set", cl.hasOption("b") );
             assertTrue( "Confirm arg of -b", cl.getOptionValue("b").equals("toast") );
+            assertTrue( "Confirm arg of --bfile", cl.getOptionValue( "bfile" ).equals( "toast" ) );
             assertTrue( "Confirm size of extra args", cl.getArgList().size() == 2);
         } 
         catch (ParseException e)