You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by sa...@apache.org on 2001/11/03 00:07:04 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/impl/xs/models CMBuilder.java
sandygao 01/11/02 15:07:04
Modified: java/src/org/apache/xerces/impl/xs/models CMBuilder.java
Log:
XSComplexTypeDecl should be responsibe for setting fCMValidator.
What if CMBuilder#getContentModel is called by other classes, which don't
want to modify XSComplexTypeDecl#fCMValidator.
And removed some commets not applicable in X2.
Revision Changes Path
1.2 +2 -19 xml-xerces/java/src/org/apache/xerces/impl/xs/models/CMBuilder.java
Index: CMBuilder.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/models/CMBuilder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CMBuilder.java 2001/10/25 20:36:03 1.1
+++ CMBuilder.java 2001/11/02 23:07:04 1.2
@@ -70,7 +70,7 @@
* This class constructs content models for a given grammar.
*
* @author Elena Litani, IBM
- * @version $Id: CMBuilder.java,v 1.1 2001/10/25 20:36:03 elena Exp $
+ * @version $Id: CMBuilder.java,v 1.2 2001/11/02 23:07:04 sandygao Exp $
*/
public class CMBuilder {
@@ -144,8 +144,6 @@
throw new RuntimeException("Unknown content type for a element decl "
+ "in getElementContentModelValidator() in Grammar class");
}
- // Add the new model to the content model for this element
- typeDecl.fCMValidator = cmValidator;
return cmValidator;
}
@@ -165,12 +163,6 @@
short type = particle.fType;
if ((type == XSParticleDecl.PARTICLE_WILDCARD) ||
(type == XSParticleDecl.PARTICLE_ELEMENT)) {
-
- // When checking Unique Particle Attribution, rename leaf elements
- //if (grammar.fUPAChecking) {
- // REVISIT: implement
- //}
-
return expandContentModel(particle, minOccurs, maxOccurs);
}
else if (type == XSParticleDecl.PARTICLE_CHOICE ||
@@ -203,16 +195,7 @@
else if (type == XSParticleDecl.PARTICLE_EMPTY) {
return null;
}
- else {
- // When checking Unique Particle Attribution, we have to rename
- // uri even on zero_or_one, zero_or_more and one_or_more
- //if (grammar.fUPAChecking)
- //REVISIT:
- //return addContentSpecNode (type,
- // convertContentSpecTree(particle.fValue),
- // convertContentSpecTree(particle.fOtherValue),
- // false);
- }
+
return particle;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org