Compiler plugins moved to CompilerEnvironmentConfiguration

compiler/cli/src/org/jetbrains/jet/cli/KotlinCompiler.java

@@ -239,7 +239,7 @@ public class KotlinCompiler {
         // install any compiler plugins
         List<CompilerPlugin> plugins = arguments.getCompilerPlugins();
         if (plugins != null) {
-            configuration.getEnvironment().getCompilerPlugins().addAll(plugins);
+            configuration.getCompilerPlugins().addAll(plugins);
         }
 
         if (configuration.getCompilerDependencies().getRuntimeJar() != null) {

compiler/cli/src/org/jetbrains/jet/compiler/CompileEnvironmentConfiguration.java

@@ -16,11 +16,14 @@
 
 package org.jetbrains.jet.compiler;
 
+import com.google.common.collect.Lists;
 import com.intellij.openapi.util.Disposer;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.compiler.messages.MessageCollector;
 import org.jetbrains.jet.lang.resolve.java.CompilerDependencies;
 
+import java.util.List;
+
 /**
  * @author abreslav
  */
@@ -29,6 +32,8 @@ public class CompileEnvironmentConfiguration {
     private final CompilerDependencies compilerDependencies;
     private final MessageCollector messageCollector;
 
+    private List<CompilerPlugin> compilerPlugins = Lists.newArrayList();
+
     /**
      * NOTE: It's very important to call dispose for every object of this class or there will be memory leaks.
      * @see Disposer
@@ -53,4 +58,8 @@ public class CompileEnvironmentConfiguration {
     public MessageCollector getMessageCollector() {
         return messageCollector;
     }
+
+    public List<CompilerPlugin> getCompilerPlugins() {
+        return compilerPlugins;
+    }
 }

compiler/cli/src/org/jetbrains/jet/compiler/JetCoreEnvironment.java

@@ -46,7 +46,6 @@ import java.util.List;
  */
 public class JetCoreEnvironment extends JavaCoreEnvironment {
     private final List<JetFile> sourceFiles = new ArrayList<JetFile>();
-    private List<CompilerPlugin> compilerPlugins = new ArrayList<CompilerPlugin>();
 
     public JetCoreEnvironment(Disposable parentDisposable, @NotNull CompilerDependencies compilerDependencies) {
         super(parentDisposable);
@@ -138,14 +137,6 @@ public class JetCoreEnvironment extends JavaCoreEnvironment {
         return sourceFiles;
     }
 
-    public List<CompilerPlugin> getCompilerPlugins() {
-        return compilerPlugins;
-    }
-
-    public void setCompilerPlugins(List<CompilerPlugin> compilerPlugins) {
-        this.compilerPlugins = compilerPlugins;
-    }
-
     public void addToClasspathFromClassLoader(ClassLoader loader) {
         ClassLoader parent = loader.getParent();
         if(parent != null)