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:42:20 UTC
svn commit: r454132 -
/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/util/JavaScriptHelper.java
Author: joerg
Date: Sun Oct 8 04:42:19 2006
New Revision: 454132
URL: http://svn.apache.org/viewvc?view=rev&rev=454132
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-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/util/JavaScriptHelper.java
Modified: cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/util/JavaScriptHelper.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/util/JavaScriptHelper.java?view=diff&rev=454132&r1=454131&r2=454132
==============================================================================
--- cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/util/JavaScriptHelper.java (original)
+++ cocoon/trunk/blocks/cocoon-forms/cocoon-forms-impl/src/main/java/org/apache/cocoon/forms/util/JavaScriptHelper.java Sun Oct 8 04:42:19 2006
@@ -23,8 +23,8 @@
import org.apache.avalon.framework.CascadingRuntimeException;
import org.apache.cocoon.components.flow.FlowHelper;
+import org.apache.cocoon.components.flow.javascript.JavaScriptFlowHelper;
import org.apache.cocoon.components.flow.javascript.fom.FOM_JavaScriptFlowHelper;
-import org.apache.cocoon.components.flow.util.PipelineUtil;
import org.mozilla.javascript.Context;
import org.mozilla.javascript.Function;
import org.mozilla.javascript.JavaScriptException;
@@ -210,7 +210,7 @@
}
Object result = script.exec(ctx, scope);
- return PipelineUtil.unwrap(result);
+ return JavaScriptFlowHelper.unwrap(result);
} finally {
Context.exit();
}
@@ -240,7 +240,7 @@
}
func.setParentScope(scope);
Object result = func.call(ctx, scope, thisObject == null? null: Context.toObject(thisObject, scope), arguments);
- return PipelineUtil.unwrap(result);
+ return JavaScriptFlowHelper.unwrap(result);
} finally {
Context.exit();
}