You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by sy...@apache.org on 2005/09/30 18:05:49 UTC
svn commit: r292797 - in
/cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript:
JSErrorReporter.java fom/FOM_JavaScriptInterpreter.java
Author: sylvain
Date: Fri Sep 30 09:05:46 2005
New Revision: 292797
URL: http://svn.apache.org/viewcvs?rev=292797&view=rev
Log:
Use a new JSErrorReporter for each compilation
Modified:
cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/JSErrorReporter.java
cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
Modified: cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/JSErrorReporter.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/JSErrorReporter.java?rev=292797&r1=292796&r2=292797&view=diff
==============================================================================
--- cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/JSErrorReporter.java (original)
+++ cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/JSErrorReporter.java Fri Sep 30 09:05:46 2005
@@ -15,13 +15,12 @@
*/
package org.apache.cocoon.components.flow.javascript;
-import org.mozilla.javascript.ErrorReporter;
-import org.mozilla.javascript.EvaluatorException;
-import org.mozilla.javascript.tools.ToolErrorReporter;
import org.apache.avalon.framework.logger.Logger;
-import org.apache.cocoon.util.location.LocatedRuntimeException;
import org.apache.cocoon.util.location.Location;
import org.apache.cocoon.util.location.LocationImpl;
+import org.mozilla.javascript.ErrorReporter;
+import org.mozilla.javascript.EvaluatorException;
+import org.mozilla.javascript.tools.ToolErrorReporter;
/**
* Implements a Rhino JavaScript {@link
Modified: cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
URL: http://svn.apache.org/viewcvs/cocoon/trunk/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java?rev=292797&r1=292796&r2=292797&view=diff
==============================================================================
--- 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 Fri Sep 30 09:05:46 2005
@@ -117,7 +117,6 @@
*/
private List topLevelScripts = new ArrayList();
- private JSErrorReporter errorReporter;
private boolean enableDebugger;
/**
@@ -187,7 +186,6 @@
scope = new Global(context);
// Access to Cocoon internal objects
FOM_Cocoon.init(scope);
- errorReporter = new JSErrorReporter(getLogger());
} catch (Exception e) {
Context.exit();
e.printStackTrace();
@@ -553,7 +551,7 @@
context.setOptimizationLevel(OPTIMIZATION_LEVEL);
context.setGeneratingDebug(true);
context.setCompileFunctionsWithDynamicScope(true);
- context.setErrorReporter(errorReporter);
+ context.setErrorReporter(new JSErrorReporter(getLogger()));
LocationTrackingDebugger locationTracker = new LocationTrackingDebugger();
if (!enableDebugger) {