sandygao 2003/02/12 06:26:31
Modified: java/src/org/apache/xerces/impl/xs/traversers
XSDComplexTypeTraverser.java
Log:
Remove prohibited attributes *before* checking for valid restriction, otherwise
prohibited attributes will make the restriction invalid.
Revision Changes Path
1.32 +4 -5
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.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- XSDComplexTypeTraverser.java 12 Feb 2003 14:23:54 -0000 1.31
+++ XSDComplexTypeTraverser.java 12 Feb 2003 14:26:30 -0000 1.32
@@ -724,6 +724,9 @@
}
mergeAttributes(baseType.getAttrGrp(), fAttrGrp, fName, false,
complexContent);
+ // Remove prohibited uses. Must be done after merge for RESTRICTION.
+ fAttrGrp.removeProhibitedAttrs();
+
if (baseType != SchemaGrammar.fAnyType) {
String error = fAttrGrp.validRestrictionOf(baseType.getAttrGrp());
if (error != null) {
@@ -731,10 +734,6 @@
new Object[]{fName}, complexContent);
}
}
-
- // Remove prohibited uses. Must be done after merge for RESTRICTION.
- fAttrGrp.removeProhibitedAttrs();
-
}
else {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
