You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by el...@apache.org on 2001/04/11 19:05:11 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/validators/datatype DecimalDatatypeValidator.java DoubleDatatypeValidator.java FloatDatatypeValidator.java
elena 01/04/11 10:05:11
Modified: java/src/org/apache/xerces/validators/datatype
DecimalDatatypeValidator.java
DoubleDatatypeValidator.java
FloatDatatypeValidator.java
Log:
Bug fix (from Sandy Gao)
Revision Changes Path
1.20 +7 -7 xml-xerces/java/src/org/apache/xerces/validators/datatype/DecimalDatatypeValidator.java
Index: DecimalDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/datatype/DecimalDatatypeValidator.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- DecimalDatatypeValidator.java 2001/04/09 20:57:38 1.19
+++ DecimalDatatypeValidator.java 2001/04/11 17:05:08 1.20
@@ -75,7 +75,7 @@
* @author Ted Leung
* @author Jeffrey Rodriguez
* @author Mark Swinkles - List Validation refactoring
- * @version $Id: DecimalDatatypeValidator.java,v 1.19 2001/04/09 20:57:38 elena Exp $
+ * @version $Id: DecimalDatatypeValidator.java,v 1.20 2001/04/11 17:05:08 elena Exp $
*/
public class DecimalDatatypeValidator extends AbstractDatatypeValidator {
@@ -250,17 +250,17 @@
}
// check 4.3.9.c2 must: minExclusive < maxInclusive
if ( isMaxInclusiveDefined && isMinExclusiveDefined ){
- int compareTo = this.fMinInclusive.compareTo( this.fMaxExclusive );
+ int compareTo = this.fMinExclusive.compareTo( this.fMaxInclusive );
if ( compareTo != -1 )
- throw new InvalidDatatypeFacetException( "minInclusive value ='" + this.fMinInclusive + "'must be < maxExclusive value ='" +
- this.fMaxExclusive + "'. " );
+ throw new InvalidDatatypeFacetException( "minExclusive value ='" + this.fMinExclusive + "'must be > maxInclusive value ='" +
+ this.fMaxInclusive + "'. " );
}
// check 4.3.10.c1 must: minInclusive < maxExclusive
if ( isMaxExclusiveDefined && isMinInclusiveDefined ){
- int compareTo = this.fMinExclusive.compareTo( this.fMaxInclusive );
+ int compareTo = this.fMinInclusive.compareTo( this.fMaxExclusive );
if ( compareTo != -1 )
- throw new InvalidDatatypeFacetException( "minExclusive value ='" + this.fMinExclusive + "'must be > maxInclusive value ='" +
- this.fMaxInclusive + "'. " );
+ throw new InvalidDatatypeFacetException( "minInclusive value ='" + this.fMinInclusive + "'must be < maxExclusive value ='" +
+ this.fMaxExclusive + "'. " );
}
// check 4.3.12.c1 must: fractionDigits <= totalDigits
if ( isFractionDigitsDefined && isTotalDigitsDefined ){
1.17 +7 -7 xml-xerces/java/src/org/apache/xerces/validators/datatype/DoubleDatatypeValidator.java
Index: DoubleDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/datatype/DoubleDatatypeValidator.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- DoubleDatatypeValidator.java 2001/04/09 20:57:39 1.16
+++ DoubleDatatypeValidator.java 2001/04/11 17:05:09 1.17
@@ -69,7 +69,7 @@
* @author Ted Leung
* @author Jeffrey Rodriguez
* @author Mark Swinkles - List Validation refactoring
- * @version $Id: DoubleDatatypeValidator.java,v 1.16 2001/04/09 20:57:39 elena Exp $
+ * @version $Id: DoubleDatatypeValidator.java,v 1.17 2001/04/11 17:05:09 elena Exp $
*/
public class DoubleDatatypeValidator extends AbstractDatatypeValidator {
@@ -227,15 +227,15 @@
}
// check 4.3.9.c2 must: minExclusive < maxInclusive
if ( isMaxInclusiveDefined && isMinExclusiveDefined ){
- if ( fMinInclusive >= fMaxExclusive )
- throw new InvalidDatatypeFacetException( "minInclusive value ='" + this.fMinInclusive + "'must be < maxExclusive value ='" +
- this.fMaxExclusive + "'. " );
- }
- // check 4.3.10.c1 must: minInclusive < maxExclusive
- if ( isMaxExclusiveDefined && isMinInclusiveDefined ){
if ( fMinExclusive >= fMaxInclusive )
throw new InvalidDatatypeFacetException( "minExclusive value ='" + this.fMinExclusive + "'must be < maxInclusive value ='" +
this.fMaxInclusive + "'. " );
+ }
+ // check 4.3.10.c1 must: minInclusive < maxExclusive
+ if ( isMaxExclusiveDefined && isMinInclusiveDefined ){
+ if ( fMinInclusive >= fMaxExclusive )
+ throw new InvalidDatatypeFacetException( "minInclusive value ='" + this.fMinInclusive + "'must be < maxExclusive value ='" +
+ this.fMaxExclusive + "'. " );
}
if ( (fFacetsDefined & DatatypeValidator.FACET_ENUMERATION ) != 0 ) {
1.18 +7 -7 xml-xerces/java/src/org/apache/xerces/validators/datatype/FloatDatatypeValidator.java
Index: FloatDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/datatype/FloatDatatypeValidator.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- FloatDatatypeValidator.java 2001/04/09 20:57:39 1.17
+++ FloatDatatypeValidator.java 2001/04/11 17:05:09 1.18
@@ -72,7 +72,7 @@
* @author Ted Leung
* @author Jeffrey Rodriguez
* @author Mark Swinkles - List Validation refactoring
- * @version $Id: FloatDatatypeValidator.java,v 1.17 2001/04/09 20:57:39 elena Exp $
+ * @version $Id: FloatDatatypeValidator.java,v 1.18 2001/04/11 17:05:09 elena Exp $
*/
public class FloatDatatypeValidator extends AbstractDatatypeValidator {
@@ -228,15 +228,15 @@
}
// check 4.3.9.c2 must: minExclusive < maxInclusive
if ( isMaxInclusiveDefined && isMinExclusiveDefined ){
- if ( fMinInclusive >= fMaxExclusive )
- throw new InvalidDatatypeFacetException( "minInclusive value ='" + this.fMinInclusive + "'must be < maxExclusive value ='" +
- this.fMaxExclusive + "'. " );
- }
- // check 4.3.10.c1 must: minInclusive < maxExclusive
- if ( isMaxExclusiveDefined && isMinInclusiveDefined ){
if ( fMinExclusive >= fMaxInclusive )
throw new InvalidDatatypeFacetException( "minExclusive value ='" + this.fMinExclusive + "'must be < maxInclusive value ='" +
this.fMaxInclusive + "'. " );
+ }
+ // check 4.3.10.c1 must: minInclusive < maxExclusive
+ if ( isMaxExclusiveDefined && isMinInclusiveDefined ){
+ if ( fMinInclusive >= fMaxExclusive )
+ throw new InvalidDatatypeFacetException( "minInclusive value ='" + this.fMinInclusive + "'must be < maxExclusive value ='" +
+ this.fMaxExclusive + "'. " );
}
if ( (fFacetsDefined & DatatypeValidator.FACET_ENUMERATION ) != 0 ) {
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org