You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2004/09/02 15:10:15 UTC
svn commit: rev 37375 - cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom
Author: vgritsenko
Date: Thu Sep 2 06:10:15 2004
New Revision: 37375
Modified:
cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
Log:
minor tweaks
Modified: cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_Cocoon.java Thu Sep 2 06:10:15 2004
@@ -273,12 +273,13 @@
public void jsFunction_processPipelineTo(String uri,
Object map,
Object outputStream)
- throws Exception {
- if (!(unwrap(outputStream) instanceof OutputStream)) {
- throw new JavaScriptException("expected a java.io.OutputStream instead of " + outputStream);
+ throws Exception {
+ Object out = unwrap(outputStream);
+ if (!(out instanceof OutputStream)) {
+ throw new JavaScriptException("expected a java.io.OutputStream instead of " + out);
}
getInterpreter().process(getParentScope(), this, uri, map,
- (OutputStream)unwrap(outputStream));
+ (OutputStream)out);
}
public void jsFunction_redirectTo(String uri, boolean isGlobal) throws Exception {
Modified: cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java Thu Sep 2 06:10:15 2004
@@ -81,7 +81,7 @@
* @author <a href="mailto:ovidiu@apache.org">Ovidiu Predescu</a>
* @author <a href="mailto:crafterm@apache.org">Marcus Crafter</a>
* @since March 25, 2002
- * @version CVS $Id: FOM_JavaScriptInterpreter.java,v 1.31 2004/07/07 05:56:04 sylvain Exp $
+ * @version CVS $Id$
*/
public class FOM_JavaScriptInterpreter extends CompilingInterpreter
implements Configurable, Initializable {
@@ -823,7 +823,8 @@
public void forwardTo(Scriptable scope, FOM_Cocoon cocoon, String uri,
Object bizData, FOM_WebContinuation fom_wk,
- Redirector redirector) throws Exception {
+ Redirector redirector)
+ throws Exception {
setupView(scope, cocoon, fom_wk);
super.forwardTo(uri, bizData,
fom_wk == null ? null : fom_wk.getWebContinuation(),
@@ -832,7 +833,8 @@
// package access as this is called by FOM_Cocoon
void process(Scriptable scope, FOM_Cocoon cocoon, String uri,
- Object bizData, OutputStream out) throws Exception {
+ Object bizData, OutputStream out)
+ throws Exception {
setupView(scope, cocoon, null);
super.process(uri, bizData, out);
}