xmlbeans-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ce...@apache.org
Subject cvs commit: xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/schema StscJavaizer.java
Date Thu, 08 Apr 2004 19:22:03 GMT
cezar       2004/04/08 12:22:03

  Modified:    v1/src/typeimpl/org/apache/xmlbeans/impl/schema
                        StscJavaizer.java
               v2/src/typeimpl/org/apache/xmlbeans/impl/schema
                        StscJavaizer.java
  Removed:     v1/test/cases/schema/ims IMS_xml.xsd imsmd_v1p2p2.xsd
  Log:
  Sequence ordering patch from David Waite (jira issue xmlbeans-33 ).
  Deleted ims schemas to conform with licensing.
  
  CR: Cliff
  DRT: v1 and v2 passes
  
  Revision  Changes    Path
  1.5       +1 -3      xml-xmlbeans/v1/src/typeimpl/org/apache/xmlbeans/impl/schema/StscJavaizer.java
  
  Index: StscJavaizer.java
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v1/src/typeimpl/org/apache/xmlbeans/impl/schema/StscJavaizer.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- StscJavaizer.java	12 Feb 2004 20:05:55 -0000	1.4
  +++ StscJavaizer.java	8 Apr 2004 19:22:03 -0000	1.5
  @@ -24,8 +24,6 @@
   import org.apache.xmlbeans.QNameSet;
   import org.apache.xmlbeans.XmlAnySimpleType;
   import org.apache.xmlbeans.SchemaStringEnumEntry;
  -import org.apache.xmlbeans.XmlByte;
  -import org.apache.xmlbeans.XmlShort;
   
   import java.util.*;
   import java.math.BigInteger;
  @@ -391,7 +389,7 @@
                       }
                       else if (childContents.contains(target))
                       {
  -                        builder.addAll(computeAllContainedElements(contentModel.getParticleChild(i),
state));
  +                        builder.addAll(computeNondelimitingElements(target, contentModel.getParticleChild(i),
state));
                           seenTarget = true;
                       }
                   }
  
  
  
  1.4       +1 -1      xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/schema/StscJavaizer.java
  
  Index: StscJavaizer.java
  ===================================================================
  RCS file: /home/cvs/xml-xmlbeans/v2/src/typeimpl/org/apache/xmlbeans/impl/schema/StscJavaizer.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- StscJavaizer.java	12 Feb 2004 20:06:21 -0000	1.3
  +++ StscJavaizer.java	8 Apr 2004 19:22:03 -0000	1.4
  @@ -391,7 +391,7 @@
                       }
                       else if (childContents.contains(target))
                       {
  -                        builder.addAll(computeAllContainedElements(contentModel.getParticleChild(i),
state));
  +                        builder.addAll(computeNondelimitingElements(target, contentModel.getParticleChild(i),
state));
                           seenTarget = true;
                       }
                   }
  
  
  

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


Mime
View raw message