svn commit: r1196726 - /oodt/trunk/cli/src/main/java/org/apache/oodt/cas/cli/parser/StdCmdLineOptionParser.java

[bf...@apache.org]

Author: bfoster
Date: Wed Nov  2 18:09:41 2011
New Revision: 1196726

URL: http://svn.apache.org/viewvc?rev=1196726&view=rev
Log:
- fixed subOptions from be able to be used at a stand-along top level option
- group options now require that at least on subOption should be specified

Modified:
    oodt/trunk/cli/src/main/java/org/apache/oodt/cas/cli/parser/StdCmdLineOptionParser.java

Modified: oodt/trunk/cli/src/main/java/org/apache/oodt/cas/cli/parser/StdCmdLineOptionParser.java
URL: http://svn.apache.org/viewvc/oodt/trunk/cli/src/main/java/org/apache/oodt/cas/cli/parser/StdCmdLineOptionParser.java?rev=1196726&r1=1196725&r2=1196726&view=diff
==============================================================================
--- oodt/trunk/cli/src/main/java/org/apache/oodt/cas/cli/parser/StdCmdLineOptionParser.java (original)
+++ oodt/trunk/cli/src/main/java/org/apache/oodt/cas/cli/parser/StdCmdLineOptionParser.java Wed Nov  2 18:09:41 2011
@@ -99,6 +99,11 @@ public class StdCmdLineOptionParser impl
                                  + "': "
                                  + sortOptionsByRequiredStatus(requiredSubOptions));
 
+                  } else if (currentGroup.getSubOptions().isEmpty()) {
+                     throw new IOException(
+                           "Must specify a subOption for group option '"
+                                 + currentGroup.getOption() + "'");
+
                   } else {
 
                      // pop group and add to list of specified options.
@@ -118,6 +123,10 @@ public class StdCmdLineOptionParser impl
                // Push group as current group.
                groupOptions.push(specifiedOption);
 
+            } else if (option.isSubOption()) {
+               throw new IOException("Option '" + option
+                     + "' is a subOption, but was used at top level Option");
+
             } else {
 
                // Option good to go.