sandygao 2002/10/09 07:10:04
Modified: java/src/org/apache/xerces/impl/xs/traversers
XSDGroupTraverser.java
Log:
Fixing bug [13428]: "annotation?" is allowed as a child of local <group>.
Revision Changes Path
1.15 +8 -3
xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java
Index: XSDGroupTraverser.java
===================================================================
RCS file:
/home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XSDGroupTraverser.java 30 Aug 2002 02:53:05 -0000 1.14
+++ XSDGroupTraverser.java 9 Oct 2002 14:10:04 -0000 1.15
@@ -111,8 +111,13 @@
group = (XSGroupDecl)fSchemaHandler.getGlobalDecl(schemaDoc,
XSDHandler.GROUP_TYPE, refAttr, elmNode);
}
- // no children are allowed
- if (DOMUtil.getFirstChildElement(elmNode) != null) {
+ // no children other than "annotation?" are allowed
+ Element child = DOMUtil.getFirstChildElement(elmNode);
+ if (child != null &&
DOMUtil.getLocalName(child).equals(SchemaSymbols.ELT_ANNOTATION)) {
+ traverseAnnotationDecl(child, attrValues, false, schemaDoc);
+ child = DOMUtil.getNextSiblingElement(child);
+ }
+ if (child != null) {
reportSchemaError("s4s-elt-must-match", new Object[]{"group (local)",
"(annotation?)"}, elmNode);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
