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/10/23 18:49:59 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes AbstractDatatypeValidator.java AbstractNumericFacetValidator.java AbstractStringValidator.java DatatypeValidator.java
elena 01/10/23 09:49:59
Modified: java/src/org/apache/xerces/impl/msg
XMLSchemaMessages.properties
java/src/org/apache/xerces/impl/v2 XSDAbstractTraverser.java
java/src/org/apache/xerces/impl/v2/datatypes
AbstractDatatypeValidator.java
AbstractNumericFacetValidator.java
AbstractStringValidator.java DatatypeValidator.java
Log:
bug fix enumeration-required-notation
Revision Changes Path
1.24 +2 -1 xml-xerces/java/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties
Index: XMLSchemaMessages.properties
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/msg/XMLSchemaMessages.properties,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- XMLSchemaMessages.properties 2001/10/23 14:56:55 1.23
+++ XMLSchemaMessages.properties 2001/10/23 16:49:59 1.24
@@ -289,7 +289,8 @@
dt-restiction-final = the base type ''{0}'' does not allow itself to be used as the base for a restriction and/or as a type in a list and/or union
dt-list-itemType = Datatypes 4.1.3: error in the simpleType ''{0}'' itemType attribute or simpleType child constraint
dt-restriction-base = Datatypes 4.1.3: error in the simpleType ''{0}'' base attribute or simpleType child constraint
- dt-union-memberType = Datatypes 4.1.3: error in the simpleType ''{0}'' - memberTypes attribute or simpleType children constraint
+ dt-union-memberType = Datatypes 4.1.3: error in the simpleType ''{0}'' - memberTypes attribute or simpleType children constraint
+ dt-enumeration-notation = Datatypes 3.2.19: enumeration facet value required for NOTATION type in element/attribute ''{0}''
# Datatypes
1.38 +3 -7 xml-xerces/java/src/org/apache/xerces/impl/v2/XSDAbstractTraverser.java
Index: XSDAbstractTraverser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/XSDAbstractTraverser.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- XSDAbstractTraverser.java 2001/10/22 20:38:23 1.37
+++ XSDAbstractTraverser.java 2001/10/23 16:49:59 1.38
@@ -77,7 +77,7 @@
* @author Elena Litani, IBM
* @author Rahul Srivastava, Sun Microsystems Inc.
*
- * @version $Id: XSDAbstractTraverser.java,v 1.37 2001/10/22 20:38:23 sandygao Exp $
+ * @version $Id: XSDAbstractTraverser.java,v 1.38 2001/10/23 16:49:59 elena Exp $
*/
abstract class XSDAbstractTraverser {
@@ -506,12 +506,8 @@
*/
void checkNotationType(String refName, XSTypeDecl typeDecl) {
if (typeDecl instanceof NOTATIONDatatypeValidator) {
- //REVISIT: to check whether there is an enumeration facet
- //if (((DatatypeValidator)typeDecl).hasEnumFacet) {
- if (false) {
- reportGenericSchemaError("[enumeration-required-notation] It is an error for NOTATION to be used "+
- "directly in a schema in element/attribute '"+refName+"'. " +
- "Only datatypes that are derived from NOTATION by specifying a value for enumeration can be used in a schema.");
+ if (!((DatatypeValidator)typeDecl).hasEnumeration()) {
+ reportSchemaError("dt-enumeration-notation", new Object[]{refName});
}
}
}
1.11 +5 -1 xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/AbstractDatatypeValidator.java
Index: AbstractDatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/AbstractDatatypeValidator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractDatatypeValidator.java 2001/10/16 17:21:39 1.10
+++ AbstractDatatypeValidator.java 2001/10/23 16:49:59 1.11
@@ -57,7 +57,7 @@
/**
- * @version $Id: AbstractDatatypeValidator.java,v 1.10 2001/10/16 17:21:39 elena Exp $
+ * @version $Id: AbstractDatatypeValidator.java,v 1.11 2001/10/23 16:49:59 elena Exp $
* @author Elena Litani
* @author Jeffrey Rodriguez
*/
@@ -111,6 +111,10 @@
*/
public short getWSFacet (){
return DatatypeValidator.COLLAPSE;
+ }
+
+ public boolean hasEnumeration(){
+ return false;
}
// returns the base datatypeValidator of the current validator.
1.6 +5 -1 xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/AbstractNumericFacetValidator.java
Index: AbstractNumericFacetValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/AbstractNumericFacetValidator.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- AbstractNumericFacetValidator.java 2001/10/19 18:22:00 1.5
+++ AbstractNumericFacetValidator.java 2001/10/23 16:49:59 1.6
@@ -74,7 +74,7 @@
* minInclusive, maxInclusive, minExclusive, maxExclusive according to schema specs.
*
* @author Elena Litani
- * @version $Id: AbstractNumericFacetValidator.java,v 1.5 2001/10/19 18:22:00 sandygao Exp $
+ * @version $Id: AbstractNumericFacetValidator.java,v 1.6 2001/10/23 16:49:59 elena Exp $
*/
public abstract class AbstractNumericFacetValidator extends AbstractDatatypeValidator {
@@ -448,6 +448,10 @@
protected void initializeValues() {
}
+
+ public boolean hasEnumeration(){
+ return (fEnumeration !=null)?true:false;
+ }
//
// decimal has fractionDigits and totalDigits facets
// all other datatypes will throw InvalidDatatypeFacetException
1.11 +6 -1 xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/AbstractStringValidator.java
Index: AbstractStringValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/AbstractStringValidator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- AbstractStringValidator.java 2001/10/22 21:22:37 1.10
+++ AbstractStringValidator.java 2001/10/23 16:49:59 1.11
@@ -76,7 +76,7 @@
* hexBinary, base64Binary, QName and Notation datatypes.
*
* @author Elena Litani
- * @version $Id: AbstractStringValidator.java,v 1.10 2001/10/22 21:22:37 sandygao Exp $
+ * @version $Id: AbstractStringValidator.java,v 1.11 2001/10/23 16:49:59 elena Exp $
*/
public abstract class AbstractStringValidator extends AbstractDatatypeValidator {
@@ -494,5 +494,10 @@
throw new InvalidDatatypeValueException(
"Value '"+content+"' is not a valid " + tokenType);
}
+ }
+
+
+ public boolean hasEnumeration(){
+ return (fEnumeration !=null)?true:false;
}
}
1.7 +3 -1 xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/DatatypeValidator.java
Index: DatatypeValidator.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/datatypes/DatatypeValidator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- DatatypeValidator.java 2001/10/16 17:21:39 1.6
+++ DatatypeValidator.java 2001/10/23 16:49:59 1.7
@@ -70,7 +70,7 @@
* W3C to remove facets from the data type spec.
*
* @author Jeffrey Rodriguez-
- * @version $Id: DatatypeValidator.java,v 1.6 2001/10/16 17:21:39 elena Exp $
+ * @version $Id: DatatypeValidator.java,v 1.7 2001/10/23 16:49:59 elena Exp $
*/
public interface DatatypeValidator extends XSTypeDecl {
public static final short FACET_LENGTH = 0x1<<0;
@@ -115,6 +115,8 @@
public Object validate(String content, ValidationContext state ) throws InvalidDatatypeValueException;
public short getWSFacet ();
+
+ public boolean hasEnumeration();
// returns the base datatypeValidator of the current validator.
public DatatypeValidator getBaseValidator();
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org