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/21 03:19:02 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/validators/common DFAContentModel.java
ericye 00/06/20 18:19:01
Modified: java/src/org/apache/xerces/validators/common
DFAContentModel.java
Log:
fix isEqual() method, when compare any leaf from a certain namespace, should only compare
their URIs. -- ericye
Revision Changes Path
1.8 +10 -4 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.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- DFAContentModel.java 2000/06/16 18:13:31 1.7
+++ DFAContentModel.java 2000/06/21 01:19:01 1.8
@@ -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.7 2000/06/16 18:13:31 andyc Exp $
+ * @version $Id: DFAContentModel.java,v 1.8 2000/06/21 01:19:01 ericye Exp $
*/
public class DFAContentModel
implements XMLContentModel {
@@ -385,6 +385,7 @@
System.out.println("curElem : " +curElem );
for (int i=0; i<fElemMapSize; i++) {
System.out.println("fElemMap["+i+"] = " +fElemMap[i] );
+ System.out.println("fElemMapType["+i+"] = " +fElemMapType[i] );
}
}
@@ -421,9 +422,14 @@
private boolean isEqual(QName name1, QName name2) {
if (name1 != null && name2 != null) {
-
- return name1.localpart == name2.localpart &&
- name1.uri == name2.uri;
+ // 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 false;