You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by je...@locus.apache.org on 2000/06/08 01:39:06 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/validators/datatype BinaryDatatypeValidator.java QNameDatatypeValidator.java URIReferenceDatatypeValidator.java
jeffreyr 00/06/07 16:39:06
Modified: java/src/org/apache/xerces/validators/datatype
BinaryDatatypeValidator.java
QNameDatatypeValidator.java
URIReferenceDatatypeValidator.java
Log:
fixed bug with max/min length
Revision Changes Path
1.3 +5 -5 xml-xerces/java/src/org/apache/xerces/validators/datatype/BinaryDatatypeValidator.java
Index: BinaryDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/datatype/BinaryDatatypeValidator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- BinaryDatatypeValidator.java 2000/06/06 19:54:24 1.2
+++ BinaryDatatypeValidator.java 2000/06/07 23:39:05 1.3
@@ -73,13 +73,13 @@
*
* @author Ted Leung
* @author Jeffrey Rodriguez
- * @version $Id: BinaryDatatypeValidator.java,v 1.2 2000/06/06 19:54:24 jeffreyr Exp $
+ * @version $Id: BinaryDatatypeValidator.java,v 1.3 2000/06/07 23:39:05 jeffreyr Exp $
*/
public class BinaryDatatypeValidator extends AbstractDatatypeValidator {
private DatatypeValidator fBaseValidator = null; //Basetype null means this is a native type
private int fLength = 0;
- private int fMaxLength = 0;
+ private int fMaxLength = Integer.MAX_VALUE;
private int fMinLength = 0;
private String fPattern = null;
private Vector fEnumeration = null;
@@ -156,9 +156,9 @@
if ( ( (fFacetsDefined & ( DatatypeValidator.FACET_MINLENGTH |
DatatypeValidator.FACET_MAXLENGTH) ) != 0 ) ) {
- if ( fMinLength < fMaxLength ) {
- throw new InvalidDatatypeFacetException( "Value of minLength = " + fMinLength +
- "must be greater that the value of maxLength" + fMaxLength );
+ if ( fMinLength > fMaxLength ) {
+ throw new InvalidDatatypeFacetException( "Value of maxLength = " + fMaxLength +
+ "must be greater that the value of minLength" + fMinLength );
}
}
} else { //Derivation by List
1.3 +5 -5 xml-xerces/java/src/org/apache/xerces/validators/datatype/QNameDatatypeValidator.java
Index: QNameDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/datatype/QNameDatatypeValidator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- QNameDatatypeValidator.java 2000/06/06 19:54:25 1.2
+++ QNameDatatypeValidator.java 2000/06/07 23:39:05 1.3
@@ -77,7 +77,7 @@
* XML].
*
* @author Jeffrey Rodriguez
- * @version $Id: QNameDatatypeValidator.java,v 1.2 2000/06/06 19:54:25 jeffreyr Exp $
+ * @version $Id: QNameDatatypeValidator.java,v 1.3 2000/06/07 23:39:05 jeffreyr Exp $
*/
public class QNameDatatypeValidator extends AbstractDatatypeValidator {
private Locale fLocale = null;
@@ -85,7 +85,7 @@
private boolean fDerivedByList = false;
private int fLength = 0;
- private int fMaxLength = 0;
+ private int fMaxLength = Integer.MAX_VALUE;
private int fMinLength = 0;
private String fPattern = null;
private Vector fEnumeration = null;
@@ -177,9 +177,9 @@
if ( ( (fFacetsDefined & ( DatatypeValidator.FACET_MINLENGTH |
DatatypeValidator.FACET_MAXLENGTH) ) != 0 ) ) {
- if ( fMinLength < fMaxLength ) {
- throw new InvalidDatatypeFacetException( "Value of minLength = " + fMinLength +
- "must be greater that the value of maxLength" + fMaxLength );
+ if ( fMinLength > fMaxLength ) {
+ throw new InvalidDatatypeFacetException( "Value of maxLength = " + fMaxLength +
+ "must be greater that the value of minLength" + fMinLength );
}
}
1.3 +4 -4 xml-xerces/java/src/org/apache/xerces/validators/datatype/URIReferenceDatatypeValidator.java
Index: URIReferenceDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/datatype/URIReferenceDatatypeValidator.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- URIReferenceDatatypeValidator.java 2000/06/06 19:54:25 1.2
+++ URIReferenceDatatypeValidator.java 2000/06/07 23:39:05 1.3
@@ -74,14 +74,14 @@
* @author Jeffrey Rodriguez
* @see RFC 2396
* @see Tim Berners-Lee, et. al. RFC 2396: Uniform Resource Identifiers (URI): Generic Syntax.. 1998 Available at: http://www.ietf.org/rfc/rfc2396.txt
- * @version $Id: URIReferenceDatatypeValidator.java,v 1.2 2000/06/06 19:54:25 jeffreyr Exp $
+ * @version $Id: URIReferenceDatatypeValidator.java,v 1.3 2000/06/07 23:39:05 jeffreyr Exp $
*/
public class URIReferenceDatatypeValidator extends AbstractDatatypeValidator {
private DatatypeValidator fBaseValidator = null;
private boolean fDerivedByList = false;
private int fLength = 0;
- private int fMaxLength = 0;
+ private int fMaxLength = Integer.MAX_VALUE;
private int fMinLength = 0;
private String fPattern = null;
private Vector fEnumeration = null;
@@ -154,8 +154,8 @@
if ( ( (fFacetsDefined & ( DatatypeValidator.FACET_MINLENGTH |
DatatypeValidator.FACET_MAXLENGTH) ) != 0 ) ) {
if ( fMinLength < fMaxLength ) {
- throw new InvalidDatatypeFacetException( "Value of minLength = " + fMinLength +
- "must be greater that the value of maxLength" + fMaxLength );
+ throw new InvalidDatatypeFacetException( "Value of maxLength = " + fMaxLength +
+ "must be greater that the value of minLength" + fMinLength );
}
}
} else { //derived by list