From 83ec20508af556c3bcaa5a81f05b2a36aefc78b9 Mon Sep 17 00:00:00 2001
From: Michael Nedzelsky <Michael.Nedzelsky@jetbrains.com>
Date: Fri, 24 Oct 2014 12:52:27 +0400
Subject: [PATCH] JS backend: isJsRuntimeLibrary ->
 isKotlinJavascriptStdLibrary

---
 compiler/util/src/org/jetbrains/jet/utils/LibraryUtils.java   | 2 +-
 .../jet/plugin/framework/JsLibraryStdDetectionUtil.java       | 3 +--
 jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtils.java      | 2 +-
 .../src/org/jetbrains/k2js/config/LibrarySourcesConfig.java   | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/compiler/util/src/org/jetbrains/jet/utils/LibraryUtils.java b/compiler/util/src/org/jetbrains/jet/utils/LibraryUtils.java
index 1dea1c232df..2a9f1a37b88 100644
--- a/compiler/util/src/org/jetbrains/jet/utils/LibraryUtils.java
+++ b/compiler/util/src/org/jetbrains/jet/utils/LibraryUtils.java
@@ -108,7 +108,7 @@ public class LibraryUtils {
         return checkSpecTitle(library, TITLE_KOTLIN_JAVASCRIPT_LIB);
     }
 
-    public static boolean isJsRuntimeLibrary(@NotNull File library) {
+    public static boolean isKotlinJavascriptStdLibrary(@NotNull File library) {
         return checkImplTitle(library, TITLE_KOTLIN_JAVASCRIPT_STDLIB);
     }
 
diff --git a/idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JsLibraryStdDetectionUtil.java b/idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JsLibraryStdDetectionUtil.java
index 702f1720b1c..954e38b5e9c 100644
--- a/idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JsLibraryStdDetectionUtil.java
+++ b/idea/idea-analysis/src/org/jetbrains/jet/plugin/framework/JsLibraryStdDetectionUtil.java
@@ -22,7 +22,6 @@ import com.intellij.openapi.vfs.VfsUtilCore;
 import com.intellij.openapi.vfs.VirtualFile;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.utils.LibraryUtils;
-import org.jetbrains.jet.utils.PathUtil;
 
 import java.io.File;
 import java.util.List;
@@ -41,7 +40,7 @@ public class JsLibraryStdDetectionUtil {
             VirtualFile jar = VfsUtilCore.getVirtualFileForJar(root);
             assert jar != null;
 
-            if (LibraryUtils.isJsRuntimeLibrary(new File(jar.getPath()))) {
+            if (LibraryUtils.isKotlinJavascriptStdLibrary(new File(jar.getPath()))) {
                 assert JsHeaderLibraryDetectionUtil.isJsHeaderLibraryDetected(classesRoots) : "StdLib should also be detected as headers library";
 
                 return JarUtil.getJarAttribute(VfsUtilCore.virtualToIoFile(root), Attributes.Name.IMPLEMENTATION_VERSION);
diff --git a/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtils.java b/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtils.java
index 81b980b07df..6b46cf685c9 100644
--- a/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtils.java
+++ b/jps-plugin/src/org/jetbrains/jet/jps/build/JpsUtils.java
@@ -42,7 +42,7 @@ class JpsUtils {
         Set<JpsLibrary> libraries = getAllDependencies(target).getLibraries();
         for (JpsLibrary library : libraries) {
             for (JpsLibraryRoot root : library.getRoots(JpsOrderRootType.COMPILED)) {
-                if (LibraryUtils.isJsRuntimeLibrary(JpsPathUtil.urlToFile(root.getUrl())))
+                if (LibraryUtils.isKotlinJavascriptStdLibrary(JpsPathUtil.urlToFile(root.getUrl())))
                     return true;
             }
         }
diff --git a/js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfig.java b/js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfig.java
index fcda5a14345..9e41dba0ba5 100644
--- a/js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfig.java
+++ b/js/js.frontend/src/org/jetbrains/k2js/config/LibrarySourcesConfig.java
@@ -34,7 +34,7 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-import static org.jetbrains.jet.utils.LibraryUtils.isJsRuntimeLibrary;
+import static org.jetbrains.jet.utils.LibraryUtils.isKotlinJavascriptStdLibrary;
 
 public class LibrarySourcesConfig extends Config {
     @NotNull
@@ -90,7 +90,7 @@ public class LibrarySourcesConfig extends Config {
             if (path.endsWith(".jar") || path.endsWith(".zip")) {
                 file = jarFileSystem.findFileByPath(path + URLUtil.JAR_SEPARATOR);
 
-                if (isJsRuntimeLibrary(new File(path))) {
+                if (isKotlinJavascriptStdLibrary(new File(path))) {
                     actualModuleName = STDLIB_JS_MODULE_NAME;
                 }
             }