You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by lm...@apache.org on 2001/10/02 23:23:15 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/impl/v2 XSDAttributeGroupTraverser.java
lmartin 01/10/02 14:23:15
Modified: java/src/org/apache/xerces/impl/v2
XSDAttributeGroupTraverser.java
Log:
move call to getLocalName after checking for null child; call getGlobalDecl instead of getGlobalAttributeGroupDecl from grammar
Revision Changes Path
1.14 +4 -3 xml-xerces/java/src/org/apache/xerces/impl/v2/XSDAttributeGroupTraverser.java
Index: XSDAttributeGroupTraverser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/XSDAttributeGroupTraverser.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- XSDAttributeGroupTraverser.java 2001/09/25 21:13:48 1.13
+++ XSDAttributeGroupTraverser.java 2001/10/02 21:23:15 1.14
@@ -75,7 +75,7 @@
* @author Rahul Srivastava, Sun Microsystems Inc.
* @author Sandy Gao, IBM
*
- * @version $Id: XSDAttributeGroupTraverser.java,v 1.13 2001/09/25 21:13:48 lmartin Exp $
+ * @version $Id: XSDAttributeGroupTraverser.java,v 1.14 2001/10/02 21:23:15 lmartin Exp $
*/
class XSDAttributeGroupTraverser extends XSDAbstractTraverser {
@@ -106,12 +106,13 @@
}
// get global decl
- attrGrp = grammar.getGlobalAttributeGroupDecl(refAttr.localpart);
+ attrGrp = (XSAttributeGroupDecl)fSchemaHandler.getGlobalDecl(schemaDoc, XSDHandler.ATTRIBUTEGROUP_TYPE, refAttr);
+
// no children are allowed here except annotation, which is optional.
Element child = DOMUtil.getFirstChildElement(elmNode);
- String childName = child.getLocalName();
if (child != null) {
+ String childName = child.getLocalName();
if (childName.equals(SchemaSymbols.ELT_ANNOTATION)) {
traverseAnnotationDecl(child, attrValues, false, schemaDoc);
child = DOMUtil.getNextSiblingElement(child);
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org