cziegeler 2003/03/03 06:51:17
Modified: src/java/org/apache/cocoon/components/language/programming/java EclipseJavaCompiler.java src/java/org/apache/cocoon/components/flow/javascript JavaScriptInterpreter.java Log: Cleaning up imports Revision Changes Path 1.3 +13 -34 xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/java/EclipseJavaCompiler.java Index: EclipseJavaCompiler.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/language/programming/java/EclipseJavaCompiler.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- EclipseJavaCompiler.java 27 Feb 2003 22:00:43 -0000 1.2 +++ EclipseJavaCompiler.java 3 Mar 2003 14:51:17 -0000 1.3 @@ -49,48 +49,27 @@ */ package org.apache.cocoon.components.language.programming.java; -import org.apache.avalon.framework.logger.AbstractLogEnabled; +import java.io.*; +import java.util.HashMap; +import java.util.LinkedList; +import java.util.List; +import java.util.Locale; +import java.util.Map; +import java.util.StringTokenizer; + import org.apache.avalon.excalibur.pool.Recyclable; -import org.apache.cocoon.components.language.programming.LanguageCompiler; import org.apache.cocoon.components.language.programming.CompilerError; +import org.apache.cocoon.components.language.programming.LanguageCompiler; import org.apache.cocoon.util.ClassUtils; -import org.apache.avalon.framework.CascadingRuntimeException; import org.eclipse.jdt.core.compiler.IProblem; -import org.eclipse.jdt.internal.compiler.env.INameEnvironment; -import org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer; -import org.eclipse.jdt.internal.compiler.ClassFile; +import org.eclipse.jdt.internal.compiler.*; import org.eclipse.jdt.internal.compiler.Compiler; -import org.eclipse.jdt.internal.compiler.DefaultErrorHandlingPolicies; -import org.eclipse.jdt.internal.compiler.IErrorHandlingPolicy; -import org.eclipse.jdt.internal.compiler.IProblemFactory; import org.eclipse.jdt.internal.compiler.classfmt.ClassFileReader; import org.eclipse.jdt.internal.compiler.env.ICompilationUnit; -import org.eclipse.jdt.internal.compiler.ICompilerRequestor; -import org.eclipse.jdt.internal.compiler.CompilationResult; -import org.eclipse.jdt.internal.compiler.problem.DefaultProblem; -import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory; +import org.eclipse.jdt.internal.compiler.env.INameEnvironment; +import org.eclipse.jdt.internal.compiler.env.NameEnvironmentAnswer; import org.eclipse.jdt.internal.compiler.impl.CompilerOptions; - -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.HashMap; -import java.io.IOException; -import java.io.Reader; -import java.io.InputStream; -import java.io.FileOutputStream; -import java.io.ByteArrayInputStream; -import java.io.OutputStream; -import java.io.ByteArrayOutputStream; -import java.io.BufferedOutputStream; -import java.io.Reader; -import java.io.FileReader; -import java.io.BufferedReader; -import java.io.File; -import java.io.IOException; -import java.util.Locale; -import java.util.Iterator; -import java.util.StringTokenizer; +import org.eclipse.jdt.internal.compiler.problem.DefaultProblemFactory; public class EclipseJavaCompiler implements LanguageCompiler, Recyclable { 1.22 +5 -14 xml-cocoon2/src/java/org/apache/cocoon/components/flow/javascript/JavaScriptInterpreter.java Index: JavaScriptInterpreter.java =================================================================== RCS file: /home/cvs/xml-cocoon2/src/java/org/apache/cocoon/components/flow/javascript/JavaScriptInterpreter.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -r1.21 -r1.22 --- JavaScriptInterpreter.java 2 Mar 2003 23:38:35 -0000 1.21 +++ JavaScriptInterpreter.java 3 Mar 2003 14:51:17 -0000 1.22 @@ -46,14 +46,15 @@ package org.apache.cocoon.components.flow.javascript; import java.io.BufferedReader; -import java.io.InputStreamReader; import java.io.InputStream; +import java.io.InputStreamReader; import java.io.Reader; import java.util.ArrayList; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; + import org.apache.avalon.framework.activity.Initializable; import org.apache.avalon.framework.configuration.Configurable; import org.apache.avalon.framework.configuration.Configuration; @@ -65,21 +66,11 @@ import org.apache.cocoon.environment.ObjectModelHelper; import org.apache.cocoon.environment.Request; import org.apache.cocoon.environment.Session; -import org.mozilla.javascript.Context; -import org.mozilla.javascript.Function; -import org.mozilla.javascript.NativeArray; -import org.mozilla.javascript.Wrapper; -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.JavaScriptException; -import org.mozilla.javascript.tools.debugger.ScopeProvider; -import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl; import org.apache.commons.jxpath.JXPathIntrospector; - +import org.apache.commons.jxpath.ri.JXPathContextReferenceImpl; import org.apache.excalibur.source.Source; +import org.mozilla.javascript.*; +import org.mozilla.javascript.tools.debugger.ScopeProvider; /** * Interface with the JavaScript interpreter.