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/16 21:31:35 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/impl/v2 XSDAbstractParticleTraverser.java
lmartin 01/10/16 12:31:35
Modified: java/src/org/apache/xerces/impl/v2
XSDAbstractParticleTraverser.java
Log:
if a sequence or choice has only 1 child, still generate the group
Revision Changes Path
1.15 +8 -10 xml-xerces/java/src/org/apache/xerces/impl/v2/XSDAbstractParticleTraverser.java
Index: XSDAbstractParticleTraverser.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/v2/XSDAbstractParticleTraverser.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XSDAbstractParticleTraverser.java 2001/10/02 18:43:03 1.14
+++ XSDAbstractParticleTraverser.java 2001/10/16 19:31:35 1.15
@@ -65,7 +65,7 @@
/**
* @author Elena Litani, IBM
* @author Sandy Gao, IBM
- * @version $Id: XSDAbstractParticleTraverser.java,v 1.14 2001/10/02 18:43:03 neilg Exp $
+ * @version $Id: XSDAbstractParticleTraverser.java,v 1.15 2001/10/16 19:31:35 lmartin Exp $
*/
abstract class XSDAbstractParticleTraverser extends XSDAbstractTraverser {
@@ -309,22 +309,20 @@
}
}
- if (right != null) {
+ // REVISIT: model group
+ // Quick fix for the case that particles <choice> | <sequence> do not have any children.
+ // For now we return null. In the future we might want to return model group decl.
+
+ if (left !=null) {
temp = new XSParticleDecl();
if (choice)
- temp.fType = XSParticleDecl.PARTICLE_CHOICE;
+ temp.fType = XSParticleDecl.PARTICLE_CHOICE;
else
- temp.fType = XSParticleDecl.PARTICLE_SEQUENCE;
+ temp.fType = XSParticleDecl.PARTICLE_SEQUENCE;
temp.fValue = left;
temp.fOtherValue = right;
left = temp;
- }
-
- // REVISIT: model group
- // Quick fix for the case that particles <choice> | <sequence> do not have any children.
- // For now we return null. In the future we might want to return model group decl.
- if (left !=null) {
XInt minAtt = (XInt)attrValues[XSAttributeChecker.ATTIDX_MINOCCURS];
XInt maxAtt = (XInt)attrValues[XSAttributeChecker.ATTIDX_MAXOCCURS];
Long defaultVals = (Long)attrValues[XSAttributeChecker.ATTIDX_FROMDEFAULT];
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org