You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by mr...@apache.org on 2007/03/14 21:23:25 UTC
svn commit: r518305 -
/xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java
Author: mrglavas
Date: Wed Mar 14 13:23:24 2007
New Revision: 518305
URL: http://svn.apache.org/viewvc?view=rev&rev=518305
Log:
Fixing JIRA Bug #1238:
http://issues.apache.org/jira/browse/XERCESJ-1238
If maxOccurs > 1 is specified on a references to a model group definition whose model
group has {compositor} "all" an error [1] should be reported.
[1] http://www.w3.org/TR/xmlschema-1/#cos-all-limited
Modified:
xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java
Modified: xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java
URL: http://svn.apache.org/viewvc/xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java?view=diff&rev=518305&r1=518304&r2=518305
==============================================================================
--- xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java (original)
+++ xerces/java/trunk/src/org/apache/xerces/impl/xs/traversers/XSDGroupTraverser.java Wed Mar 14 13:23:24 2007
@@ -112,6 +112,12 @@
particle.fValue = group.fModelGroup;
particle.fMinOccurs = minOccurs;
particle.fMaxOccurs = maxOccurs;
+ if (group.fModelGroup.fCompositor == XSModelGroupImpl.MODELGROUP_ALL) {
+ Long defaultVals = (Long)attrValues[XSAttributeChecker.ATTIDX_FROMDEFAULT];
+ particle = checkOccurrences(particle, SchemaSymbols.ELT_GROUP,
+ (Element)elmNode.getParentNode(), GROUP_REF_WITH_ALL,
+ defaultVals.longValue());
+ }
if (refAttr != null) {
XSObjectList annotations;
if (annotation != null) {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@xerces.apache.org
For additional commands, e-mail: commits-help@xerces.apache.org