You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jaxme-dev@ws.apache.org by jo...@apache.org on 2004/08/19 22:27:30 UTC
cvs commit: ws-jaxme/src/xs/org/apache/ws/jaxme/xs/impl XSTypeImpl.java
jochen 2004/08/19 13:27:30
Modified: src/xs/org/apache/ws/jaxme/xs/impl Tag: Branch_R0_3
XSTypeImpl.java
Log:
Fixed, that complexType/(sequence|all|choice) may have minOccurs and maxOccurs attributes.
PR: JAXME-23
Submitted by: Mik Lernout (mik at futurestreet.org)
Reviewed by: Jochen Wiedmann (jochen at apache.org)
Revision Changes Path
No revision
No revision
1.13.2.1 +6 -0 ws-jaxme/src/xs/org/apache/ws/jaxme/xs/impl/XSTypeImpl.java
Index: XSTypeImpl.java
===================================================================
RCS file: /home/cvs/ws-jaxme/src/xs/org/apache/ws/jaxme/xs/impl/XSTypeImpl.java,v
retrieving revision 1.13
retrieving revision 1.13.2.1
diff -u -r1.13 -r1.13.2.1
--- XSTypeImpl.java 16 Feb 2004 23:39:43 -0000 1.13
+++ XSTypeImpl.java 19 Aug 2004 20:27:29 -0000 1.13.2.1
@@ -389,6 +389,8 @@
XSGroup group = pOwner.getXSSchema().getXSObjectFactory().newXSGroup(pOwner, sequence);
group.validate();
XSParticleImpl particle = new XSParticleImpl(group);
+ particle.setMaxOccurs(pSequence.getMaxOccurs());
+ particle.setMinOccurs(pSequence.getMinOccurs());
if (group.getParticles().length == 0) {
setParticle(XsComplexContentType.EMPTY, particle);
} else {
@@ -408,6 +410,8 @@
XSGroup group = pOwner.getXSSchema().getXSObjectFactory().newXSGroup(pOwner, choice);
group.validate();
XSParticleImpl particle = new XSParticleImpl(group);
+ particle.setMaxOccurs(pChoice.getMaxOccurs());
+ particle.setMinOccurs(pChoice.getMinOccurs());
if (group.getParticles().length == 0) {
throw new LocSAXException("The complex type must not have an empty element group, as it is a choice.",
choice.getLocator());
@@ -428,6 +432,8 @@
XSGroup group = pOwner.getXSSchema().getXSObjectFactory().newXSGroup(pOwner, all);
group.validate();
XSParticleImpl particle = new XSParticleImpl(group);
+ particle.setMaxOccurs(pAll.getMaxOccurs());
+ particle.setMinOccurs(pAll.getMinOccurs());
if (group.getParticles().length == 0) {
setParticle(XsComplexContentType.EMPTY, particle);
} else {
---------------------------------------------------------------------
To unsubscribe, e-mail: jaxme-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: jaxme-dev-help@ws.apache.org