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/10 19:59:21 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/impl/xs/traversers XSDComplexTypeTraverser.java
sandygao 02/01/10 10:59:21
Modified: java/src/org/apache/xerces/impl/xs/traversers
XSDComplexTypeTraverser.java
Log:
Fixing bug [5788]: when there is no children under <extension> of <simpleContent>, we didn't copy attribute uses from the base type.
Revision Changes Path
1.8 +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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- XSDComplexTypeTraverser.java 14 Dec 2001 20:04:16 -0000 1.7
+++ XSDComplexTypeTraverser.java 10 Jan 2002 18:59:21 -0000 1.8
@@ -92,7 +92,7 @@
* ((group | all | choice | sequence)?,
* ((attribute | attributeGroup)*, anyAttribute?))))
* </complexType>
- * @version $Id: XSDComplexTypeTraverser.java,v 1.7 2001/12/14 20:04:16 sandygao Exp $
+ * @version $Id: XSDComplexTypeTraverser.java,v 1.8 2002/01/10 18:59:21 sandygao Exp $
*/
class XSDComplexTypeTraverser extends XSDAbstractParticleTraverser {
@@ -513,13 +513,12 @@
}
// Remove prohibited uses. Should be done prior to any merge.
typeInfo.fAttrGrp.removeProhibitedAttrs();
+ }
- if (baseComplexType != null) {
- mergeAttributes(baseComplexType.fAttrGrp, typeInfo.fAttrGrp, typeName, true);
- }
+ if (baseComplexType != null) {
+ mergeAttributes(baseComplexType.fAttrGrp, typeInfo.fAttrGrp, typeName, true);
}
}
-
}
private void traverseComplexContent(Element complexContentElement,
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org