You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by er...@locus.apache.org on 2000/07/25 03:34:01 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/validators/common Grammar.java MixedContentModel.java
ericye 00/07/24 18:34:01
Modified: java/src/org/apache/xerces/validators/common Grammar.java
MixedContentModel.java
Log:
fixes regarding a bug with MixedContentModel that caused a ibm conformance test case failing.
Revision Changes Path
1.11 +2 -2 xml-xerces/java/src/org/apache/xerces/validators/common/Grammar.java
Index: Grammar.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/common/Grammar.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Grammar.java 2000/07/25 00:20:59 1.10
+++ Grammar.java 2000/07/25 01:34:01 1.11
@@ -69,7 +69,7 @@
/**
- * @version $Id: Grammar.java,v 1.10 2000/07/25 00:20:59 andyc Exp $
+ * @version $Id: Grammar.java,v 1.11 2000/07/25 01:34:01 ericye Exp $
*/
public class Grammar
implements XMLContentSpec.Provider {
@@ -258,7 +258,7 @@
contentSpecTree(contentSpecIndex, contentSpec, children);
contentModel = new MixedContentModel(children.qname,
children.type,
- 0, children.length, isDTD());
+ 0, children.length, false, isDTD());
}catch( CMException ex ){
ex.printStackTrace();
}
1.7 +3 -1 xml-xerces/java/src/org/apache/xerces/validators/common/MixedContentModel.java
Index: MixedContentModel.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/common/MixedContentModel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- MixedContentModel.java 2000/07/25 00:20:59 1.6
+++ MixedContentModel.java 2000/07/25 01:34:01 1.7
@@ -74,7 +74,7 @@
* validate by just looking up each child being validated by looking it up
* in the list.
*
- * @version $Id: MixedContentModel.java,v 1.6 2000/07/25 00:20:59 andyc Exp $
+ * @version $Id: MixedContentModel.java,v 1.7 2000/07/25 01:34:01 ericye Exp $
*/
public class MixedContentModel
implements XMLContentModel {
@@ -163,6 +163,8 @@
fChildrenType[i] = childListType[offset + i];
}
fOrdered = ordered;
+
+ fDTD = dtd;
} // <init>(QName[],int[],int,int,boolean,boolean)