krysalis-version/src/java/org/krysalis/version/tool VersionTool.java,1.2,1.3 VersionToolImpl.java,1.3,1.4

Update of /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/tool
In directory sc8-pr-cvs1:/tmp/cvs-serv19694/src/java/org/krysalis/version/tool

Modified Files:
	VersionTool.java VersionToolImpl.java 
Log Message:
Making constraint processing more descriptive

Index: VersionTool.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/tool/VersionTool.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VersionTool.java	13 Feb 2003 15:46:26 -0000	1.2
--- VersionTool.java	6 Mar 2003 02:58:42 -0000	1.3
***************
*** 79,82 ****
--- 79,85 ----
      private static final String BRAND_LONG = "brands";
  
+     private static final String CONSTRAINTS_SHORT = "c";
+     private static final String CONSTRAINTS_LONG = "constraints";
+ 
      private static final String VERBOSE_SHORT = "v";
      private static final String VERBOSE_LONG = "verbose";
***************
*** 85,88 ****
--- 88,92 ----
      private static Option l_all;
      private static Option l_allBrands;
+     private static Option l_constraints;
      private static Option l_verbose;
      private static Options l_options;
***************
*** 101,104 ****
--- 105,114 ----
                  false,
                  "display all branded versions");
+         l_constraints =
+             new Option(
+                 CONSTRAINTS_SHORT,
+         CONSTRAINTS_LONG,
+                 false,
+                 "display all constraints, and evaluate");
          l_verbose = new Option(VERBOSE_SHORT, VERBOSE_LONG, false, "verbose");
  
***************
*** 106,109 ****
--- 116,120 ----
          l_options.addOption(l_all);
          l_options.addOption(l_allBrands);
+         l_options.addOption(l_constraints);
          l_options.addOption(l_versionId);
          l_options.addOption(l_verbose);
***************
*** 117,125 ****
              VersionToolImpl tool = new VersionToolImpl(System.out);
  
!             if (cmd.hasArguments()) {
                  //:TODO: Usage..
              }
  
              if (cmd.isSet(l_verbose)) {
              }
  
--- 128,138 ----
              VersionToolImpl tool = new VersionToolImpl(System.out);
  
!             if (!cmd.hasArguments()) {
                  //:TODO: Usage..
+                 l_options.display();
              }
  
              if (cmd.isSet(l_verbose)) {
+                 //:TODO: Set verbose
              }
  
***************
*** 129,132 ****
--- 142,148 ----
              else if (cmd.isSet(l_allBrands)) {
                  tool.displayAllBrandedVersions();
+             }
+             else if (cmd.isSet(l_constraints)) {
+                 tool.processConstraints();
              }
              else {

Index: VersionToolImpl.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/tool/VersionToolImpl.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VersionToolImpl.java	5 Mar 2003 19:58:35 -0000	1.3
--- VersionToolImpl.java	6 Mar 2003 02:58:42 -0000	1.4
***************
*** 59,65 ****
  import java.io.PrintWriter;
  
- import org.krysalis.version.collecting.VersionCollection;
  import org.krysalis.version.collecting.UberVersionCollector;
  import org.krysalis.version.collecting.collectors.VersionBrandCollector;
  import org.krysalis.version.exception.VersionException;
  import org.krysalis.version.resolve.VersionMetadata;
--- 59,69 ----
  import java.io.PrintWriter;
  
  import org.krysalis.version.collecting.UberVersionCollector;
+ import org.krysalis.version.collecting.VersionCollection;
  import org.krysalis.version.collecting.collectors.VersionBrandCollector;
+ import org.krysalis.version.constraint.ConstraintEvaluator;
+ import org.krysalis.version.constraint.collecting.ConstraintSetCollection;
+ import org.krysalis.version.constraint.collecting.UberConstraintCollector;
+ import org.krysalis.version.constraint.result.ConstraintResultSet;
  import org.krysalis.version.exception.VersionException;
  import org.krysalis.version.resolve.VersionMetadata;
***************
*** 116,119 ****
--- 120,135 ----
          else
              m_out.println("None found.");
+     }
+ 
+     public void processConstraints() throws VersionException {
+         ConstraintEvaluator eval = new ConstraintEvaluator();
+         ConstraintSetCollection collection =
+             (new UberConstraintCollector()).collect();
+ 
+         DebugUtils.dump(m_out, collection);
+ 
+         ConstraintResultSet resultSet = eval.evaluate(collection);
+ 
+         DebugUtils.dump(m_out, resultSet);
      }
  }




-------------------------------------------------------
This SF.net email is sponsored by: Etnus, makers of TotalView, The debugger 
for complex code. Debugging C/C++ programs can leave you feeling lost and 
disoriented. TotalView can help you find your way. Available on major UNIX 
and Linux platforms. Try it free. www.etnus.com