krysalis-version/src/java/org/krysalis/version/ant/constraint VersionRangeConstraintInformation.java,1.4,1.5 VersionComparisonConstraintInformation.java,1.4,1.5

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

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

Index: VersionRangeConstraintInformation.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/ant/constraint/VersionRangeConstraintInformation.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** VersionRangeConstraintInformation.java	6 Mar 2003 02:58:39 -0000	1.4
--- VersionRangeConstraintInformation.java	10 Mar 2003 20:44:20 -0000	1.5
***************
*** 60,63 ****
--- 60,64 ----
  import org.krysalis.version.constraint.impl.VersionDataRangeConstraint;
  import org.krysalis.version.formatting.exception.VersionFormatException;
+ import org.krysalis.version.impl.KrysalisVersion;
  import org.krysalis.version.internal.data.VersionData;
  import org.krysalis.version.internal.data.util.VersionDataRange;
***************
*** 80,84 ****
       */
      public void setLowerVersion(String version) throws VersionFormatException {
!         m_lowerVersion = new VersionData(version);
      }
  
--- 81,85 ----
       */
      public void setLowerVersion(String version) throws VersionFormatException {
!         m_lowerVersion = (new KrysalisVersion(version)).getVersionData();
      }
  
***************
*** 88,92 ****
      */
      public void setUpperVersion(String version) throws VersionFormatException {
!         m_upperVersion = new VersionData(version);
      }
  
--- 89,93 ----
      */
      public void setUpperVersion(String version) throws VersionFormatException {
!         m_upperVersion = (new KrysalisVersion(version)).getVersionData();
      }
  

Index: VersionComparisonConstraintInformation.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/ant/constraint/VersionComparisonConstraintInformation.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** VersionComparisonConstraintInformation.java	6 Mar 2003 02:58:39 -0000	1.4
--- VersionComparisonConstraintInformation.java	10 Mar 2003 20:44:20 -0000	1.5
***************
*** 59,63 ****
  import org.krysalis.version.constraint.impl.VersionDataComparisonConstraint;
  import org.krysalis.version.formatting.exception.VersionFormatException;
! import org.krysalis.version.internal.data.VersionData;
  import org.krysalis.version.internal.data.util.VersionDataComparison;
  
--- 59,63 ----
  import org.krysalis.version.constraint.impl.VersionDataComparisonConstraint;
  import org.krysalis.version.formatting.exception.VersionFormatException;
! import org.krysalis.version.impl.KrysalisVersion;
  import org.krysalis.version.internal.data.util.VersionDataComparison;
  
***************
*** 69,73 ****
  
      private int m_comparisonType = VersionDataComparison.TYPE_UNSET;
!     private VersionData m_version = null;
  
      public VersionComparisonConstraintInformation(int comparisonType) {
--- 69,73 ----
  
      private int m_comparisonType = VersionDataComparison.TYPE_UNSET;
!     private KrysalisVersion m_version = null;
  
      public VersionComparisonConstraintInformation(int comparisonType) {
***************
*** 80,84 ****
       */
      public void setVersion(String version) throws VersionFormatException {
!         m_version = new VersionData(version);
      }
  
--- 80,84 ----
       */
      public void setVersion(String version) throws VersionFormatException {
!         m_version = new KrysalisVersion(version);
      }
  
***************
*** 95,99 ****
       * @return VersionData
       */
!     public VersionData getVersion() {
          return m_version;
      }
--- 95,99 ----
       * @return VersionData
       */
!     public KrysalisVersion getVersion() {
          return m_version;
      }
***************
*** 102,106 ****
          return new VersionDataComparisonConstraint(
              getVersionId(),
!             new VersionDataComparison(m_comparisonType, m_version));
      }
  }
--- 102,108 ----
          return new VersionDataComparisonConstraint(
              getVersionId(),
!             new VersionDataComparison(
!                 m_comparisonType,
!                 m_version.getVersionData()));
      }
  }




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