krysalis-version/src/java/org/krysalis/version/constraint/impl VersionDataRangeConstraint.java,1.2,1.3 VersionDataComparisonConstraint.java,1.2,1.3

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

Modified Files:
	VersionDataRangeConstraint.java 
	VersionDataComparisonConstraint.java 
Log Message:
First stab at replacing Formats with Specifications for "non-Krysalis" formats.
Fixed some bugs via new tests.

Index: VersionDataRangeConstraint.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/constraint/impl/VersionDataRangeConstraint.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VersionDataRangeConstraint.java	7 Mar 2003 20:01:44 -0000	1.2
--- VersionDataRangeConstraint.java	10 Mar 2003 20:44:19 -0000	1.3
***************
*** 62,67 ****
  import org.krysalis.version.constraint.result.ConstraintResult;
  import org.krysalis.version.exception.VersionException;
  import org.krysalis.version.internal.VersionIdentifier;
- import org.krysalis.version.internal.data.VersionData;
  import org.krysalis.version.internal.data.util.VersionDataRange;
  import org.krysalis.version.resolve.VersionMetadata;
--- 62,67 ----
  import org.krysalis.version.constraint.result.ConstraintResult;
  import org.krysalis.version.exception.VersionException;
+ import org.krysalis.version.impl.KrysalisVersion;
  import org.krysalis.version.internal.VersionIdentifier;
  import org.krysalis.version.internal.data.util.VersionDataRange;
  import org.krysalis.version.resolve.VersionMetadata;
***************
*** 109,113 ****
                          + "]";
  
!                 if (m_range.inRange(new VersionData(resolvedVersion))) {
                      conclusion = ConstraintConclusion.CERTAINLY_SATISFIED;
                      severity = ConstraintResult.INFORMATION;
--- 109,117 ----
                          + "]";
  
!                 if (m_range
!                     .inRange(
!                         KrysalisVersion
!                             .fromVersion(resolvedVersion)
!                             .getVersionData())) {
                      conclusion = ConstraintConclusion.CERTAINLY_SATISFIED;
                      severity = ConstraintResult.INFORMATION;

Index: VersionDataComparisonConstraint.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/constraint/impl/VersionDataComparisonConstraint.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VersionDataComparisonConstraint.java	7 Mar 2003 20:01:45 -0000	1.2
--- VersionDataComparisonConstraint.java	10 Mar 2003 20:44:19 -0000	1.3
***************
*** 62,67 ****
  import org.krysalis.version.constraint.result.ConstraintResult;
  import org.krysalis.version.exception.VersionException;
  import org.krysalis.version.internal.VersionIdentifier;
- import org.krysalis.version.internal.data.VersionData;
  import org.krysalis.version.internal.data.util.VersionDataComparison;
  import org.krysalis.version.resolve.VersionMetadata;
--- 62,67 ----
  import org.krysalis.version.constraint.result.ConstraintResult;
  import org.krysalis.version.exception.VersionException;
+ import org.krysalis.version.impl.KrysalisVersion;
  import org.krysalis.version.internal.VersionIdentifier;
  import org.krysalis.version.internal.data.util.VersionDataComparison;
  import org.krysalis.version.resolve.VersionMetadata;
***************
*** 113,117 ****
                          + "]";
  
!                 if (m_comparison.evaluate(new VersionData(resolvedVersion))) {
  
                      severity = ConstraintResult.INFORMATION;
--- 113,121 ----
                          + "]";
  
!                 if (m_comparison
!                     .evaluate(
!                         KrysalisVersion
!                             .fromVersion(resolvedVersion)
!                             .getVersionData())) {
  
                      severity = ConstraintResult.INFORMATION;




-------------------------------------------------------
This sf.net email is sponsored by:ThinkGeek
Welcome to geek heaven.
http://thinkgeek.com/sf