From b2e343774d913c1ab88c4733c88b1dd2e2ea83d4 Mon Sep 17 00:00:00 2001
From: Evgeny Gerashchenko <Evgeny.Gerashchenko@jetbrains.com>
Date: Tue, 12 Aug 2014 21:24:34 +0400
Subject: [PATCH] Passing class loader instead of factory to compiler.

Original commit: 3233317316cb66a306044c59202ffb88c2af02b3
---
 .../jet/jps/build/KotlinBuilder.java          | 33 +------------------
 1 file changed, 1 insertion(+), 32 deletions(-)

diff --git a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
index 91a4814c41e..5f6013bd792 100644
--- a/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
+++ b/jps/jps-plugin/src/org/jetbrains/jet/jps/build/KotlinBuilder.java
@@ -19,7 +19,6 @@ package org.jetbrains.jet.jps.build;
 import com.google.common.collect.Maps;
 import com.intellij.openapi.util.Key;
 import com.intellij.openapi.util.io.FileUtil;
-import com.intellij.openapi.util.io.StreamUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.util.Function;
 import com.intellij.util.containers.ContainerUtil;
@@ -41,7 +40,6 @@ import org.jetbrains.jet.compiler.runner.SimpleOutputItem;
 import org.jetbrains.jet.config.IncrementalCompilation;
 import org.jetbrains.jet.jps.JpsKotlinCompilerSettings;
 import org.jetbrains.jet.jps.incremental.*;
-import org.jetbrains.jet.preloading.ClassLoaderFactory;
 import org.jetbrains.jet.utils.PathUtil;
 import org.jetbrains.jps.ModuleChunk;
 import org.jetbrains.jps.builders.DirtyFilesHolder;
@@ -57,10 +55,8 @@ import org.jetbrains.jps.model.module.JpsModule;
 import java.io.File;
 import java.io.FileFilter;
 import java.io.IOException;
-import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
-import java.net.URL;
 import java.util.*;
 
 import static org.jetbrains.jet.cli.common.messages.CompilerMessageLocation.NO_LOCATION;
@@ -132,14 +128,7 @@ public class KotlinBuilder extends ModuleLevelBuilder {
         IncrementalCacheProviderImpl cacheProvider = new IncrementalCacheProviderImpl(incrementalCaches);
 
         CompilerEnvironment environment = CompilerEnvironment.getEnvironmentFor(
-                PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), outputDir, new ClassLoaderFactory() {
-                    @Override
-                    public ClassLoader create(ClassLoader compilerClassLoader) {
-                        return new MyClassLoader(compilerClassLoader);
-                    }
-                },
-                cacheProvider
-        );
+                PathUtil.getKotlinPathsForJpsPluginOrJpsTests(), outputDir, getClass().getClassLoader(), cacheProvider);
         if (!environment.success()) {
             environment.reportErrorsTo(messageCollector);
             return ExitCode.ABORT;
@@ -407,24 +396,4 @@ public class KotlinBuilder extends ModuleLevelBuilder {
     public List<String> getCompilableFileExtensions() {
         return COMPILABLE_FILE_EXTENSIONS;
     }
-
-    private class MyClassLoader extends ClassLoader {
-        private final ClassLoader compilerClassLoader;
-        private final ClassLoader jpsPluginClassLoader = KotlinBuilder.this.getClass().getClassLoader();
-
-        private MyClassLoader(ClassLoader compilerClassLoader) {
-            this.compilerClassLoader = compilerClassLoader;
-        }
-
-        @NotNull
-        @Override
-        public Enumeration<URL> getResources(String name) throws IOException {
-            return jpsPluginClassLoader.getResources(name);
-        }
-
-        @Override
-        public Class<?> loadClass(@NotNull String name) throws ClassNotFoundException {
-            return jpsPluginClassLoader.loadClass(name);
-        }
-    }
 }