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 2002/03/06 00:02:59 UTC

cvs commit: xml-xerces/java/src/org/apache/xerces/impl/xs SchemaGrammar.java

sandygao    02/03/05 15:02:59

  Modified:    java/src/org/apache/xerces/impl/xs SchemaGrammar.java
  Log:
  The intention of the Schema WG is that the wildcards in anyType should have
  processContents "lax", not "strict".
  
  Revision  Changes    Path
  1.13      +13 -7     xml-xerces/java/src/org/apache/xerces/impl/xs/SchemaGrammar.java
  
  Index: SchemaGrammar.java
  ===================================================================
  RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/impl/xs/SchemaGrammar.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- SchemaGrammar.java	18 Feb 2002 22:30:25 -0000	1.12
  +++ SchemaGrammar.java	5 Mar 2002 23:02:59 -0000	1.13
  @@ -81,7 +81,7 @@
    * @author Sandy Gao, IBM
    * @author Elena Litani, IBM
    *
  - * @version $Id: SchemaGrammar.java,v 1.12 2002/02/18 22:30:25 sandygao Exp $
  + * @version $Id: SchemaGrammar.java,v 1.13 2002/03/05 23:02:59 sandygao Exp $
    */
   
   public class SchemaGrammar implements Grammar {
  @@ -415,12 +415,18 @@
           fAnyType.fDerivedBy = SchemaSymbols.RESTRICTION;
           fAnyType.fContentType = XSComplexTypeDecl.CONTENTTYPE_MIXED;
           XSWildcardDecl wildcard = new XSWildcardDecl();
  -        XSParticleDecl particle = new XSParticleDecl();
  -        particle.fMinOccurs = 0;
  -        particle.fMaxOccurs = SchemaSymbols.OCCURRENCE_UNBOUNDED;
  -        particle.fType = XSParticleDecl.PARTICLE_WILDCARD;
  -        particle.fValue = wildcard;
  -        fAnyType.fParticle = particle;
  +        // the spec will change strict to lax for anyType
  +        wildcard.fProcessContents = SchemaSymbols.ANY_LAX;
  +        XSParticleDecl particleW = new XSParticleDecl();
  +        particleW.fMinOccurs = 0;
  +        particleW.fMaxOccurs = SchemaSymbols.OCCURRENCE_UNBOUNDED;
  +        particleW.fType = XSParticleDecl.PARTICLE_WILDCARD;
  +        particleW.fValue = wildcard;
  +        XSParticleDecl particleG = new XSParticleDecl();
  +        particleG.fType = XSParticleDecl.PARTICLE_SEQUENCE;
  +        particleG.fValue = particleW;
  +        particleG.fOtherValue = null;
  +        fAnyType.fParticle = particleG;
           fAnyType.fAttrGrp.fAttributeWC = wildcard;
       }
   
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: xerces-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xerces-cvs-help@xml.apache.org