Applying Andrew's fix to CLI-61 and rolling back the getMessageKey addition to OptionException that was applied from CLI-145

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

Author: hen

src/java/org/apache/commons/cli2/OptionException.java

@@ -43,9 +43,6 @@ public class OptionException
     /** The message explaining the Exception */
     private final String message;
 
-    /** The id of the message */
-    private final String messageKey;
-
     /**
      * Creates a new OptionException.
      *
@@ -76,7 +73,6 @@ public OptionException(final Option option,
                            final String messageKey,
                            final String value) {
         this.option = option;
-        this.messageKey = messageKey;
 
         if (messageKey != null) {
             final StringBuffer buffer = new StringBuffer();
@@ -109,7 +105,4 @@ public String getMessage() {
         return message;
     }
 
-    public String getMessageKey() {
-        return messageKey;
-    }
 }

src/java/org/apache/commons/cli2/WriteableCommandLine.java

@@ -36,6 +36,16 @@ public interface WriteableCommandLine extends CommandLine {
      */
     void addValue(final Option option, final Object value);
 
+    /**
+     * Retrieves the Argument values specified on the command line for the
+     * specified Option, this doesn't return any values supplied
+     * programmatically as defaults.
+     *
+     * @param option the Option associated with the values
+     * @return a list of values or an empty List if none are found
+     */
+    List getUndefaultedValues(final Option option);
+
     /**
      * Sets the default values for an Option in the CommandLine
      * @param option the Option to add to

src/java/org/apache/commons/cli2/commandline/WriteableCommandLineImpl.java

@@ -129,6 +129,18 @@ public List getValues(final Option option,
         return valueList;
     }
 
+    public List getUndefaultedValues(Option option) {
+      // First grab the command line values
+      List valueList = (List) values.get(option);
+
+      // Finally use an empty list
+      if (valueList == null) {
+        valueList = Collections.EMPTY_LIST;
+      }
+
+      return valueList;
+    }
+
     public Boolean getSwitch(final Option option,
                              final Boolean defaultValue) {
         // First grab the command line values

src/java/org/apache/commons/cli2/option/ArgumentImpl.java

@@ -141,7 +141,7 @@ public void processValues(final WriteableCommandLine commandLine,
                               final Option option)
         throws OptionException {
         // count of arguments processed for this option.
-        int argumentCount = 0;
+        int argumentCount = commandLine.getUndefaultedValues(option).size();
 
         while (arguments.hasNext() && (argumentCount < maximum)) {
             final String allValuesQuoted = (String) arguments.next();

src/test/org/apache/commons/cli2/bug/BugLoopingOptionLookAlikeTest.java

@@ -23,7 +23,6 @@
 import org.apache.commons.cli2.Argument;
 import org.apache.commons.cli2.Group;
 import org.apache.commons.cli2.OptionException;
-import org.apache.commons.cli2.resource.ResourceConstants;
 import org.apache.commons.cli2.builder.ArgumentBuilder;
 import org.apache.commons.cli2.builder.DefaultOptionBuilder;
 import org.apache.commons.cli2.builder.GroupBuilder;
@@ -74,7 +73,7 @@ public void testLoopingOptionLookAlike2() {
             parser.parse(new String[] { "testfile.txt", "testfile.txt", "testfile.txt", "testfile.txt" });
             fail("OptionException");
         } catch (OptionException e) {
-            assertEquals(ResourceConstants.ARGUMENT_UNEXPECTED_VALUE, e.getMessageKey());
+            assertEquals("Unexpected testfile.txt while processing ", e.getMessage());
         }
     }    
 }