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/06/30 03:11:01 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/validators/common DFAContentModel.java Grammar.java
ericye 00/06/29 18:11:00
Modified: java/src/org/apache/xerces/validators/common
DFAContentModel.java Grammar.java
Log:
fix a bug when <any namespace="more that one uri"
-- ericye
Revision Changes Path
1.9 +4 -9 xml-xerces/java/src/org/apache/xerces/validators/common/DFAContentModel.java
Index: DFAContentModel.java
===================================================================
RCS file: /home/cvs/xml-xerces/java/src/org/apache/xerces/validators/common/DFAContentModel.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- DFAContentModel.java 2000/06/21 01:19:01 1.8
+++ DFAContentModel.java 2000/06/30 01:10:59 1.9
@@ -74,7 +74,7 @@
* are very constrained in form and easily handled via a special case.
* This also makes implementation of this class much easier.
*
- * @version $Id: DFAContentModel.java,v 1.8 2000/06/21 01:19:01 ericye Exp $
+ * @version $Id: DFAContentModel.java,v 1.9 2000/06/30 01:10:59 ericye Exp $
*/
public class DFAContentModel
implements XMLContentModel {
@@ -422,14 +422,9 @@
private boolean isEqual(QName name1, QName name2) {
if (name1 != null && name2 != null) {
- // REVISIT: should be better named, name1 should be nameInContentModel,
- // name2 should be nameOfChild
- if (name1.localpart == -1) {
- return name1.uri == name2.uri;
- }
- else
- return name1.localpart == name2.localpart &&
- name1.uri == name2.uri;
+
+ return name1.localpart == name2.localpart &&
+ name1.uri == name2.uri;
}
return false;
1.7 +3 -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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Grammar.java 2000/06/16 18:13:34 1.6
+++ Grammar.java 2000/06/30 01:10:59 1.7
@@ -69,7 +69,7 @@
/**
- * @version $Id: Grammar.java,v 1.6 2000/06/16 18:13:34 andyc Exp $
+ * @version $Id: Grammar.java,v 1.7 2000/06/30 01:10:59 ericye Exp $
*/
public class Grammar
implements XMLContentSpec.Provider {
@@ -645,7 +645,8 @@
CMNode nodeRet = null;
getContentSpec(startNode, contentSpec);
if (contentSpec.type == XMLContentSpec.CONTENTSPECNODE_ANY) {
- nodeRet = new CMAny(contentSpec.type, -1, fLeafCount++);
+ //nodeRet = new CMAny(contentSpec.type, -1, fLeafCount++);
+ nodeRet = new CMAny(contentSpec.type, contentSpec.otherValue, fLeafCount++);
}
else if (contentSpec.type == XMLContentSpec.CONTENTSPECNODE_ANY_OTHER) {
nodeRet = new CMAny(contentSpec.type, contentSpec.otherValue, fLeafCount++);