Don't search in random directories for existent libraries

#KT-4644 In Progress
goodwinnk · Mar 18, 2014 · 5362b81 · 5362b81
1 parent 3911a6f
commit 5362b81
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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 NewLibraryConfiguration createNewLibrary(@NotNull JComponent parentCompon
         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
@@ -95,7 +95,7 @@ public NewLibraryConfiguration createNewLibrary(@NotNull JComponent parentCompon
         File librarySrcFile;
 
         File stdJarInDefaultPath = getFileInDir(jvmConfigurator.getJarName(), defaultPathToJarFile);
-        if (stdJarInDefaultPath.exists()) {
+        if (!useRelativePaths && stdJarInDefaultPath.exists()) {
             libraryFile = stdJarInDefaultPath;
 
             File sourcesJar = getFileInDir(jvmConfigurator.getSourcesJarName(), defaultPathToJarFile);