You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@xalan.apache.org by dl...@apache.org on 2002/06/18 21:07:24 UTC
cvs commit: xml-xalan/java/src/org/apache/xalan/lib ExsltCommon.java
dleslie 2002/06/18 12:07:24
Modified: java/src/org/apache/xalan/lib ExsltCommon.java
Log:
Removed duplicate implementation of several EXSLT "Set"
functions.
Revision Changes Path
1.3 +5 -29 xml-xalan/java/src/org/apache/xalan/lib/ExsltCommon.java
Index: ExsltCommon.java
===================================================================
RCS file: /home/cvs/xml-xalan/java/src/org/apache/xalan/lib/ExsltCommon.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ExsltCommon.java 22 Mar 2002 18:54:57 -0000 1.2
+++ ExsltCommon.java 18 Jun 2002 19:07:24 -0000 1.3
@@ -73,6 +73,7 @@
import org.apache.xpath.XPathContext;
import org.apache.xpath.DOMHelper;
import org.apache.xml.dtm.DTMIterator;
+import org.apache.xml.dtm.DTM;
import org.apache.xml.dtm.ref.DTMNodeIterator;
import org.apache.xml.utils.XMLString;
@@ -132,15 +133,13 @@
else if (obj instanceof DTMNodeIterator)
{
DTMIterator dtmI = ((DTMNodeIterator)obj).getDTMIterator();
- // Need to verify that OneStepIteratorForward is consistently the DTM iterator
- // for rtfs and only rtfs.
- if (dtmI.getClass().getName().equals("org.apache.xpath.axes.OneStepIteratorForward"))
- return "RTF";
+ if (dtmI instanceof org.apache.xpath.axes.RTFIterator)
+ return "RTF";
else
return "node-set";
}
else
- return "external";
+ return "unknown";
}
/**
@@ -167,28 +166,5 @@
{
return Extensions.nodeset(myProcessor, rtf);
}
-
- public static NodeSet intersection(NodeIterator ni1, NodeIterator ni2)
- throws javax.xml.transform.TransformerException
- {
- return Extensions.intersection(ni1, ni2);
- }
-
- public static NodeSet difference(NodeIterator ni1, NodeIterator ni2)
- throws javax.xml.transform.TransformerException
- {
- return Extensions.difference(ni1, ni2);
- }
-
- public static NodeSet distinct(ExpressionContext myContext, NodeIterator ni)
- throws javax.xml.transform.TransformerException
- {
- return Extensions.distinct(myContext, ni);
- }
-
- public static boolean hasSameNodes(NodeIterator ni1, NodeIterator ni2)
- {
- return Extensions.hasSameNodes(ni1, ni2);
- }
-
+
}
---------------------------------------------------------------------
To unsubscribe, e-mail: xalan-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: xalan-cvs-help@xml.apache.org