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...@locus.apache.org on 2000/12/07 20:58:28 UTC
cvs commit: xml-xalan/java/src/org/apache/xpath/objects XRTreeFrag.java
sboag 00/12/07 11:58:28
Modified: java/src/org/apache/xalan/transformer ResultTreeHandler.java
java/src/org/apache/xml/utils TreeWalker.java
java/src/org/apache/xpath DOMHelper.java
java/src/org/apache/xpath/objects XRTreeFrag.java
Log:
Removed walking of DocumentFragments via NodeList.
Revision Changes Path
1.26 +3 -4 xml-xalan/java/src/org/apache/xalan/transformer/ResultTreeHandler.java
Index: ResultTreeHandler.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/transformer/ResultTreeHandler.java,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- ResultTreeHandler.java 2000/11/23 04:58:21 1.25
+++ ResultTreeHandler.java 2000/12/07 19:58:26 1.26
@@ -753,14 +753,13 @@
{
DocumentFragment docFrag = obj.rtree(support);
- NodeList nl = docFrag.getChildNodes();
- int nChildren = nl.getLength();
TreeWalker tw = new TreeWalker(this);
- for (int i = 0; i < nChildren; i++)
+ Node n;
+ for (n = docFrag.getFirstChild(); null != n; n = docFrag.getNextSibling())
{
flushPending(EVT_NODE); // I think.
- tw.traverse(nl.item(i));
+ tw.traverse(n);
}
}
1.3 +0 -17 xml-xalan/java/src/org/apache/xml/utils/TreeWalker.java
Index: TreeWalker.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xml/utils/TreeWalker.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- TreeWalker.java 2000/12/01 20:30:13 1.2
+++ TreeWalker.java 2000/12/07 19:58:27 1.3
@@ -192,23 +192,6 @@
}
}
- /*
- public void traverse(Node pos) throws TransformerException
- {
- startNode(pos);
- NodeList children = pos.getChildNodes();
- if(null != children)
- {
- int nChildren = children.getLength();
- for(int i = 0; i < nChildren; i++)
- {
- traverse(children.item(i));
- }
- }
- endNode(pos);
- }
- */
-
/** Flag indicating whether following text to be processed is raw text */
boolean nextIsRaw = false;
1.12 +0 -10 xml-xalan/java/src/org/apache/xpath/DOMHelper.java
Index: DOMHelper.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xpath/DOMHelper.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- DOMHelper.java 2000/11/23 04:58:54 1.11
+++ DOMHelper.java 2000/12/07 19:58:27 1.12
@@ -1085,16 +1085,6 @@
switch (node.getNodeType())
{
case Node.DOCUMENT_FRAGMENT_NODE :
- {
- NodeList mnl = node.getChildNodes();
- int n = mnl.getLength();
-
- for (int i = 0; i < n; i++)
- {
- getNodeData(mnl.item(i), buf);
- }
- }
- break;
case Node.DOCUMENT_NODE :
case Node.ELEMENT_NODE :
{
1.10 +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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- XRTreeFrag.java 2000/11/13 16:27:45 1.9
+++ XRTreeFrag.java 2000/12/07 19:58:28 1.10
@@ -195,9 +195,7 @@
public NodeList convertToNodeset()
{
- if (m_obj instanceof DocumentFragment)
- return ((DocumentFragment) m_obj).getChildNodes();
- else if (m_obj instanceof NodeList)
+ if (m_obj instanceof NodeList)
return (NodeList) m_obj;
else
return null;