Finish merge.

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;
 
@@ -125,8 +135,9 @@ public class JetCoreEnvironment extends JavaCoreEnvironment {
     }
 
     public void addSources(String path) {
-        if(path == null)
+        if (path == null) {
             return;
+        }
 
         VirtualFile vFile = getLocalFileSystem().findFileByPath(path);
         if (vFile == null) {
@@ -145,17 +156,19 @@ 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) {
             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);
                 }
             }
         }
+    }
 
     @NotNull
     public CompilerDependencies getCompilerDependencies() {