You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by sa...@apache.org on 2002/01/25 22:21:48 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/impl/xs XSConstraints.java
sandygao 02/01/25 13:21:48
Modified: java/src/org/apache/xerces/impl/xs XSConstraints.java
Log:
According to bullet 7 of the constraint "Particle Restriction OK (Elt:Elt -- NameAndTypeOK) ", we should use {extension, list, union} for type derivation checking.
Revision Changes Path
1.15 +3 -2 xml-xerces/java/src/org/apache/xerces/impl/xs/XSConstraints.java
Index: XSConstraints.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/XSConstraints.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XSConstraints.java 17 Jan 2002 17:59:33 -0000 1.14
+++ XSConstraints.java 25 Jan 2002 21:21:48 -0000 1.15
@@ -73,7 +73,7 @@
*
* @author Sandy Gao, IBM
*
- * @version $Id: XSConstraints.java,v 1.14 2002/01/17 17:59:33 neilg Exp $
+ * @version $Id: XSConstraints.java,v 1.15 2002/01/25 21:21:48 sandygao Exp $
*/
public class XSConstraints {
@@ -1059,7 +1059,8 @@
//
// Check that the derived element's type is derived from the base's.
//
- if (!checkTypeDerivationOk(dElement.fType, bElement.fType, bElement.fFinal)) {
+ if (!checkTypeDerivationOk(dElement.fType, bElement.fType,
+ (short)(SchemaSymbols.EXTENSION|SchemaSymbols.LIST|SchemaSymbols.UNION))) {
throw new XMLSchemaException("rcase-NameAndTypeOK.7",
new Object[]{dElement.fName});
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org