mkwan 2002/09/19 12:52:26
Modified: java/src/org/apache/xpath/objects
XRTreeFragSelectWrapper.java
Log:
For Bugzilla 6181. Change the execute() interface to return the result
of executing the select expression.
Revision Changes Path
1.6 +7 -16
xml-xalan/java/src/org/apache/xpath/objects/XRTreeFragSelectWrapper.java
Index: XRTreeFragSelectWrapper.java
===================================================================
RCS file:
/home/cvs/xml-xalan/java/src/org/apache/xpath/objects/XRTreeFragSelectWrapper.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- XRTreeFragSelectWrapper.java 22 Mar 2002 01:04:44 -0000 1.5
+++ XRTreeFragSelectWrapper.java 19 Sep 2002 19:52:26 -0000 1.6
@@ -44,27 +44,18 @@
*
* @param xctxt The XPath execution context.
*
- * @return This object.
+ * @return the result of executing the select expression
*
* @throws javax.xml.transform.TransformerException
*/
public XObject execute(XPathContext xctxt)
throws javax.xml.transform.TransformerException
{
- try
- {
- m_selected = ((Expression)m_obj).execute(xctxt);
- m_selected.allowDetachToRelease(m_allowRelease);
- XRTreeFragSelectWrapper xrtf = (XRTreeFragSelectWrapper)this.clone();
- return xrtf;
- }
- catch(CloneNotSupportedException cnse)
- {
- throw new javax.xml.transform.TransformerException(cnse);
- }
-
+ m_selected = ((Expression)m_obj).execute(xctxt);
+ m_selected.allowDetachToRelease(m_allowRelease);
+ return m_selected;
}
-
+
/**
* Detaches the <code>DTMIterator</code> from the set which it iterated
* over, releasing any computational resources and placing the iterator
@@ -121,11 +112,11 @@
/**
* Tell what kind of class this is.
*
- * @return type CLASS_RTREEFRAG
+ * @return the type of the select expression
*/
public int getType()
{
- return CLASS_STRING; // hmm...
+ return m_selected.getType();
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
