From 58ff66b46ccb77ca2ff5778ee60558502d409e8d Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Mon, 9 Jul 2012 16:01:36 +0400
Subject: [PATCH] Eliminated JetCoreEnvironment.configure() method. Actual
 setting classpath/annotations path is performed in constructor instead.

---
 .../jetbrains/jet/cli/jvm/K2JVMCompiler.java  |  8 -------
 .../cli/jvm/compiler/JetCoreEnvironment.java  | 22 +++++--------------
 .../jet/cli/jvm/repl/ReplInterpreter.java     |  1 -
 3 files changed, 6 insertions(+), 25 deletions(-)

diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java
index 4aa2b23dd55..8caa8d22883 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/K2JVMCompiler.java
@@ -152,14 +152,6 @@ public class K2JVMCompiler extends CLICompiler<K2JVMCompilerArguments, K2JVMComp
         return super.exec(errStream, arguments);
     }
 
-
-    @Override
-    protected void configureEnvironment(@NotNull K2JVMCompileEnvironmentConfiguration configuration, @NotNull K2JVMCompilerArguments arguments) {
-        super.configureEnvironment(configuration, arguments);
-
-        configuration.getEnvironment().configure(createCompilerConfiguration(arguments));
-    }
-
     @NotNull
     private static CompilerConfiguration createCompilerConfiguration(@NotNull K2JVMCompilerArguments arguments) {
         CompilerConfiguration configuration = new CompilerConfiguration();
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
index 11b478f915c..1b38288ec79 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/compiler/JetCoreEnvironment.java
@@ -82,7 +82,12 @@ public class JetCoreEnvironment extends JavaCoreEnvironment {
         annotationsProvider = new CoreAnnotationsProvider();
         myProject.registerService(ExternalAnnotationsProvider.class, annotationsProvider);
 
-        configure(configuration);
+        for (File path : configuration.getList(JVMConfigurationKeys.CLASSPATH_KEY)) {
+            addToClasspath(path);
+        }
+        for (File path : configuration.getList(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY)) {
+            addExternalAnnotationsRoot(PathUtil.jarFileOrDirectoryToVirtualFile(path));
+        }
 
         JetStandardLibrary.initialize(getProject());
     }
@@ -166,19 +171,4 @@ public class JetCoreEnvironment extends JavaCoreEnvironment {
             }
         }
     }
-
-    public void configure(@NotNull CompilerConfiguration compilerConfiguration) {
-        List<File> classpath = compilerConfiguration.get(JVMConfigurationKeys.CLASSPATH_KEY);
-        List<File> annotationsPath = compilerConfiguration.get(JVMConfigurationKeys.ANNOTATIONS_PATH_KEY);
-        if (classpath != null) {
-            for (File path : classpath) {
-                addToClasspath(path);
-            }
-        }
-        if (annotationsPath != null) {
-            for (File path : annotationsPath) {
-                addExternalAnnotationsRoot(PathUtil.jarFileOrDirectoryToVirtualFile(path));
-            }
-        }
-    }
 }
diff --git a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java
index 0d4fbf9d68e..8c2da3446e4 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/jvm/repl/ReplInterpreter.java
@@ -92,7 +92,6 @@ public class ReplInterpreter {
 
     public ReplInterpreter(@NotNull Disposable disposable, @NotNull CompilerConfiguration configuration) {
         jetCoreEnvironment = new JetCoreEnvironment(disposable, configuration);
-        jetCoreEnvironment.configure(configuration);
         Project project = jetCoreEnvironment.getProject();
         trace = new BindingTraceContext();
         module = new ModuleDescriptor(Name.special("<repl>"));