You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by jo...@apache.org on 2006/10/08 13:40:22 UTC

svn commit: r454129 - /cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/javascript/JavaScriptExpression.java

Author: joerg
Date: Sun Oct  8 04:40:21 2006
New Revision: 454129

URL: http://svn.apache.org/viewvc?view=rev&rev=454129
Log:
introduce a JavaScriptFlowHelper extending FlowHelper in core for the JS-specific unwrap() method,
FOM_JavaScriptFlowHelper now extends JavaScriptFlowHelper (might be merged?)

Modified:
    cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/javascript/JavaScriptExpression.java

Modified: cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/javascript/JavaScriptExpression.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/javascript/JavaScriptExpression.java?view=diff&rev=454129&r1=454128&r2=454129
==============================================================================
--- cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/javascript/JavaScriptExpression.java (original)
+++ cocoon/trunk/blocks/cocoon-template/cocoon-template-impl/src/main/java/org/apache/cocoon/components/expression/javascript/JavaScriptExpression.java Sun Oct  8 04:40:21 2006
@@ -26,7 +26,7 @@
 import org.apache.cocoon.components.expression.ExpressionException;
 import org.apache.cocoon.components.expression.jexl.JSIntrospector;
 import org.apache.cocoon.components.flow.FlowHelper;
-import org.apache.cocoon.components.flow.util.PipelineUtil;
+import org.apache.cocoon.components.flow.javascript.JavaScriptFlowHelper;
 import org.apache.cocoon.template.environment.FlowObjectModelHelper;
 import org.apache.commons.jexl.util.introspection.Info;
 import org.mozilla.javascript.Context;
@@ -75,7 +75,7 @@
             }
 
             Object result = this.script.exec(ctx, scope);
-            return PipelineUtil.unwrap(result);
+            return JavaScriptFlowHelper.unwrap(result);
         } catch (Exception e) {
             // Note: this catch block is only needed for the Rhino in C2.1 where the older
             //       Rhino does not throw RuntimeExceptions