From 247185735aa16152ffd6023497e079dd1c736e31 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 1 Mar 2016 15:38:51 +0300 Subject: [PATCH] Refactoring: rename file --- .../idea/configuration/KotlinJavaModuleConfigurator.java | 4 ++-- .../idea/configuration/KotlinJsModuleConfigurator.java | 4 ++-- ...braryPresentationProviderUtil.kt => KotlinLibraryUtil.kt} | 5 ++--- 3 files changed, 6 insertions(+), 7 deletions(-) rename idea/src/org/jetbrains/kotlin/idea/framework/{LibraryPresentationProviderUtil.kt => KotlinLibraryUtil.kt} (97%) diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java index a1c247e2260..1c0f3abe235 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.java @@ -24,7 +24,7 @@ import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.framework.JavaRuntimeLibraryDescription; -import org.jetbrains.kotlin.idea.framework.LibraryPresentationProviderUtilKt; +import org.jetbrains.kotlin.idea.framework.KotlinLibraryUtilKt; import org.jetbrains.kotlin.idea.project.ProjectStructureUtil; import org.jetbrains.kotlin.idea.versions.KotlinRuntimeLibraryCoreUtil; import org.jetbrains.kotlin.resolve.TargetPlatform; @@ -96,7 +96,7 @@ public class KotlinJavaModuleConfigurator extends KotlinWithLibraryConfigurator @Nullable @Override protected String getOldSourceRootUrl(@NotNull Library library) { - VirtualFile runtimeJarPath = LibraryPresentationProviderUtilKt.getRuntimeJar(library); + VirtualFile runtimeJarPath = KotlinLibraryUtilKt.getRuntimeJar(library); return runtimeJarPath != null ? runtimeJarPath.getUrl() + "src" : null; } diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java index bb2fe95d029..7f79b3927e1 100644 --- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java +++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java @@ -22,7 +22,7 @@ import com.intellij.openapi.vfs.VirtualFile; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jetbrains.kotlin.idea.framework.JSLibraryStdDescription; -import org.jetbrains.kotlin.idea.framework.LibraryPresentationProviderUtilKt; +import org.jetbrains.kotlin.idea.framework.KotlinLibraryUtilKt; import org.jetbrains.kotlin.idea.project.ProjectStructureUtil; import org.jetbrains.kotlin.js.JavaScript; import org.jetbrains.kotlin.js.resolve.JsPlatform; @@ -97,7 +97,7 @@ public class KotlinJsModuleConfigurator extends KotlinWithLibraryConfigurator { @Nullable @Override protected String getOldSourceRootUrl(@NotNull Library library) { - VirtualFile jsStdLibJar = LibraryPresentationProviderUtilKt.getJsStdLibJar(library); + VirtualFile jsStdLibJar = KotlinLibraryUtilKt.getJsStdLibJar(library); return jsStdLibJar != null ? jsStdLibJar.getUrl() : null; } } diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/LibraryPresentationProviderUtil.kt b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinLibraryUtil.kt similarity index 97% rename from idea/src/org/jetbrains/kotlin/idea/framework/LibraryPresentationProviderUtil.kt rename to idea/src/org/jetbrains/kotlin/idea/framework/KotlinLibraryUtil.kt index 4609683b3da..9b6273803e8 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/LibraryPresentationProviderUtil.kt +++ b/idea/src/org/jetbrains/kotlin/idea/framework/KotlinLibraryUtil.kt @@ -38,8 +38,7 @@ fun > getLibraryProperties(provider: LibraryPres private val MAVEN_SYSTEM_ID = ProjectSystemId("MAVEN") private val GRADLE_SYSTEM_ID = ProjectSystemId("GRADLE") - -fun isExternalLibrary(library: Library): Boolean { +private fun isExternalLibrary(library: Library): Boolean { return ExternalSystemApiUtil.isExternalSystemLibrary(library, ProjectSystemId.IDE) || ExternalSystemApiUtil.isExternalSystemLibrary(library, GRADLE_SYSTEM_ID) || ExternalSystemApiUtil.isExternalSystemLibrary(library, MAVEN_SYSTEM_ID) @@ -76,5 +75,5 @@ fun getJsStdLibSrcJar(library: Library): VirtualFile? { } private fun getRuntimeSrcJar(classesRoots: List): VirtualFile? { - return LibraryUtils.getJarFile(classesRoots, PathUtil.KOTLIN_JAVA_RUNTIME_SRC_JAR); + return LibraryUtils.getJarFile(classesRoots, PathUtil.KOTLIN_JAVA_RUNTIME_SRC_JAR) }