Return-Path: Delivered-To: apmail-xml-cocoon-cvs-archive@xml.apache.org Received: (qmail 10939 invoked by uid 500); 23 Mar 2003 19:42:37 -0000 Mailing-List: contact cocoon-cvs-help@xml.apache.org; run by ezmlm Precedence: bulk Reply-To: cocoon-dev@xml.apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list cocoon-cvs@xml.apache.org Received: (qmail 10928 invoked by uid 500); 23 Mar 2003 19:42:37 -0000 Delivered-To: apmail-cocoon-2.1-cvs@apache.org Received: (qmail 10924 invoked from network); 23 Mar 2003 19:42:37 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 23 Mar 2003 19:42:37 -0000 Received: (qmail 38219 invoked by uid 1544); 23 Mar 2003 19:42:38 -0000 Date: 23 Mar 2003 19:42:38 -0000 Message-ID: <20030323194238.38218.qmail@icarus.apache.org> From: coliver@apache.org To: cocoon-2.1-cvs@apache.org Subject: cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript JavaScriptInterpreter.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N coliver 2003/03/23 11:42:38 Modified: src/java/org/apache/cocoon/components/flow/javascript JavaScriptInterpreter.java Log: remove tabs Revision Changes Path 1.10 +27 -24 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.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- JavaScriptInterpreter.java 23 Mar 2003 19:41:03 -0000 1.9 +++ JavaScriptInterpreter.java 23 Mar 2003 19:42:38 -0000 1.10 @@ -1,4 +1,4 @@ -/* +/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- ============================================================================ The Apache Software License, Version 1.1 @@ -178,26 +178,26 @@ static org.mozilla.javascript.tools.debugger.Main debugger; static synchronized org.mozilla.javascript.tools.debugger.Main getDebugger() { - if (debugger == null) { + if (debugger == null) { final org.mozilla.javascript.tools.debugger.Main db = new org.mozilla.javascript.tools.debugger.Main("Cocoon Flow Debugger"); db.pack(); - java.awt.Dimension size = - java.awt.Toolkit.getDefaultToolkit().getScreenSize(); - size.width *= 0.75; - size.height *= 0.75; + java.awt.Dimension size = + java.awt.Toolkit.getDefaultToolkit().getScreenSize(); + size.width *= 0.75; + size.height *= 0.75; db.setSize(size); db.setExitAction(new Runnable() { public void run() { db.setVisible(false); } }); - db.setOptimizationLevel(OPTIMIZATION_LEVEL); + db.setOptimizationLevel(OPTIMIZATION_LEVEL); db.setVisible(true); debugger = db; Context.addContextListener(debugger); - } - return debugger; + } + return debugger; } public void configure(Configuration config) @@ -225,7 +225,7 @@ if (getLogger().isDebugEnabled()) { getLogger().debug("Flow debugger enabled, creating"); } - getDebugger().doBreak(); + getDebugger().doBreak(); } Context context = Context.enter(); context.setOptimizationLevel(OPTIMIZATION_LEVEL); @@ -298,9 +298,9 @@ if (userScopes == null) { return null; } - String uriPrefix = environment.getURIPrefix(); - scope = (Scriptable)userScopes.get(uriPrefix); - return scope; + String uriPrefix = environment.getURIPrefix(); + scope = (Scriptable)userScopes.get(uriPrefix); + return scope; } /** @@ -322,8 +322,8 @@ userScopes = new HashMap(); session.setAttribute(USER_GLOBAL_SCOPE, userScopes); } - String uriPrefix = environment.getURIPrefix(); - System.out.println("set uriPrefix="+uriPrefix); + String uriPrefix = environment.getURIPrefix(); + System.out.println("set uriPrefix="+uriPrefix); userScopes.put(uriPrefix, scope); } @@ -440,8 +440,8 @@ } thrScope.put(LAST_EXEC_TIME, thrScope, new Long(System.currentTimeMillis())); - // Compile all the scripts first. That way you can set breakpoints - // in the debugger before they execute. + // Compile all the scripts first. That way you can set breakpoints + // in the debugger before they execute. for (int i = 0, size = execList.size(); i < size; i++) { String sourceURI = (String)execList.get(i); ScriptSourceEntry entry = @@ -454,7 +454,7 @@ // Compile the script if necessary Script script = entry.getScript(context, this.scope, needsRefresh); } - // Execute the scripts if necessary + // Execute the scripts if necessary for (int i = 0, size = execList.size(); i < size; i++) { String sourceURI = (String)execList.get(i); ScriptSourceEntry entry = @@ -464,7 +464,7 @@ if (lastExecTime == 0 || lastMod > lastExecTime) { script.exec(context, thrScope); } - } + } return thrScope; } @@ -542,7 +542,7 @@ Context context = Context.getCurrentContext(); JSCocoon cocoon = (JSCocoon)thrScope.get("cocoon", thrScope); if (enableDebugger) { - getDebugger().setVisible(true); + getDebugger().setVisible(true); } int size = (params != null ? params.size() : 0); Object[] funArgs = new Object[size]; @@ -603,8 +603,8 @@ JSCocoon cocoon = jswk.getJSCocoon(); cocoon.setContext(manager, environment); final Scriptable kScope = cocoon.getParentScope(); - if (enableDebugger) { - getDebugger().setVisible(true); + if (enableDebugger) { + getDebugger().setVisible(true); } // We can now resume the processing from the state saved by the @@ -639,7 +639,7 @@ Context.exit(); } } - + private Throwable unwrap(JavaScriptException e) { Object value = e.getValue(); while (value instanceof Wrapper) { @@ -651,3 +651,6 @@ return e; } } + + +