mkwan 2002/09/16 09:12:49
Modified: java/src/org/apache/xpath/axes RTFIterator.java
java/src/org/apache/xpath/objects XRTreeFrag.java
Log:
For Bugzilla 11341. Let RTFIterator extend NodeSetDTM so that it is the kind
of DTMIterator expected by DTMNodeList. This also fixes the problem in
testcase JavaBugzilla3722.
Revision Changes Path
1.2 +6 -14 xml-xalan/java/src/org/apache/xpath/axes/RTFIterator.java
Index: RTFIterator.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/axes/RTFIterator.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- RTFIterator.java 18 Jun 2002 15:31:02 -0000 1.1
+++ RTFIterator.java 16 Sep 2002 16:12:49 -0000 1.2
@@ -7,24 +7,16 @@
package org.apache.xpath.axes;
import javax.xml.transform.TransformerException;
-import org.apache.xpath.compiler.Compiler;
+import org.apache.xpath.NodeSetDTM;
+import org.apache.xml.dtm.DTMManager;
-public class RTFIterator extends OneStepIteratorForward {
+public class RTFIterator extends NodeSetDTM {
/**
* Constructor for RTFIterator
- */
- RTFIterator(Compiler compiler, int opPos, int analysis)
- throws TransformerException {
- super(compiler, opPos, analysis);
+ */
+ public RTFIterator(int root, DTMManager manager) {
+ super(root, manager);
}
-
- /**
- * Constructor for RTFIterator
- */
- public RTFIterator(int axis) {
- super(axis);
- }
-
}
1.26 +1 -3
xml-xalan/java/src/org/apache/xpath/objects/XRTreeFrag.java
Index: XRTreeFrag.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XRTreeFrag.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- XRTreeFrag.java 7 Aug 2002 22:13:56 -0000 1.25
+++ XRTreeFrag.java 16 Sep 2002 16:12:49 -0000 1.26
@@ -350,9 +350,7 @@
*/
public DTMIterator asNodeIterator()
{
- DTMIterator iter = new RTFIterator(Axis.SELF);
- iter.setRoot(m_dtmRoot, m_xctxt);
- return iter;
+ return new RTFIterator(m_dtmRoot, m_xctxt.getDTMManager());
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
