You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by sb...@apache.org on 2001/08/01 00:23:38 UTC
cvs commit: xml-xalan/java/src/org/apache/xpath/axes ChildTestIterator.java OneStepIteratorForward.java
sboag 01/07/31 15:23:38
Modified: java/src/org/apache/xpath XPathContext.java
java/src/org/apache/xpath/axes ChildTestIterator.java
OneStepIteratorForward.java
Log:
In XPathContext#createDTMIterator(int node), call OneStepIteratorForward(Axis.SELF)
instead of DescendantIterator. This addresses one of the bugs
in http://nagoya.apache.org/bugzilla/show_bug.cgi?id=2925
(i.e. <xsl:copy-of select="xalan:nodeset($stylesheets)"/>...
The DescendantIterator was enumerating all of the nodes in the RTF
rather than just the one.)
Revision Changes Path
1.29 +3 -1 xml-xalan/java/src/org/apache/xpath/XPathContext.java
Index: XPathContext.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/XPathContext.java,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- XPathContext.java 2001/07/28 00:26:00 1.28
+++ XPathContext.java 2001/07/31 22:23:38 1.29
@@ -103,6 +103,7 @@
import org.apache.xml.dtm.DTMFilter;
import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.DTMWSFilter;
+import org.apache.xml.dtm.Axis;
// Utility imports.
import org.apache.xml.utils.SAXSourceLocator;
@@ -294,7 +295,8 @@
*/
public DTMIterator createDTMIterator(int node)
{
- DescendantIterator iter = new DescendantIterator();
+ // DescendantIterator iter = new DescendantIterator();
+ DTMIterator iter = new org.apache.xpath.axes.OneStepIteratorForward(Axis.SELF);
iter.setRoot(node, this);
return iter;
// return m_dtmManager.createDTMIterator(node);
1.11 +0 -1 xml-xalan/java/src/org/apache/xpath/axes/ChildTestIterator.java
Index: ChildTestIterator.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/ChildTestIterator.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ChildTestIterator.java 2001/07/06 18:29:17 1.10
+++ ChildTestIterator.java 2001/07/31 22:23:38 1.11
@@ -126,7 +126,6 @@
* @throws javax.xml.transform.TransformerException
*/
ChildTestIterator(DTMAxisTraverser traverser)
- throws javax.xml.transform.TransformerException
{
super(null);
1.3 +18 -0 xml-xalan/java/src/org/apache/xpath/axes/OneStepIteratorForward.java
Index: OneStepIteratorForward.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/axes/OneStepIteratorForward.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- OneStepIteratorForward.java 2001/06/12 19:16:19 1.2
+++ OneStepIteratorForward.java 2001/07/31 22:23:38 1.3
@@ -45,6 +45,23 @@
}
+ /**
+ * Create a OneStepIterator object that will just traverse the self axes.
+ *
+ * @param axis One of the org.apache.xml.dtm.Axis integers.
+ *
+ * @throws javax.xml.transform.TransformerException
+ */
+ public OneStepIteratorForward(int axis)
+ {
+ super(null);
+
+ m_axis = axis;
+ int whatToShow = DTMFilter.SHOW_ALL;
+ initNodeTest(whatToShow);
+ }
+
+
/**
@@ -58,6 +75,7 @@
{
super.setRoot(context, environment);
m_traverser = m_cdtm.getAxisTraverser(m_axis);
+
}
// /**
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org