Author: mrglavas
Date: Thu Apr 3 13:49:21 2008
New Revision: 644485
URL: http://svn.apache.org/viewvc?rev=644485&view=rev
Log:
Applying Sandy's fix for a bug in complex type traversal from the trunk.
When the previous type T1 is derived by extension, and the next complex type T2
doesn't have
restriction/extension (which should be viewed as restricting xs:anyType), then
T2 is mistakenly
marked as extension.
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
Modified:
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
URL:
http://svn.apache.org/viewvc/xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java?rev=644485&r1=644484&r2=644485&view=diff
==============================================================================
---
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
(original)
+++
xerces/java/branches/xml-schema-1.1-dev/src/org/apache/xerces/impl/xs/traversers/XSDComplexTypeTraverser.java
Thu Apr 3 13:49:21 2008
@@ -241,6 +241,7 @@
// set the base to the anyType
fBaseType = SchemaGrammar.fAnyType;
+ fDerivedBy = XSConstants.DERIVATION_RESTRICTION;
processComplexContent(child, mixedAtt.booleanValue(), false,
schemaDoc, grammar);
}
@@ -279,6 +280,7 @@
// set the base to the anyType
fBaseType = SchemaGrammar.fAnyType;
+ fDerivedBy = XSConstants.DERIVATION_RESTRICTION;
processComplexContent(child, mixedAtt.booleanValue(), false,
schemaDoc, grammar);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
