coliver 2003/03/19 20:18:52
Modified: src/java/org/apache/cocoon/components/flow/javascript
JSCocoon.java JavaScriptInterpreter.java
Log:
fixed funName to be variable instead of literal and finalized change to use shared
scope for compiling
Revision Changes Path
1.8 +2 -2
cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/JSCocoon.java
Index: JSCocoon.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/JSCocoon.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JSCocoon.java 20 Mar 2003 02:46:32 -0000 1.7
+++ JSCocoon.java 20 Mar 2003 04:18:51 -0000 1.8
@@ -198,7 +198,7 @@
org.mozilla.javascript.Context.getCurrentContext();
try {
Scriptable scope = getParentScope();
- Script script = interpreter.compileScript(cx, scope, environment,
filename);
+ Script script = interpreter.compileScript(cx, environment, filename);
return script.exec(cx, scope);
} catch (JavaScriptException e) {
throw e;
1.8 +6 -8
cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/JavaScriptInterpreter.java
Index: JavaScriptInterpreter.java
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/JavaScriptInterpreter.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- JavaScriptInterpreter.java 20 Mar 2003 02:46:32 -0000 1.7
+++ JavaScriptInterpreter.java 20 Mar 2003 04:18:51 -0000 1.8
@@ -429,7 +429,7 @@
}
thrScope.put(LAST_EXEC_TIME, thrScope,
new Long(System.currentTimeMillis()));
- for (int i = 0; i < execList.size(); i++) {
+ for (int i = 0, size = execList.size(); i < size; i++) {
String sourceURI = (String)execList.get(i);
ScriptSourceEntry entry =
(ScriptSourceEntry)compiledScripts.get(sourceURI);
@@ -439,7 +439,7 @@
compiledScripts.put(sourceURI, entry);
}
// Compile the script if necessary
- Script script = entry.getScript(context, thrScope, needsRefresh);
+ Script script = entry.getScript(context, this.scope, needsRefresh);
long lastMod = entry.getSource().getLastModified();
// Execute the script if necessary
if (lastExecTime == 0 || lastMod > lastExecTime) {
@@ -474,7 +474,6 @@
*/
public Script compileScript(Context cx,
- Scriptable scope,
Environment environment,
String fileName) throws Exception {
Source src = environment.resolveURI(fileName);
@@ -492,12 +491,11 @@
return compiledScript;
}
- private Script compileScript(Context cx, Scriptable scope,
+ private Script compileScript(Context cx, Scriptable scope,
Source src) throws Exception {
InputStream is = src.getInputStream();
Reader reader = new BufferedReader(new InputStreamReader(is));
- // FIXME: scope or this.scope?
- Script compiledScript = cx.compileReader(this.scope, reader,
+ Script compiledScript = cx.compileReader(scope, reader,
src.getURI(),
1, null);
return compiledScript;
@@ -548,7 +546,7 @@
NativeArray funArgsArray = new NativeArray(funArgs);
Object fun = ScriptableObject.getProperty(thrScope, funName);
if (fun == Scriptable.NOT_FOUND) {
- fun = "funName"; // this will produce a better error message
+ fun = funName; // this will produce a better error message
}
Object callFunArgs[] = { fun, funArgsArray };
Object callFun = ScriptableObject.getProperty(thrScope, "callFunction");
