mmidy 00/02/08 06:43:52
Modified: src/org/apache/xalan/xpath SimpleNodeLocator.java
XPathProcessorImpl.java
src/org/apache/xalan/xpath/dtm DTMNodeLocator.java
Log:
Change to use static XPath constants.
Revision Changes Path
1.11 +6 -6
xml-xalan/src/org/apache/xalan/xpath/SimpleNodeLocator.java
Index: SimpleNodeLocator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/SimpleNodeLocator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- SimpleNodeLocator.java 2000/02/08 14:29:53 1.10
+++ SimpleNodeLocator.java 2000/02/08 14:43:51 1.11
@@ -1705,17 +1705,17 @@
opPos++;
switch(testType)
{
- case xpath.NODETYPE_COMMENT:
+ case XPath.NODETYPE_COMMENT:
score = (Node.COMMENT_NODE == nodeType)
? xpath.MATCH_SCORE_NODETEST : xpath.MATCH_SCORE_NONE;
break;
- case xpath.NODETYPE_TEXT:
+ case XPath.NODETYPE_TEXT:
score = (((Node.CDATA_SECTION_NODE == nodeType)
|| (Node.TEXT_NODE == nodeType)) &&
(!execContext.shouldStripSourceNode(context)))
? xpath.MATCH_SCORE_NODETEST : xpath.MATCH_SCORE_NONE;
break;
- case xpath.NODETYPE_PI:
+ case XPath.NODETYPE_PI:
if( (Node.PROCESSING_INSTRUCTION_NODE == nodeType) )
{
if(argLen == 2)
@@ -1739,7 +1739,7 @@
score = xpath.MATCH_SCORE_NONE;
}
break;
- case xpath.NODETYPE_NODE:
+ case XPath.NODETYPE_NODE:
if((Node.CDATA_SECTION_NODE == nodeType)
|| (Node.TEXT_NODE == nodeType))
{
@@ -1751,13 +1751,13 @@
score = xpath.MATCH_SCORE_NODETEST;
}
break;
- case xpath.NODETYPE_ROOT:
+ case XPath.NODETYPE_ROOT:
score = ( (Node.DOCUMENT_FRAGMENT_NODE == nodeType)
|| (Node.DOCUMENT_NODE == nodeType))
? xpath.MATCH_SCORE_OTHER : xpath.MATCH_SCORE_NONE;
break;
- case xpath.NODENAME:
+ case XPath.NODENAME:
{
boolean test;
int queueIndex = xpath.m_opMap[opPos];
1.15 +26 -26
xml-xalan/src/org/apache/xalan/xpath/XPathProcessorImpl.java
Index: XPathProcessorImpl.java
===================================================================
RCS file:
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/XPathProcessorImpl.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- XPathProcessorImpl.java 2000/02/08 14:29:54 1.14
+++ XPathProcessorImpl.java 2000/02/08 14:43:51 1.15
@@ -3231,75 +3231,75 @@
diagnoseOpOnly2(opPos, "ENDOP");
opPos++;
break;
- case xpath.FROM_ANCESTORS:
+ case XPath.FROM_ANCESTORS:
opPos = diagnoseXPathLocationStep2("FROM_ANCESTORS", xpath, opPos, 1);
break;
- case xpath.FROM_ANCESTORS_OR_SELF:
+ case XPath.FROM_ANCESTORS_OR_SELF:
opPos = diagnoseXPathLocationStep2("FROM_ANCESTORS_OR_SELF", xpath,
opPos, 1);
break;
- case xpath.FROM_ATTRIBUTES:
+ case XPath.FROM_ATTRIBUTES:
opPos = diagnoseXPathLocationStep2("FROM_ATTRIBUTES", xpath, opPos, 1);
break;
- case xpath.FROM_CHILDREN:
+ case XPath.FROM_CHILDREN:
opPos = diagnoseXPathLocationStep2("FROM_CHILDREN", xpath, opPos, 1);
break;
- case xpath.FROM_DESCENDANTS:
+ case XPath.FROM_DESCENDANTS:
opPos = diagnoseXPathLocationStep2("FROM_DESCENDANTS", xpath, opPos,
1);
break;
- case xpath.FROM_DESCENDANTS_OR_SELF:
+ case XPath.FROM_DESCENDANTS_OR_SELF:
opPos = diagnoseXPathLocationStep2("FROM_DESCENDANTS_OR_SELF", xpath,
opPos, 1);
break;
- case xpath.FROM_FOLLOWING:
+ case XPath.FROM_FOLLOWING:
opPos = diagnoseXPathLocationStep2("FROM_FOLLOWING", xpath, opPos,
indent);
break;
- case xpath.FROM_FOLLOWING_SIBLINGS:
+ case XPath.FROM_FOLLOWING_SIBLINGS:
opPos = diagnoseXPathLocationStep2("FROM_FOLLOWING_SIBLINGS", xpath,
opPos, indent);
break;
- case xpath.FROM_PARENT:
+ case XPath.FROM_PARENT:
opPos = diagnoseXPathLocationStep2("FROM_PARENT", xpath, opPos,
indent);
break;
- case xpath.FROM_PRECEDING:
+ case XPath.FROM_PRECEDING:
opPos = diagnoseXPathLocationStep2("FROM_PRECEDING", xpath, opPos,
indent);
break;
- case xpath.FROM_PRECEDING_SIBLINGS:
+ case XPath.FROM_PRECEDING_SIBLINGS:
opPos = diagnoseXPathLocationStep2("FROM_PRECEDING_SIBLINGS", xpath,
opPos, indent);
break;
- case xpath.FROM_SELF:
+ case XPath.FROM_SELF:
opPos = diagnoseXPathLocationStep2("FROM_SELF", xpath, opPos, indent);
break;
- case xpath.FROM_NAMESPACE:
+ case XPath.FROM_NAMESPACE:
opPos = diagnoseXPathLocationStep2("FROM_NAMESPACE", xpath, opPos,
indent);
break;
- // case xpath.FROM_ATTRIBUTE:
+ // case XPath.FROM_ATTRIBUTE:
// opPos = diagnoseXPathLocationStep("FROM_ATTRIBUTE", xpath, opPos,
indent);
// break;
- // case xpath.FROM_DOC:
+ // case XPath.FROM_DOC:
// opPos = diagnoseXPathLocationStep("FROM_DOC", xpath, opPos, indent);
// break;
- // case xpath.FROM_DOCREF:
+ // case XPath.FROM_DOCREF:
// opPos = diagnoseXPathLocationStep("FROM_DOCREF", xpath, opPos,
indent);
// break;
- // case xpath.FROM_ID:
+ // case XPath.FROM_ID:
// opPos = diagnoseXPathLocationStep("FROM_ID", xpath, opPos, indent);
// break;
- // case xpath.FROM_IDREF:
+ // case XPath.FROM_IDREF:
// opPos = diagnoseXPathLocationStep("FROM_IDREF", xpath, opPos,
indent);
// break;
- case xpath.FROM_ROOT:
+ case XPath.FROM_ROOT:
opPos = diagnoseXPathLocationStep2("FROM_ROOT", xpath, opPos, indent);
// opPos++;
break;
- case xpath.NODETYPE_COMMENT:
+ case XPath.NODETYPE_COMMENT:
diagnoseNodeTest2(opPos, "NODETYPE_COMMENT");
System.out.println();
opPos++;
break;
- case xpath.NODETYPE_TEXT:
+ case XPath.NODETYPE_TEXT:
diagnoseNodeTest2(opPos, "NODETYPE_TEXT");
System.out.println();
opPos++;
break;
- case xpath.NODETYPE_PI:
+ case XPath.NODETYPE_PI:
int piLen = xpath.m_opMap[opPos-1];
diagnoseNodeTest2(opPos, "NODETYPE_PI");
opPos++;
@@ -3308,22 +3308,22 @@
opPos = diagnoseToken(xpath, opPos);
}
break;
- case xpath.NODETYPE_NODE:
+ case XPath.NODETYPE_NODE:
diagnoseNodeTest2(opPos, "NODETYPE_NODE");
System.out.println();
opPos++;
break;
- case xpath.NODETYPE_ROOT:
+ case XPath.NODETYPE_ROOT:
diagnoseNodeTest2(opPos, "NODETYPE_ROOT");
System.out.println();
opPos++;
break;
- case xpath.NODETYPE_ANYELEMENT:
+ case XPath.NODETYPE_ANYELEMENT:
diagnoseNodeTest2(opPos, "NODETYPE_ANYELEMENT");
System.out.println();
opPos++;
break;
- case xpath.NODENAME:
+ case XPath.NODENAME:
diagnoseNodeTest2(opPos, "NODENAME");
opPos++;
if(xpath.m_opMap[opPos] < 0)
1.10 +6 -6
xml-xalan/src/org/apache/xalan/xpath/dtm/DTMNodeLocator.java
Index: DTMNodeLocator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/src/org/apache/xalan/xpath/dtm/DTMNodeLocator.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- DTMNodeLocator.java 2000/02/08 14:29:54 1.9
+++ DTMNodeLocator.java 2000/02/08 14:43:52 1.10
@@ -515,17 +515,17 @@
opPos++;
switch(testType)
{
- case xpath.NODETYPE_COMMENT:
+ case XPath.NODETYPE_COMMENT:
score = (Node.COMMENT_NODE == nodeType)
? xpath.MATCH_SCORE_NODETEST : xpath.MATCH_SCORE_NONE;
break;
- case xpath.NODETYPE_TEXT:
+ case XPath.NODETYPE_TEXT:
score = (((Node.CDATA_SECTION_NODE == nodeType)
|| (Node.TEXT_NODE == nodeType)) &&
(!execContext.shouldStripSourceNode(dtm.getNode( context ))))
? xpath.MATCH_SCORE_NODETEST : xpath.MATCH_SCORE_NONE;
break;
- case xpath.NODETYPE_PI:
+ case XPath.NODETYPE_PI:
if( (Node.PROCESSING_INSTRUCTION_NODE == nodeType) )
{
if(argLen == 2)
@@ -549,7 +549,7 @@
score = xpath.MATCH_SCORE_NONE;
}
break;
- case xpath.NODETYPE_NODE:
+ case XPath.NODETYPE_NODE:
if((Node.CDATA_SECTION_NODE == nodeType)
|| (Node.TEXT_NODE == nodeType))
{
@@ -561,13 +561,13 @@
score = xpath.MATCH_SCORE_NODETEST;
}
break;
- case xpath.NODETYPE_ROOT:
+ case XPath.NODETYPE_ROOT:
score = ( (Node.DOCUMENT_FRAGMENT_NODE == nodeType)
|| (Node.DOCUMENT_NODE == nodeType))
? xpath.MATCH_SCORE_OTHER : xpath.MATCH_SCORE_NONE;
break;
- case xpath.NODENAME:
+ case XPath.NODENAME:
{
boolean test;
int queueIndex = xpath.m_opMap[opPos];
