From 5362b81ea522075d04268a9f3def75ff5ce0011b Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Tue, 18 Mar 2014 14:43:29 +0400 Subject: [PATCH] Don't search in random directories for existent libraries #KT-4644 In Progress --- .../jet/plugin/framework/JSLibraryStdDescription.java | 4 ++-- .../jet/plugin/framework/JavaRuntimeLibraryDescription.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/idea/src/org/jetbrains/jet/plugin/framework/JSLibraryStdDescription.java b/idea/src/org/jetbrains/jet/plugin/framework/JSLibraryStdDescription.java index 6d6a5d05e0b..3cdf4b80bfc 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/JSLibraryStdDescription.java +++ b/idea/src/org/jetbrains/jet/plugin/framework/JSLibraryStdDescription.java @@ -89,8 +89,8 @@ public class JSLibraryStdDescription extends CustomLibraryDescriptorWithDefferCo String defaultPathToJarFileDir = useRelativePaths ? DEFAULT_LIB_DIR_NAME : createRelativePath(null, contextDirectory, DEFAULT_LIB_DIR_NAME); - boolean jsFilePresent = isJsFilePresent(defaultPathToJsFileDir); - boolean jarFilePresent = getFileInDir(jsConfigurator.getJarName(), defaultPathToJarFileDir).exists(); + boolean jsFilePresent = !useRelativePaths && isJsFilePresent(defaultPathToJsFileDir); + boolean jarFilePresent = !useRelativePaths && getFileInDir(jsConfigurator.getJarName(), defaultPathToJarFileDir).exists(); if (jarFilePresent && jsFilePresent) { return createConfiguration(getFileInDir(jsConfigurator.getJarName(), defaultPathToJarFileDir)); diff --git a/idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java b/idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java index 9e5f53a7070..1a9193c8376 100644 --- a/idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java +++ b/idea/src/org/jetbrains/jet/plugin/framework/JavaRuntimeLibraryDescription.java @@ -95,7 +95,7 @@ public class JavaRuntimeLibraryDescription extends CustomLibraryDescriptorWithDe File librarySrcFile; File stdJarInDefaultPath = getFileInDir(jvmConfigurator.getJarName(), defaultPathToJarFile); - if (stdJarInDefaultPath.exists()) { + if (!useRelativePaths && stdJarInDefaultPath.exists()) { libraryFile = stdJarInDefaultPath; File sourcesJar = getFileInDir(jvmConfigurator.getSourcesJarName(), defaultPathToJarFile);