You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by er...@locus.apache.org on 2000/06/07 23:41:55 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/validators/datatype DatatypeValidatorFactoryImpl.java StringDatatypeValidator.java XMLException.java
ericye 00/06/07 14:41:54
Modified: java/src/org/apache/xerces/validators/datatype
DatatypeValidatorFactoryImpl.java
StringDatatypeValidator.java XMLException.java
Log:
bug fixes regarding maxLength, XMLException constructor --ericye
Revision Changes Path
1.5 +10 -6 xml-xerces/java/src/org/apache/xerces/validators/datatype/DatatypeValidatorFactoryImpl.java
Index: DatatypeValidatorFactoryImpl.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/datatype/DatatypeValidatorFactoryImpl.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- DatatypeValidatorFactoryImpl.java 2000/06/07 16:04:00 1.4
+++ DatatypeValidatorFactoryImpl.java 2000/06/07 21:41:53 1.5
@@ -66,7 +66,7 @@
/**
- * @version $Id: DatatypeValidatorFactoryImpl.java,v 1.4 2000/06/07 16:04:00 jeffreyr Exp $
+ * @version $Id: DatatypeValidatorFactoryImpl.java,v 1.5 2000/06/07 21:41:53 ericye Exp $
* @author Jeffrey Rodriguez
*/
@@ -281,8 +281,11 @@
( DatatypeValidator ) createDatatypeValidator (
validatorConstructor, validatorArgs );
- addValidator( typeName, simpleType );//register validator
+ if (simpleType != null) {
+ addValidator( typeName, simpleType );//register validator
+ }
+
} catch (NoSuchMethodException e) {
e.printStackTrace();
}
@@ -300,25 +303,26 @@
validator = validatorConstructor.newInstance(arguments);
return validator;
} catch (InstantiationException e) {
- if( fDebug == true ){
+ if( fDebug ){
e.printStackTrace();
}else {
return null;
}
} catch (IllegalAccessException e) {
- if( fDebug == true ){
+ if( fDebug ){
e.printStackTrace();
}else {
return null;
}
} catch (IllegalArgumentException e) {
- if( fDebug == true ){
+ if( fDebug ){
e.printStackTrace();
}else {
return null;
}
} catch (InvocationTargetException e) {
- if ( fDebug == true ){
+ if ( fDebug ){
+ System.out.println("!! The original error message is: " + e.getTargetException().getMessage() );
e.getTargetException().printStackTrace();
} else {
return null;
1.4 +7 -7 xml-xerces/java/src/org/apache/xerces/validators/datatype/StringDatatypeValidator.java
Index: StringDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/datatype/StringDatatypeValidator.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- StringDatatypeValidator.java 2000/06/06 19:54:25 1.3
+++ StringDatatypeValidator.java 2000/06/07 21:41:53 1.4
@@ -73,14 +73,14 @@
* @author Ted Leung
* @author Kito D. Mann, Virtua Communications Corp.
* @author Jeffrey Rodriguez
- * @version $Id: StringDatatypeValidator.java,v 1.3 2000/06/06 19:54:25 jeffreyr Exp $
+ * @version $Id: StringDatatypeValidator.java,v 1.4 2000/06/07 21:41:53 ericye Exp $
*/
public class StringDatatypeValidator extends AbstractDatatypeValidator{
private Locale fLocale = null;
DatatypeValidator fBaseValidator = null; // Native datatypes have null
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;
@@ -134,7 +134,7 @@
try {
fMinLength = Integer.parseInt( minLengthValue );
} catch (NumberFormatException nfe) {
- throw new InvalidDatatypeFacetException("maxLength value '"+minLengthValue+"' is invalid.");
+ throw new InvalidDatatypeFacetException("minLength value '"+minLengthValue+"' is invalid.");
}
} else if (key.equals(SchemaSymbols.ELT_MAXLENGTH) ) {
fFacetsDefined += DatatypeValidator.FACET_MAXLENGTH;
@@ -163,7 +163,7 @@
fFacetsDefined += DatatypeValidator.FACET_MININCLUSIVE;
fMinExclusive = (String)facets.get(key);
} else {
- throw new InvalidDatatypeFacetException();
+ throw new InvalidDatatypeFacetException("invalid facet tag : " + key);
}
}
@@ -179,9 +179,9 @@
if ( ( (fFacetsDefined & ( DatatypeValidator.FACET_MINLENGTH |
DatatypeValidator.FACET_MAXLENGTH) ) != 0 ) ) {
- if ( fMinLength < fMaxLength ) {
+ if ( fMinLength > fMaxLength ) {
throw new InvalidDatatypeFacetException( "Value of minLength = " + fMinLength +
- "must be greater that the value of maxLength" + fMaxLength );
+ "must be less than the value of maxLength = " + fMaxLength );
}
}
@@ -237,7 +237,7 @@
fFacetsDefined += DatatypeValidator.FACET_ENUMERATION;
fEnumeration = (Vector)facets.get(key);
} else {
- throw new InvalidDatatypeFacetException();
+ throw new InvalidDatatypeFacetException("invalid facet tag : " + key);
}
}
if (((fFacetsDefined & DatatypeValidator.FACET_LENGTH ) != 0 ) ) {
1.3 +2 -1 xml-xerces/java/src/org/apache/xerces/validators/datatype/XMLException.java
Index: XMLException.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/datatype/XMLException.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XMLException.java 2000/06/02 23:04:25 1.2
+++ XMLException.java 2000/06/07 21:41:53 1.3
@@ -60,7 +60,7 @@
/**
*
* @author Jeffrey Rodriguez
- * @version $Id: XMLException.java,v 1.2 2000/06/02 23:04:25 jeffreyr Exp $
+ * @version $Id: XMLException.java,v 1.3 2000/06/07 21:41:53 ericye Exp $
*/
public class XMLException extends Exception {
@@ -68,6 +68,7 @@
}
public XMLException ( String message ) {
+ super(message);
}
public XMLException ( Exception exception ) {
}