cvs commit: cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom CompilingClassLoader.java FOM_JavaScriptInterpreter.java

[stefano]

stefano     2003/12/29 09:51:38

  Modified:    src/java/org/apache/cocoon/components/flow/javascript/fom
                        CompilingClassLoader.java
                        FOM_JavaScriptInterpreter.java
  Log:
  organizing imports
  
  Revision  Changes    Path
  1.4       +14 -16    
cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/CompilingClassLoader.java
  
  Index: CompilingClassLoader.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/CompilingClassLoader.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CompilingClassLoader.java 28 Dec 2003 07:19:23 -0000      1.3
  +++ CompilingClassLoader.java 29 Dec 2003 17:51:38 -0000      1.4
  @@ -45,29 +45,27 @@
   */
   
   package org.apache.cocoon.components.flow.javascript.fom;
  -import java.net.MalformedURLException;
  -import java.util.Iterator;
  -import java.util.List;
  -import java.util.LinkedList;
  -import java.util.Map;
  -import java.util.HashMap;
  -import java.util.HashSet;
  -import java.util.Set;
  +import java.io.BufferedReader;
  +import java.io.ByteArrayInputStream;
  +import java.io.ByteArrayOutputStream;
   import java.io.IOException;
   import java.io.InputStream;
  -import java.io.ByteArrayOutputStream;
  -import java.io.ByteArrayInputStream;
  -import java.io.Reader;
  -import java.io.BufferedReader;
   import java.io.InputStreamReader;
  +import java.io.Reader;
  +import java.net.MalformedURLException;
  +import java.util.HashSet;
  +import java.util.Iterator;
  +import java.util.LinkedList;
  +import java.util.List;
  +
   import org.apache.excalibur.source.Source;
   import org.apache.excalibur.source.SourceResolver;
  -import org.tempuri.javac.JavaCompiler;
  -import org.tempuri.javac.JavaCompilerErrorHandler;
  -import org.tempuri.javac.JavaClassWriter;
  -import org.tempuri.javac.JavaClassWriterFactory;
   import org.tempuri.javac.JavaClassReader;
   import org.tempuri.javac.JavaClassReaderFactory;
  +import org.tempuri.javac.JavaClassWriter;
  +import org.tempuri.javac.JavaClassWriterFactory;
  +import org.tempuri.javac.JavaCompiler;
  +import org.tempuri.javac.JavaCompilerErrorHandler;
   import org.tempuri.javac.JavaSourceReader;
   import org.tempuri.javac.JavaSourceReaderFactory;
   import org.tempuri.javacImpl.eclipse.JavaCompilerImpl;
  
  
  
  1.16      +17 -7     
cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java
  
  Index: FOM_JavaScriptInterpreter.java
  ===================================================================
  RCS file: 
/home/cvs/cocoon-2.1/src/java/org/apache/cocoon/components/flow/javascript/fom/FOM_JavaScriptInterpreter.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- FOM_JavaScriptInterpreter.java    28 Dec 2003 07:19:23 -0000      1.15
  +++ FOM_JavaScriptInterpreter.java    29 Dec 2003 17:51:38 -0000      1.16
  @@ -56,12 +56,12 @@
   import java.io.OutputStream;
   import java.io.Reader;
   import java.util.ArrayList;
  -import java.util.LinkedList;
  -import java.util.Iterator;
  -import java.util.StringTokenizer;
   import java.util.HashMap;
  +import java.util.Iterator;
  +import java.util.LinkedList;
   import java.util.List;
   import java.util.Map;
  +import java.util.StringTokenizer;
   
   import org.apache.avalon.framework.CascadingRuntimeException;
   import org.apache.avalon.framework.activity.Initializable;
  @@ -86,12 +86,22 @@
   import org.apache.excalibur.source.Source;
   import org.apache.excalibur.source.SourceResolver;
   import org.apache.excalibur.source.SourceValidity;
  -import org.mozilla.javascript.*;
  -import org.mozilla.javascript.continuations.Continuation;
  +import org.mozilla.javascript.Context;
  +import org.mozilla.javascript.EcmaError;
  +import org.mozilla.javascript.EvaluatorException;
  +import org.mozilla.javascript.Function;
  +import org.mozilla.javascript.JavaScriptException;
  +import org.mozilla.javascript.NativeJavaClass;
   import org.mozilla.javascript.NativeJavaPackage;
  +import org.mozilla.javascript.PropertyException;
  +import org.mozilla.javascript.Script;
  +import org.mozilla.javascript.ScriptRuntime;
  +import org.mozilla.javascript.Scriptable;
  +import org.mozilla.javascript.ScriptableObject;
  +import org.mozilla.javascript.Wrapper;
  +import org.mozilla.javascript.continuations.Continuation;
   import org.mozilla.javascript.tools.ToolErrorReporter;
   import org.mozilla.javascript.tools.shell.Global;
  -import org.apache.excalibur.source.SourceResolver;
   
   /**
    * Interface with the JavaScript interpreter.