ArgumentImpl now deals with defaults a little better

Robert James Oxspring · Robert James Oxspring · commit 667f17a8305c · 2004-09-09T11:39:15.000Z
git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/cli/trunk@130092 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/src/java/org/apache/commons/cli2/option/ArgumentImpl.java b/src/java/org/apache/commons/cli2/option/ArgumentImpl.java
@@ -146,7 +146,7 @@ public void processValues(
         final ListIterator arguments,
         final Option option)
         throws OptionException {
-        int argumentCount = commandLine.getValues(option).size();
+        int argumentCount = commandLine.getValues(option,Collections.EMPTY_LIST).size();
         final int initialCount = argumentCount;
         while (arguments.hasNext() && argumentCount < maximum) {
 
@@ -194,11 +194,6 @@ else if (subsequentSplit) {
                 commandLine.addValue(option, allValues);
             }
         }
-
-        if (this.defaultValues == null
-            && (argumentCount < minimum || initialCount == argumentCount)) {
-                throw new OptionException(option, "cli.error.missing.values");
-        }
     }
 
     public boolean canProcess(String arg) {

Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ public void processValues(`
`146`	`146`	`final ListIterator arguments,`
`147`	`147`	`final Option option)`
`148`	`148`	`throws OptionException {`
`149`		`- int argumentCount = commandLine.getValues(option).size();`
	`149`	`+ int argumentCount = commandLine.getValues(option,Collections.EMPTY_LIST).size();`
`150`	`150`	`final int initialCount = argumentCount;`
`151`	`151`	`while (arguments.hasNext() && argumentCount < maximum) {`
`152`	`152`
`@@ -194,11 +194,6 @@ else if (subsequentSplit) {`
`194`	`194`	`commandLine.addValue(option, allValues);`
`195`	`195`	`}`
`196`	`196`	`}`
`197`		`-`
`198`		`- if (this.defaultValues == null`
`199`		`- && (argumentCount < minimum \|\| initialCount == argumentCount)) {`
`200`		`- throw new OptionException(option, "cli.error.missing.values");`
`201`		`- }`
`202`	`197`	`}`
`203`	`198`
`204`	`199`	`public boolean canProcess(String arg) {`