lmartin 2002/08/26 06:57:19
Modified: java/src/org/apache/xerces/impl/xs/traversers
XSDComplexTypeTraverser.java
Log:
Move derivation-restriction.5.2 checking to XSConstraints. Occurrence info for
local element decls in complextypes isn't valid during complex type traversal
Revision Changes Path
1.25 +6 -6
xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
Index: XSDComplexTypeTraverser.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- XSDComplexTypeTraverser.java 15 Jul 2002 21:23:44 -0000 1.24
+++ XSDComplexTypeTraverser.java 26 Aug 2002 13:57:19 -0000 1.25
@@ -695,11 +695,11 @@
// This is an RESTRICTION
- if (fParticle==null && (!(baseContent==null ||
- baseContent.emptiable()))) {
- throw new
ComplexTypeRecoverableError("derivation-ok-restriction.5.2",
- new Object[]{fName}, complexContent);
- }
+ // N.B. derivation-ok-restriction.5.2 is checked under schema
+ // full checking. That's because we need to wait until locals are
+ // traversed so that occurrence information is correct.
+
+
if (fParticle!=null && baseContent==null) {
//REVISIT - need better error msg
throw new
ComplexTypeRecoverableError("derivation-ok-restriction.5.3",
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
