removed the leading and trailing spaces from multi token option values

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

Author: John Keyes

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

@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//cli/src/java/org/apache/commons/cli/Parser.java,v 1.11 2002/12/09 23:47:25 jkeyes Exp $
- * $Revision: 1.11 $
- * $Date: 2002/12/09 23:47:25 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//cli/src/java/org/apache/commons/cli/Parser.java,v 1.12 2003/01/17 20:00:14 jkeyes Exp $
+ * $Revision: 1.12 $
+ * $Date: 2003/01/17 20:00:14 $
  *
  * ====================================================================
  *
@@ -72,7 +72,7 @@
  *
  * @author John Keyes (john at integralsource.com)
  * @see Parser
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
  */
 public abstract class Parser implements CommandLineParser {
 
@@ -375,9 +375,10 @@ public void processArgs(Option opt, ListIterator iter)
             // found a value
             else
             {
+
                 try
                 {
-                    opt.addValue(str);
+                    opt.addValue( Util.stripLeadingAndTrailingQuotes(str) );
                 }
                 catch (RuntimeException exp)
                 {

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

@@ -1,7 +1,7 @@
 /*
- * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//cli/src/java/org/apache/commons/cli/Util.java,v 1.2 2002/12/09 23:47:25 jkeyes Exp $
- * $Revision: 1.2 $
- * $Date: 2002/12/09 23:47:25 $
+ * $Header: /home/jerenkrantz/tmp/commons/commons-convert/cvs/home/cvs/jakarta-commons//cli/src/java/org/apache/commons/cli/Util.java,v 1.3 2003/01/17 20:00:14 jkeyes Exp $
+ * $Revision: 1.3 $
+ * $Date: 2003/01/17 20:00:14 $
  *
  * ====================================================================
  *
@@ -73,8 +73,7 @@ class Util {
      *
      * @param str The string from which the hyphens should be removed.
      *
-     * @return the hyphens from the begining of <code>str</code> and
-     * return the new String.
+     * @return the new String.
      */
     static String stripLeadingHyphens(String str)
     {
@@ -89,4 +88,24 @@ else if (str.startsWith("-"))
 
         return str;
     }
+
+    /**
+     * <p>Remove the leading and trailing quotes from <code>str</code>,
+     * e.g. if str is '"one two"', then 'one two' is returned.</p>
+     *
+     * @param str The string from which the leading and trailing quotes
+     * should be removed.
+     *
+     * @return The string without the leading and trailing quotes.
+     */
+    static String stripLeadingAndTrailingQuotes(String str)
+    {
+        if (str.startsWith("\"")) {
+            str = str.substring(1, str.length());
+        }
+        if (str.endsWith("\"")) {
+            str = str.substring(0, str.length()-1);
+        }
+        return str;
+    }
 }

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

@@ -5,7 +5,7 @@
  * version 1.1, a copy of which has been included with this distribution in
  * the LICENSE file.
  * 
- * $Id: BugsTest.java,v 1.15 2003/01/16 23:06:52 jkeyes Exp $
+ * $Id: BugsTest.java,v 1.16 2003/01/17 20:00:14 jkeyes Exp $
  */
 
 package org.apache.commons.cli;
@@ -381,7 +381,7 @@ public void test15648() throws Exception {
         Options options = new Options();
         options.addOption( m );
         CommandLine line = parser.parse( options, args );
-        assertEquals( "\"Two Words\"", line.getOptionValue( "m" ) );
+        assertEquals( "Two Words", line.getOptionValue( "m" ) );
     }
 
 }