commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mben...@apache.org
Subject svn commit: r604261 - in /commons/proper/jxpath/trunk: src/java/org/apache/commons/jxpath/ri/compiler/ExtensionFunction.java src/site/site.xml xdocs/users-guide.xml
Date Fri, 14 Dec 2007 19:08:09 GMT
Author: mbenson
Date: Fri Dec 14 11:08:09 2007
New Revision: 604261

URL: http://svn.apache.org/viewvc?rev=604261&view=rev
Log:
[JXPATH-108] solve ExtensionFunction NodeSet issues by converting to an EvalContext

Modified:
    commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/ExtensionFunction.java
    commons/proper/jxpath/trunk/src/site/site.xml
    commons/proper/jxpath/trunk/xdocs/users-guide.xml

Modified: commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/ExtensionFunction.java
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/ExtensionFunction.java?rev=604261&r1=604260&r2=604261&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/ExtensionFunction.java
(original)
+++ commons/proper/jxpath/trunk/src/java/org/apache/commons/jxpath/ri/compiler/ExtensionFunction.java
Fri Dec 14 11:08:09 2007
@@ -20,8 +20,10 @@
 
 import org.apache.commons.jxpath.Function;
 import org.apache.commons.jxpath.JXPathFunctionNotFoundException;
+import org.apache.commons.jxpath.NodeSet;
 import org.apache.commons.jxpath.ri.EvalContext;
 import org.apache.commons.jxpath.ri.QName;
+import org.apache.commons.jxpath.ri.axes.NodeSetContext;
 
 /**
  * Represents an element of the parse tree representing an extension function
@@ -87,8 +89,9 @@
             throw new JXPathFunctionNotFoundException("No such function: "
                     + functionName + Arrays.asList(parameters));
         }
-
-        return function.invoke(context, parameters);
+        Object result = function.invoke(context, parameters);
+        return result instanceof NodeSet ? new NodeSetContext(context,
+                (NodeSet) result) : result;
     }
     
     private Object convert(Object object) {

Modified: commons/proper/jxpath/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/src/site/site.xml?rev=604261&r1=604260&r2=604261&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/src/site/site.xml (original)
+++ commons/proper/jxpath/trunk/src/site/site.xml Fri Dec 14 11:08:09 2007
@@ -29,11 +29,15 @@
       <item name="Download"        href="http://commons.apache.org/downloads/download_jxpath.cgi"/>
       <item name="User's Guide"    href="/users-guide.html"/>
       <item name="JavaDoc"         href="/apidocs/index.html"/>
-      <item name="Release Notes"   href="/release-notes-1.2.html"/>
+      <item name="Release Notes"   href="/release-notes-1.3.html"/>
       <item name="Dependencies"    href="/dependencies.html"/>
       <item name="License"         href="/license.html"/>
       <item name="Wiki"            href="http://wiki.apache.org/commons/JXPath"/>
     </menu>
+    <!--menu name="JXPath 1.3">
+      <item name="JavaDoc"         href="/apidocs/index.html"/>
+      <item name="Release Notes"   href="/release-notes-1.3.html"/>
+    </menu>
     <menu name="JXPath 1.2">
       <item name="Javadoc"         href="http://commons.apache.org/jxpath/api-1.2/"/>
       <item name="Release Notes"   href="http://commons.apache.org/jxpath/release-notes-1.2.html"/>
@@ -41,7 +45,7 @@
     <menu name="JXPath 1.1">
       <item name="Javadoc"         href="http://commons.apache.org/jxpath/api-1.1/"/>
       <item name="Release Notes"   href="http://commons.apache.org/jxpath/release-notes-1.1.html"/>
-    </menu>
+    </menu-->
     <menu name="Development">
       <item name="Mailing Lists"     href="/mail-lists.html"/>
       <item name="Issue Tracking"    href="/issue-tracking.html"/>

Modified: commons/proper/jxpath/trunk/xdocs/users-guide.xml
URL: http://svn.apache.org/viewvc/commons/proper/jxpath/trunk/xdocs/users-guide.xml?rev=604261&r1=604260&r2=604261&view=diff
==============================================================================
--- commons/proper/jxpath/trunk/xdocs/users-guide.xml (original)
+++ commons/proper/jxpath/trunk/xdocs/users-guide.xml Fri Dec 14 11:08:09 2007
@@ -1382,7 +1382,7 @@
 
     <section name="Type Conversions">
       <p>
-        JXPath automatically performs the following type convertions:
+        JXPath automatically performs the following type conversions:
       </p>
       <table>
         <tr>



Mime
View raw message