You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xerces.apache.org by ne...@apache.org on 2001/02/22 16:48:40 UTC
cvs commit: xml-xerces/java/src/org/apache/xerces/validators/common DFAContentModel.java Grammar.java
neilg 01/02/22 07:48:40
Modified: java/src/org/apache/xerces/validators/common
DFAContentModel.java Grammar.java
Log:
removed some debugging code that had some nasty side-effects; general clean-up.
Revision Changes Path
1.24 +9 -11 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.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- DFAContentModel.java 2001/02/21 23:14:43 1.23
+++ DFAContentModel.java 2001/02/22 15:48:39 1.24
@@ -75,7 +75,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.23 2001/02/21 23:14:43 neilg Exp $
+ * @version $Id: DFAContentModel.java,v 1.24 2001/02/22 15:48:39 neilg Exp $
*/
public class DFAContentModel
implements XMLContentModel {
@@ -918,21 +918,19 @@
for (int elemIndex = 0; elemIndex < fElemMapSize; elemIndex++) {
for (int leafIndex = 0; leafIndex < fLeafCount; leafIndex++) {
final QName leaf = fLeafList[leafIndex].getElement();
-final int leafType = fLeafListType[leafIndex];
+ final int leafType = fLeafListType[leafIndex];
final QName element = fElemMap[elemIndex];
if (fDTD) {
if (leaf.rawname == element.rawname) {
- fLeafSorter[fSortCount++] = leafIndex;
+ fLeafSorter[fSortCount++] = leafIndex;
}
}
- else {
- if (leaf.uri == element.uri &&
- leaf.localpart == element.localpart) {
- if (!((leafType & 0x0f) == XMLContentSpec.CONTENTSPECNODE_ANY ||
- (leafType & 0x0f) == XMLContentSpec.CONTENTSPECNODE_ANY_LOCAL ||
- (leafType & 0x0f) == XMLContentSpec.CONTENTSPECNODE_ANY_OTHER))
- fLeafSorter[fSortCount++] = leafIndex;
-}
+ else if (leaf.uri == element.uri &&
+ leaf.localpart == element.localpart) {
+ if (!((leafType & 0x0f) == XMLContentSpec.CONTENTSPECNODE_ANY ||
+ (leafType & 0x0f) == XMLContentSpec.CONTENTSPECNODE_ANY_LOCAL ||
+ (leafType & 0x0f) == XMLContentSpec.CONTENTSPECNODE_ANY_OTHER))
+ fLeafSorter[fSortCount++] = leafIndex;
}
}
fLeafSorter[fSortCount++] = -1;
1.19 +1 -4 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.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- Grammar.java 2001/02/21 23:14:43 1.18
+++ Grammar.java 2001/02/22 15:48:39 1.19
@@ -71,7 +71,7 @@
/**
- * @version $Id: Grammar.java,v 1.18 2001/02/21 23:14:43 neilg Exp $
+ * @version $Id: Grammar.java,v 1.19 2001/02/22 15:48:39 neilg Exp $
*/
public class Grammar
implements XMLContentSpec.Provider {
@@ -732,9 +732,6 @@
// We will build a node at this level for the new tree
CMNode nodeRet = null;
getContentSpec(startNode, contentSpec);
- if (((contentSpec.type & 0x0f) == XMLContentSpec.CONTENTSPECNODE_ANY) ||
- ((contentSpec.type & 0x0f) == XMLContentSpec.CONTENTSPECNODE_ANY_OTHER) ||
- ((contentSpec.type & 0x0f) == XMLContentSpec.CONTENTSPECNODE_ANY_LOCAL) )
if ((contentSpec.type & 0x0f) == XMLContentSpec.CONTENTSPECNODE_ANY) {
//nodeRet = new CMAny(contentSpec.type, -1, fLeafCount++);
nodeRet = new CMAny(contentSpec.type, contentSpec.otherValue, fLeafCount++);