krysalis-version/src/java/org/krysalis/version/constraint Constraint.java,1.2,1.3 ConstraintEvaluator.java,1.2,1.3 VersionIdentifierConstraint.java,1.6,NONE VersionDataRangeConstraint.java,1.7,NONE VersionDataConstraint.java,1.1,NONE VersionDataComparisonConstraint.java,1.8,NONE

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

Modified Files:
	Constraint.java ConstraintEvaluator.java 
Removed Files:
	VersionIdentifierConstraint.java 
	VersionDataRangeConstraint.java VersionDataConstraint.java 
	VersionDataComparisonConstraint.java 
Log Message:
Making constraint processing more descriptive

Index: Constraint.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/constraint/Constraint.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Constraint.java	5 Mar 2003 19:57:18 -0000	1.2
--- Constraint.java	6 Mar 2003 02:58:40 -0000	1.3
***************
*** 56,60 ****
--- 56,62 ----
  package org.krysalis.version.constraint;
  
+ import org.krysalis.version.constraint.result.ConstraintResult;
  import org.krysalis.version.exception.VersionException;
+ import org.krysalis.version.util.debug.Dumpable;
  import org.krysalis.version.util.note.AnnotationScratchpad;
  
***************
*** 62,67 ****
   * @author ajack
   */
! public interface Constraint {
!     ConstraintConclusion check(AnnotationScratchpad pad)
          throws VersionException;
  }
--- 64,69 ----
   * @author ajack
   */
! public interface Constraint extends Dumpable {
!     ConstraintResult check()
          throws VersionException;
  }

Index: ConstraintEvaluator.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/constraint/ConstraintEvaluator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ConstraintEvaluator.java	5 Mar 2003 19:57:29 -0000	1.2
--- ConstraintEvaluator.java	6 Mar 2003 02:58:40 -0000	1.3
***************
*** 60,64 ****
  import org.krysalis.version.constraint.collecting.ConstraintSetCollection;
  import org.krysalis.version.constraint.collecting.UberConstraintCollector;
! import org.krysalis.version.constraint.result.*;
  import org.krysalis.version.exception.VersionException;
  import org.krysalis.version.util.debug.DebugUtils;
--- 60,64 ----
  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.util.debug.DebugUtils;
***************
*** 100,125 ****
              Constraint constraint = (Constraint) ii.next();
  
-             AnnotationScratchpad pad = new AnnotationScratchpad();
- 
              ConstraintLogger.g_log.debug("Constraint: " + constraint);
  
              try {
!                 ConstraintConclusion conclusion = constraint.check(pad);
! 
!                 if (!ConstraintConclusion.isSatisfied(conclusion)) {
! 
!                     if (ConstraintConclusion.isCertain(conclusion))
!                         resultSet.addError(
!                             "Constraint NOT satisfied: ",
!                             constraint,
!                             conclusion,
!                             pad);
!                     else
!                         resultSet.addWarning(
!                             "Constraint *suspected* NOT satisfied: ",
!                             constraint,
!                             conclusion,
!                             pad);
!                 }
              }
              catch (VersionException e) {
--- 100,107 ----
              Constraint constraint = (Constraint) ii.next();
  
              ConstraintLogger.g_log.debug("Constraint: " + constraint);
  
              try {
!                 resultSet.add(constraint.check());
              }
              catch (VersionException e) {
***************
*** 128,132 ****
                      constraint,
                      ConstraintConclusion.UNSET,
!                     pad);
              }
          }
--- 110,114 ----
                      constraint,
                      ConstraintConclusion.UNSET,
!                     null);
              }
          }

--- VersionIdentifierConstraint.java DELETED ---

--- VersionDataRangeConstraint.java DELETED ---

--- VersionDataConstraint.java DELETED ---

--- VersionDataComparisonConstraint.java DELETED ---




-------------------------------------------------------
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