You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by ov...@apache.org on 2002/08/17 03:17:19 UTC
cvs commit: xml-cocoon2/src/java/org/apache/cocoon/components/flow/javascript JSCocoon.java
ovidiu 2002/08/16 18:17:19
Modified: src/java/org/apache/cocoon/components/flow/javascript
JSCocoon.java
Log:
Explicitly use the JavaScriptInterpreter instead of AbstractInterpreter. Organized the imports.
Revision Changes Path
1.5 +32 -36 xml-cocoon2/src/java/org/apache/cocoon/components/flow/javascript/JSCocoon.java
Index: JSCocoon.java
===================================================================
RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/flow/javascript/JSCocoon.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- JSCocoon.java 9 Aug 2002 08:38:23 -0000 1.4
+++ JSCocoon.java 17 Aug 2002 01:17:19 -0000 1.5
@@ -42,44 +42,40 @@
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- This software consists of voluntary contributions made by many individuals
- on behalf of the Apache Software Foundation and was originally created by
- Stefano Mazzocchi <st...@apache.org>. For more information on the Apache
- Software Foundation, please see <http://www.apache.org/>.
-
*/
package org.apache.cocoon.components.flow.javascript;
-import java.util.HashMap;
import java.util.Map;
import java.util.Iterator;
-import org.apache.avalon.framework.component.Component;
-import org.apache.avalon.framework.component.ComponentException;
-import org.apache.avalon.framework.component.ComponentManager;
-import org.apache.avalon.framework.component.ComponentSelector;
-import org.apache.avalon.framework.parameters.Parameters;
-import org.apache.cocoon.acting.Action;
-import org.apache.cocoon.components.flow.AbstractInterpreter;
-import org.apache.cocoon.components.flow.ContinuationsManager;
-import org.apache.cocoon.components.flow.ContinuationsManagerImpl;
-import org.apache.cocoon.components.modules.input.InputModule;
-import org.apache.cocoon.components.modules.output.OutputModule;
-import org.apache.cocoon.environment.Context;
-import org.apache.cocoon.environment.Environment;
-import org.apache.cocoon.environment.ObjectModelHelper;
-import org.apache.cocoon.environment.Redirector;
-import org.apache.cocoon.environment.Request;
-import org.apache.cocoon.environment.Response;
-import org.apache.cocoon.environment.Session;
-import org.apache.cocoon.environment.SourceResolver;
-import org.apache.cocoon.sitemap.SitemapRedirector;
-import org.mozilla.javascript.NativeArray;
-import org.mozilla.javascript.NativeObject;
-import org.mozilla.javascript.ScriptRuntime;
-import org.mozilla.javascript.Scriptable;
-import org.mozilla.javascript.ScriptableObject;
-import org.mozilla.javascript.Undefined;
+import java.util.HashMap;
+
import org.mozilla.javascript.Wrapper;
+import org.mozilla.javascript.Undefined;
+import org.mozilla.javascript.ScriptableObject;
+import org.mozilla.javascript.Scriptable;
+import org.mozilla.javascript.ScriptRuntime;
+import org.mozilla.javascript.NativeObject;
+import org.mozilla.javascript.NativeArray;
+import org.apache.cocoon.sitemap.SitemapRedirector;
+import org.apache.cocoon.environment.SourceResolver;
+import org.apache.cocoon.environment.Session;
+import org.apache.cocoon.environment.Response;
+import org.apache.cocoon.environment.Request;
+import org.apache.cocoon.environment.Redirector;
+import org.apache.cocoon.environment.ObjectModelHelper;
+import org.apache.cocoon.environment.Environment;
+import org.apache.cocoon.environment.Context;
+import org.apache.cocoon.components.modules.output.OutputModule;
+import org.apache.cocoon.components.modules.input.InputModule;
+import org.apache.cocoon.components.flow.ContinuationsManagerImpl;
+import org.apache.cocoon.components.flow.ContinuationsManager;
+import org.apache.cocoon.components.flow.AbstractInterpreter;
+import org.apache.cocoon.acting.Action;
+import org.apache.avalon.framework.parameters.Parameters;
+import org.apache.avalon.framework.component.ComponentSelector;
+import org.apache.avalon.framework.component.ComponentManager;
+import org.apache.avalon.framework.component.ComponentException;
+import org.apache.avalon.framework.component.Component;
/**
* JavaScript interface to various Cocoon abstractions.
@@ -90,7 +86,7 @@
public class JSCocoon extends ScriptableObject
{
protected static String OBJECT_SOURCE_RESOLVER = "source-resolver";
- protected AbstractInterpreter interp;
+ protected JavaScriptInterpreter interp;
protected Scriptable scope;
protected NativeArray parameters;
protected Environment environment;
@@ -118,7 +114,7 @@
this.parameters = parameters;
}
- public void setInterpreter(AbstractInterpreter interp)
+ public void setInterpreter(JavaScriptInterpreter interp)
{
this.interp = interp;
}
@@ -140,7 +136,7 @@
return parameters;
}
- public AbstractInterpreter jsGet_interpreter()
+ public JavaScriptInterpreter jsGet_interpreter()
{
return interp;
}
@@ -176,7 +172,7 @@
/**
* Load the file specified as argument. Registers the file with the
* interpreter and then forces its loading by calling {@link
- * AbstractInterpreter#checkForModifiedScripts}.
+ * JavaScriptInterpreter#checkForModifiedScripts}.
*
* @param filename a <code>String</code> value
* @return an <code>Object</code> value
----------------------------------------------------------------------
In case of troubles, e-mail: webmaster@xml.apache.org
To unsubscribe, e-mail: cocoon-cvs-unsubscribe@xml.apache.org
For additional commands, e-mail: cocoon-cvs-help@xml.apache.org