From c7d5f79ec8801f66ade91add6f9fa18efa34e960 Mon Sep 17 00:00:00 2001
From: pTalanov <talanov.pavel@gmail.com>
Date: Wed, 2 May 2012 15:20:47 +0400
Subject: [PATCH] Finish merge.

---
 .../cli/jvm/compiler/JetCoreEnvironment.java  | 31 +++++++++++++------
 1 file changed, 22 insertions(+), 9 deletions(-)

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 76f2644fe5c..fafde19fca9 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
@@ -47,6 +47,16 @@ import java.util.List;
 public class JetCoreEnvironment extends JavaCoreEnvironment {
     private final List<JetFile> sourceFiles = new ArrayList<JetFile>();
 
+    @NotNull
+    public static JetCoreEnvironment getCoreEnvironmentForJS(Disposable disposable) {
+        return new JetCoreEnvironment(disposable, CompilerDependencies.compilerDependenciesForProduction(CompilerSpecialMode.JS));
+    }
+
+    @NotNull
+    public static JetCoreEnvironment getCoreEnvironmentForJVM(Disposable disposable, @NotNull CompilerDependencies dependencies) {
+        return new JetCoreEnvironment(disposable, dependencies);
+    }
+
     @NotNull
     private final CompilerDependencies compilerDependencies;
 
@@ -89,7 +99,7 @@ public class JetCoreEnvironment extends JavaCoreEnvironment {
     }
 
     private void addSources(File file) {
-        if(file.isDirectory()) {
+        if (file.isDirectory()) {
             File[] files = file.listFiles();
             if (files != null) {
                 for (File child : files) {
@@ -101,15 +111,15 @@ public class JetCoreEnvironment extends JavaCoreEnvironment {
             VirtualFile fileByPath = getLocalFileSystem().findFileByPath(file.getAbsolutePath());
             if (fileByPath != null) {
                 PsiFile psiFile = PsiManager.getInstance(getProject()).findFile(fileByPath);
-                if(psiFile instanceof JetFile) {
-                    sourceFiles.add((JetFile)psiFile);
+                if (psiFile instanceof JetFile) {
+                    sourceFiles.add((JetFile) psiFile);
                 }
             }
         }
     }
 
     public void addSources(VirtualFile vFile) {
-        if  (vFile.isDirectory())  {
+        if (vFile.isDirectory()) {
             for (VirtualFile virtualFile : vFile.getChildren()) {
                 addSources(virtualFile);
             }
@@ -118,15 +128,16 @@ public class JetCoreEnvironment extends JavaCoreEnvironment {
             if (vFile.getFileType() == JetFileType.INSTANCE) {
                 PsiFile psiFile = PsiManager.getInstance(getProject()).findFile(vFile);
                 if (psiFile instanceof JetFile) {
-                    sourceFiles.add((JetFile)psiFile);
+                    sourceFiles.add((JetFile) psiFile);
                 }
             }
         }
     }
 
     public void addSources(String path) {
-        if(path == null)
+        if (path == null) {
             return;
+        }
 
         VirtualFile vFile = getLocalFileSystem().findFileByPath(path);
         if (vFile == null) {
@@ -145,14 +156,16 @@ public class JetCoreEnvironment extends JavaCoreEnvironment {
 
     public void addToClasspathFromClassLoader(ClassLoader loader) {
         ClassLoader parent = loader.getParent();
-        if(parent != null)
+        if (parent != null) {
             addToClasspathFromClassLoader(parent);
+        }
 
-        if(loader instanceof URLClassLoader) {
+        if (loader instanceof URLClassLoader) {
             for (URL url : ((URLClassLoader) loader).getURLs()) {
                 File file = new File(url.getPath());
-                if(file.exists() && (!file.isFile() || file.getPath().endsWith(".jar")))
+                if (file.exists() && (!file.isFile() || file.getPath().endsWith(".jar"))) {
                     addToClasspath(file);
+                }
             }
         }
     }