krysalis-version/src/java/org/krysalis/version/internal/data/util VersionDataComparison.java,1.7,1.8 VersionDataRange.java,1.2,1.3 VersionDataRangeIterator.java,1.4,1.5

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

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

Index: VersionDataComparison.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/internal/data/util/VersionDataComparison.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** VersionDataComparison.java	17 Feb 2003 18:54:53 -0000	1.7
--- VersionDataComparison.java	10 Mar 2003 20:44:04 -0000	1.8
***************
*** 60,63 ****
--- 60,64 ----
  import org.krysalis.version.exception.VersionError;
  import org.krysalis.version.exception.VersionException;
+ import org.krysalis.version.impl.KrysalisVersion;
  import org.krysalis.version.internal.data.VersionData;
  
***************
*** 76,80 ****
  
      private int m_type = TYPE_UNSET;
!     private VersionData m_comparisonData = null;
  
      public static VersionDataComparison getEqual(VersionData comparisonData) {
--- 77,81 ----
  
      private int m_type = TYPE_UNSET;
!     private VersionData m_comparisonVersion = null;
  
      public static VersionDataComparison getEqual(VersionData comparisonData) {
***************
*** 96,101 ****
      }
  
!     public static VersionDataComparison getGreaterThan(VersionData comparisonData) {
!         return new VersionDataComparison(TYPE_GREATER_THAN, comparisonData);
      }
  
--- 97,102 ----
      }
  
!     public static VersionDataComparison getGreaterThan(VersionData comparison) {
!         return new VersionDataComparison(TYPE_GREATER_THAN, comparison);
      }
  
***************
*** 108,112 ****
      public VersionDataComparison(int type, VersionData comparisonData) {
          m_type = type;
!         m_comparisonData = comparisonData;
      }
  
--- 109,113 ----
      public VersionDataComparison(int type, VersionData comparisonData) {
          m_type = type;
!         m_comparisonVersion = comparisonData;
      }
  
***************
*** 114,123 ****
          throws VersionException {
          m_type = getTypeForString(type);
!         m_comparisonData = comparisonData;
      }
  
      public VersionDataComparison(VersionData comparisonData) {
          m_type = TYPE_EQUAL;
!         m_comparisonData = comparisonData;
      }
  
--- 115,124 ----
          throws VersionException {
          m_type = getTypeForString(type);
!         m_comparisonVersion = comparisonData;
      }
  
      public VersionDataComparison(VersionData comparisonData) {
          m_type = TYPE_EQUAL;
!         m_comparisonVersion = comparisonData;
      }
  
***************
*** 161,165 ****
          boolean result = false;
  
!         int comparison = m_comparisonData.compareTo(test);
  
          switch (m_type) {
--- 162,166 ----
          boolean result = false;
  
!         int comparison = m_comparisonVersion.compareTo(test);
  
          switch (m_type) {
***************
*** 364,368 ****
       */
      public VersionData getComparison() {
!         return m_comparisonData;
      }
  
--- 365,369 ----
       */
      public VersionData getComparison() {
!         return m_comparisonVersion;
      }
  
***************
*** 372,380 ****
       */
      public void setComparison(VersionData comparisonData) {
!         m_comparisonData = comparisonData;
      }
  
      public String toString() {
!         return getWordForType() + " : " + m_comparisonData;
      }
  }
--- 373,381 ----
       */
      public void setComparison(VersionData comparisonData) {
!         m_comparisonVersion = comparisonData;
      }
  
      public String toString() {
!         return getWordForType() + " : " + m_comparisonVersion;
      }
  }

Index: VersionDataRange.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/internal/data/util/VersionDataRange.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** VersionDataRange.java	3 Feb 2003 07:28:33 -0000	1.2
--- VersionDataRange.java	10 Mar 2003 20:44:05 -0000	1.3
***************
*** 56,61 ****
  package org.krysalis.version.internal.data.util;
  
- import org.krysalis.version.internal.data.VersionData;
  import org.krysalis.version.exception.VersionError;
  
  /**
--- 56,62 ----
  package org.krysalis.version.internal.data.util;
  
  import org.krysalis.version.exception.VersionError;
+ import org.krysalis.version.impl.KrysalisVersion;
+ import org.krysalis.version.internal.data.VersionData;
  
  /**

Index: VersionDataRangeIterator.java
===================================================================
RCS file: /cvsroot/metamorphosis/krysalis-version/src/java/org/krysalis/version/internal/data/util/VersionDataRangeIterator.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** VersionDataRangeIterator.java	6 Feb 2003 19:16:01 -0000	1.4
--- VersionDataRangeIterator.java	10 Mar 2003 20:44:05 -0000	1.5
***************
*** 66,70 ****
      protected VersionDataRange m_range = null;
  
!     public VersionDataRangeIterator(VersionData lower, VersionData higher) {
          super(lower);
  
--- 66,72 ----
      protected VersionDataRange m_range = null;
  
!     public VersionDataRangeIterator(
!         VersionData lower,
!     VersionData higher) {
          super(lower);
  
***************
*** 76,81 ****
  
      public VersionDataRangeIterator(
!         VersionData lower,
!         VersionData higher,
          VersionDataIncrementor incrementor) {
          super(lower, incrementor);
--- 78,83 ----
  
      public VersionDataRangeIterator(
!     VersionData lower,
!     VersionData higher,
          VersionDataIncrementor incrementor) {
          super(lower, incrementor);
***************
*** 108,112 ****
      }
  
- 
      /**
       * @see java.util.Iterator#remove()
--- 110,113 ----
***************
*** 134,138 ****
  
          int count = 0;
!         for (Iterator i = new VersionDataRangeIterator(lower, upper, VersionDataIncrementor.POINT);
              i.hasNext();
              ++count) {
--- 135,143 ----
  
          int count = 0;
!         for (Iterator i =
!             new VersionDataRangeIterator(
!                 lower,
!                 upper,
!                 VersionDataIncrementor.POINT);
              i.hasNext();
              ++count) {




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