krysalis-version/src/java/org/krysalis/version/ant/constraint ConstraintEvaluatorTask.java,1.9,1.10 VersionComparisonConstraintInformation.java,1.3,1.4 VersionRangeConstraintInformation.java,1.3,1.4

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

Modified Files:
	ConstraintEvaluatorTask.java 
	VersionComparisonConstraintInformation.java 
	VersionRangeConstraintInformation.java 
Log Message:
Making constraint processing more descriptive

Index: ConstraintEvaluatorTask.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/ant/constraint/ConstraintEvaluatorTask.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ConstraintEvaluatorTask.java	5 Mar 2003 19:58:09 -0000	1.9
--- ConstraintEvaluatorTask.java	6 Mar 2003 02:58:39 -0000	1.10
***************
*** 64,69 ****
  import org.krysalis.version.constraint.Constraint;
  import org.krysalis.version.constraint.ConstraintConclusion;
  import org.krysalis.version.exception.VersionException;
- import org.krysalis.version.util.note.AnnotationScratchpad;
  
  /**
--- 64,69 ----
  import org.krysalis.version.constraint.Constraint;
  import org.krysalis.version.constraint.ConstraintConclusion;
+ import org.krysalis.version.constraint.result.ConstraintResult;
  import org.krysalis.version.exception.VersionException;
  
  /**
***************
*** 92,99 ****
  
                      System.out.println("Constraint: " + constraint);
!                     
!                     AnnotationScratchpad pad = new AnnotationScratchpad();
!                     
!                     ConstraintConclusion conclusion = constraint.check(pad);
  
                      if (!ConstraintConclusion.isSatisfied(conclusion)) {
--- 92,98 ----
  
                      System.out.println("Constraint: " + constraint);
! 
!                     ConstraintResult result = constraint.check();
!                     ConstraintConclusion conclusion = result.getConclusion();
  
                      if (!ConstraintConclusion.isSatisfied(conclusion)) {
***************
*** 101,109 ****
                          if (ConstraintConclusion.isCertain(conclusion))
                              throw new BuildException(
!                                 "Constraint NOT satisfied: " + constraint);
                          else
                              log(
                                  "Constraint *suspected* NOT satisfied: "
!                                     + constraint,
                                  Project.MSG_WARN);
                      }
--- 100,109 ----
                          if (ConstraintConclusion.isCertain(conclusion))
                              throw new BuildException(
!                                 "Constraint NOT satisfied: " + result,
!                                 getLocation());
                          else
                              log(
                                  "Constraint *suspected* NOT satisfied: "
!                                     + result,
                                  Project.MSG_WARN);
                      }

Index: VersionComparisonConstraintInformation.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/ant/constraint/VersionComparisonConstraintInformation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VersionComparisonConstraintInformation.java	11 Feb 2003 23:45:42 -0000	1.3
--- VersionComparisonConstraintInformation.java	6 Mar 2003 02:58:39 -0000	1.4
***************
*** 57,61 ****
  
  import org.krysalis.version.constraint.Constraint;
! import org.krysalis.version.constraint.VersionDataComparisonConstraint;
  import org.krysalis.version.formatting.exception.VersionFormatException;
  import org.krysalis.version.internal.data.VersionData;
--- 57,61 ----
  
  import org.krysalis.version.constraint.Constraint;
! import org.krysalis.version.constraint.impl.VersionDataComparisonConstraint;
  import org.krysalis.version.formatting.exception.VersionFormatException;
  import org.krysalis.version.internal.data.VersionData;

Index: VersionRangeConstraintInformation.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/ant/constraint/VersionRangeConstraintInformation.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** VersionRangeConstraintInformation.java	11 Feb 2003 23:45:41 -0000	1.3
--- VersionRangeConstraintInformation.java	6 Mar 2003 02:58:39 -0000	1.4
***************
*** 58,62 ****
  import org.apache.tools.ant.BuildException;
  import org.krysalis.version.constraint.Constraint;
! import org.krysalis.version.constraint.VersionDataRangeConstraint;
  import org.krysalis.version.formatting.exception.VersionFormatException;
  import org.krysalis.version.internal.data.VersionData;
--- 58,62 ----
  import org.apache.tools.ant.BuildException;
  import org.krysalis.version.constraint.Constraint;
! import org.krysalis.version.constraint.impl.VersionDataRangeConstraint;
  import org.krysalis.version.formatting.exception.VersionFormatException;
  import org.krysalis.version.internal.data.VersionData;




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