From 06e8f8e5be81a57c16cb9179ae96113b54e2951d Mon Sep 17 00:00:00 2001
From: Dmitry Jemerov <yole@jetbrains.com>
Date: Fri, 31 Mar 2017 18:48:44 +0200
Subject: [PATCH] Remove obsolete logic for updating source root URL

---
 .../KotlinJavaModuleConfigurator.kt           |  5 ---
 .../KotlinJsModuleConfigurator.java           | 10 ------
 .../KotlinWithLibraryConfigurator.kt          | 35 -------------------
 3 files changed, 50 deletions(-)

diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.kt
index 7ec072029e5..e63bf4411ac 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJavaModuleConfigurator.kt
@@ -71,11 +71,6 @@ open class KotlinJavaModuleConfigurator internal constructor() : KotlinWithLibra
                        LibraryJarDescriptor.RUNTIME_SRC_JAR,
                        LibraryJarDescriptor.TEST_JAR)
 
-    override fun getOldSourceRootUrl(library: Library): String? {
-        val runtimeJarPath = LibraryJarDescriptor.RUNTIME_JAR.findExistingJar(library)
-        return if (runtimeJarPath != null) runtimeJarPath.url + "src" else null
-    }
-
     override fun isKotlinLibrary(project: Project, library: Library): Boolean {
         if (super.isKotlinLibrary(project, library)) {
             return true
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java
index c2a9233a39b..e2838ab8af0 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinJsModuleConfigurator.java
@@ -17,10 +17,7 @@
 package org.jetbrains.kotlin.idea.configuration;
 
 import com.intellij.openapi.module.Module;
-import com.intellij.openapi.roots.libraries.Library;
-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.versions.LibraryJarDescriptor;
 import org.jetbrains.kotlin.js.JavaScript;
@@ -102,11 +99,4 @@ public class KotlinJsModuleConfigurator extends KotlinWithLibraryConfigurator {
 
     KotlinJsModuleConfigurator() {
     }
-
-    @Nullable
-    @Override
-    protected String getOldSourceRootUrl(@NotNull Library library) {
-        VirtualFile jsStdLibJar = LibraryJarDescriptor.JS_STDLIB_JAR.findExistingJar(library);
-        return jsStdLibJar != null ? jsStdLibJar.getUrl() : null;
-    }
 }
diff --git a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.kt b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.kt
index 9f5226ec157..794de13bc83 100644
--- a/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.kt
+++ b/idea/src/org/jetbrains/kotlin/idea/configuration/KotlinWithLibraryConfigurator.kt
@@ -50,8 +50,6 @@ abstract class KotlinWithLibraryConfigurator internal constructor() : KotlinProj
 
     abstract val existingJarFiles: RuntimeLibraryFiles
 
-    protected abstract fun getOldSourceRootUrl(library: Library): String?
-
     override fun getStatus(module: Module): ConfigureKotlinStatus {
         if (!isApplicable(module)) {
             return ConfigureKotlinStatus.NON_APPLICABLE
@@ -424,39 +422,6 @@ abstract class KotlinWithLibraryConfigurator internal constructor() : KotlinProj
         return file
     }
 
-    fun copySourcesToPathFromLibrary(library: Library, collector: NotificationMessageCollector) {
-        val dirToJarFromLibrary = getPathFromLibrary(library, OrderRootType.SOURCES) ?: error("Directory to file from library should be non null")
-
-        copyFileToDir(existingJarFiles.runtimeSourcesJar, dirToJarFromLibrary, collector)
-    }
-
-    fun changeOldSourcesPathIfNeeded(library: Library, collector: NotificationMessageCollector): Boolean {
-        if (!removeOldSourcesRootIfNeeded(library, collector)) {
-            return false
-        }
-
-        val parentDir = getPathFromLibrary(library, OrderRootType.CLASSES) ?: error("Parent dir for classes jar should exists for Kotlin library")
-
-        return addSourcesToLibraryIfNeeded(library, existingJarFiles.getRuntimeSourcesDestination(parentDir), collector)
-    }
-
-    protected fun removeOldSourcesRootIfNeeded(library: Library, collector: NotificationMessageCollector): Boolean {
-        val oldLibrarySourceRoot = getOldSourceRootUrl(library)
-
-        val librarySourceRoots = library.getUrls(OrderRootType.SOURCES)
-        for (sourceRoot in librarySourceRoots) {
-            if (sourceRoot == oldLibrarySourceRoot) {
-                val model = library.modifiableModel
-                model.removeRoot(oldLibrarySourceRoot!!, OrderRootType.SOURCES)
-                ApplicationManager.getApplication().runWriteAction { model.commit() }
-
-                collector.addMessage("Source root '" + oldLibrarySourceRoot + "' was removed for " + library.name + " library")
-                return true
-            }
-        }
-        return false
-    }
-
     abstract val libraryJarDescriptors: List<LibraryJarDescriptor>
 
     companion object {