From d937f385cdc8326a4d89e5fd3c6777e0f9f437d1 Mon Sep 17 00:00:00 2001 From: Nikolay Krasko Date: Wed, 24 Jun 2015 21:26:09 +0300 Subject: [PATCH] Copy libraries to {project.dir}/lib folder by default (KT-8231) #KT-8231 Fixed --- .../CustomLibraryDescriptorWithDeferredConfig.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/idea/src/org/jetbrains/kotlin/idea/framework/CustomLibraryDescriptorWithDeferredConfig.java b/idea/src/org/jetbrains/kotlin/idea/framework/CustomLibraryDescriptorWithDeferredConfig.java index 70ad3dd90a5..c227c0bf33f 100644 --- a/idea/src/org/jetbrains/kotlin/idea/framework/CustomLibraryDescriptorWithDeferredConfig.java +++ b/idea/src/org/jetbrains/kotlin/idea/framework/CustomLibraryDescriptorWithDeferredConfig.java @@ -57,7 +57,7 @@ public abstract class CustomLibraryDescriptorWithDeferredConfig extends CustomLi private final String modulesSeparatorCaption; private final LibraryKind libraryKind; private final Set suitableLibraryKinds; - private final boolean useRelativePaths; + private final VirtualFile projectBaseDir; private DeferredCopyFileRequests deferredCopyFileRequests; @@ -73,7 +73,7 @@ public abstract class CustomLibraryDescriptorWithDeferredConfig extends CustomLi @NotNull LibraryKind libraryKind, @NotNull Set suitableLibraryKinds ) { - useRelativePaths = project == null; + this.projectBaseDir = project != null ? project.getBaseDir() : null; this.configuratorName = configuratorName; this.libraryName = libraryName; this.dialogTitle = dialogTitle; @@ -168,8 +168,8 @@ public abstract class CustomLibraryDescriptorWithDeferredConfig extends CustomLi deferredCopyFileRequests = new DeferredCopyFileRequests(configurator); - String defaultPathToJarFile = useRelativePaths ? DEFAULT_LIB_DIR_NAME - : FileUIUtils.createRelativePath(null, contextDirectory, DEFAULT_LIB_DIR_NAME); + String defaultPathToJarFile = projectBaseDir == null ? DEFAULT_LIB_DIR_NAME + : FileUIUtils.createRelativePath(null, projectBaseDir, DEFAULT_LIB_DIR_NAME); RuntimeLibraryFiles files = configurator.getExistingJarFiles(); @@ -178,7 +178,7 @@ public abstract class CustomLibraryDescriptorWithDeferredConfig extends CustomLi File runtimeSrcJar; File stdJarInDefaultPath = files.getRuntimeDestination(defaultPathToJarFile); - if (!useRelativePaths && stdJarInDefaultPath.exists()) { + if (projectBaseDir != null && stdJarInDefaultPath.exists()) { runtimeJar = stdJarInDefaultPath; reflectJar = files.getReflectDestination(defaultPathToJarFile);