svn commit: r1295377 - /oodt/trunk/cli/src/main/java/org/apache/oodt/cas/cli/util/CmdLineUtils.java

[bfoster]

Author: bfoster
Date: Thu Mar  1 02:08:43 2012
New Revision: 1295377

URL: http://svn.apache.org/viewvc?rev=1295377&view=rev
Log:
- cas-cli sub-option requirements for help printing was not using p:required 
for GroupSubOption

--------------
OODT-399

Modified:
    oodt/trunk/cli/src/main/java/org/apache/oodt/cas/cli/util/CmdLineUtils.java

Modified: 
oodt/trunk/cli/src/main/java/org/apache/oodt/cas/cli/util/CmdLineUtils.java
URL: 
http://svn.apache.org/viewvc/oodt/trunk/cli/src/main/java/org/apache/oodt/cas/cli/util/CmdLineUtils.java?rev=1295377&r1=1295376&r2=1295377&view=diff
==============================================================================
--- oodt/trunk/cli/src/main/java/org/apache/oodt/cas/cli/util/CmdLineUtils.java 
(original)
+++ oodt/trunk/cli/src/main/java/org/apache/oodt/cas/cli/util/CmdLineUtils.java 
Thu Mar  1 02:08:43 2012
@@ -113,7 +113,8 @@ public class CmdLineUtils {
          CmdLineAction action, GroupCmdLineOption option) {
       Set<CmdLineOption> relevantOptions = Sets.newHashSet();
       for (GroupSubOption subOption : option.getSubOptions()) {
-         if (isRequired(action, subOption.getOption())
+         if (subOption.getOption().getRequirementRules().isEmpty()
+               || isRequired(action, subOption.getOption())
                || isStrictlyOptional(action, subOption.getOption())) {
             relevantOptions.add(subOption.getOption());
          }
@@ -162,7 +163,8 @@ public class CmdLineUtils {
 
       Set<CmdLineOption> requiredOptions = Sets.newHashSet();
       for (GroupSubOption subOption : option.getSubOptions()) {
-         if (isRequired(action, subOption.getOption())) {
+         if (subOption.isRequired()
+               || isRequired(action, subOption.getOption())) {
             requiredOptions.add(subOption.getOption());
          }
       }