garyp 00/11/08 18:28:04
Modified: java/src/org/apache/xpath/patterns StepPattern.java
Log:
Removed special case coding in executeStep no longer needed
due to refined NodeFilter.
Revision Changes Path
1.13 +1 -13
xml-xalan/java/src/org/apache/xpath/patterns/StepPattern.java
Index: StepPattern.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/patterns/StepPattern.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- StepPattern.java 2000/11/01 02:18:39 1.12
+++ StepPattern.java 2000/11/09 02:28:02 1.13
@@ -239,20 +239,8 @@
{
XObject score;
- short nodeType = xctxt.getCurrentNode().getNodeType();
- if (nodeType == Node.ATTRIBUTE_NODE
- && m_whatToShow != NodeFilter.SHOW_ATTRIBUTE)
- {
- score = NodeTest.SCORE_NONE;
- }
- else if ((nodeType == Node.DOCUMENT_NODE || nodeType ==
Node.DOCUMENT_FRAGMENT_NODE)
- && m_whatToShow != (NodeFilter.SHOW_DOCUMENT |
NodeFilter.SHOW_DOCUMENT_FRAGMENT))
- {
- score = NodeTest.SCORE_NONE;
- }
- else
- score = super.execute(xctxt);
+ score = super.execute(xctxt);
if (score == NodeTest.SCORE_NONE)
{
