MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-89443 Gradle: Don't store autodetected gradle path at the settings

Browse Source
This commit is contained in:
Denis.Zhdanov
2012-07-30 16:18:39 +04:00
parent 2e27b2c76b
commit aa63ae712c
2 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/config/GradlePatcher.java
+16 -6
View File
@@ -1,9 +1,15 @@
package org.jetbrains.plugins.gradle.config;
import com.intellij.openapi.components.ServiceManager;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.project.ProjectManager;
import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.jetbrains.plugins.gradle.util.GradleLibraryManager;
import java.io.File;
/**
* Encapsulates functionality of patching problems from the previous gradle integration releases.
@@ -28,15 +34,19 @@ public class GradlePatcher {
return;
}
// Propagate gradle settings from the current project to the default project if necessary.
final GradleSettings defaultProjectSettings = GradleSettings.getInstance(defaultProject);
final GradleSettings currentProjectSettings = GradleSettings.getInstance(project);
if (!StringUtil.isEmpty(currentProjectSettings.getGradleHome()) && StringUtil.isEmpty(defaultProjectSettings.getGradleHome())) {
GradleSettings.applyGradleHome(currentProjectSettings.getGradleHome(), defaultProject);
String projectGradleHome = currentProjectSettings.getGradleHome();
String defaultGradleHome = defaultProjectSettings.getGradleHome();
if (StringUtil.isEmpty(projectGradleHome) || !StringUtil.isEmpty(defaultGradleHome)) {
return;
}
else if (!StringUtil.isEmpty(defaultProjectSettings.getGradleHome())
&& StringUtil.isEmpty(currentProjectSettings.getGradleHome()))
{
GradleSettings.applyGradleHome(defaultProjectSettings.getGradleHome(), project);
GradleLibraryManager libraryManager = ServiceManager.getService(GradleLibraryManager.class);
File autodetectedGradleHome = libraryManager.getAutodetectedGradleHome();
// We don't want to store auto-detected value at the settings.
if (autodetectedGradleHome == null || !FileUtil.filesEqual(autodetectedGradleHome, new File(projectGradleHome))) {
GradleSettings.applyGradleHome(projectGradleHome, defaultProject);
}
}
}
plugins/gradle/src/org/jetbrains/plugins/gradle/util/GradleLibraryManager.java
+11 -1
View File
@@ -104,7 +104,17 @@ public class GradleLibraryManager {
if (result != null) {
return result;
}
result = getGradleHomeFromPath();
return getAutodetectedGradleHome();
}
/**
* Tries to deduce gradle location from current environment.
*
* @return gradle home deduced from the current environment (if any); <code>null</code> otherwise
*/
@Nullable
public File getAutodetectedGradleHome() {
File result = getGradleHomeFromPath();
return result == null ? getGradleHomeFromEnvProperty() : result;
}