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

Use proper gradle home, when it is correct and replace path in field: IDEA-224160

Browse Source 
GitOrigin-RevId: 718c3ebb470bd454822000bf5155a83f4e92e7da
This commit is contained in:
Roman.Ivanov
2019-10-11 09:06:02 +00:00
committed by intellij-monorepo-bot
parent 587360f000
commit 34a4e401a6
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/IdeaGradleProjectSettingsControlBuilder.java
+13 -3
View File
@@ -538,9 +538,19 @@ public class IdeaGradleProjectSettingsControlBuilder implements GradleProjectSet
if (myGradleHomePathField != null) {
String gradleHomePath = FileUtil.toCanonicalPath(myGradleHomePathField.getText());
File gradleHomeFile = new File(gradleHomePath);
String finalGradleHomePath = myInstallationManager.isGradleSdkHome(gradleHomeFile)
? myInstallationManager.suggestBetterGradleHomePath(gradleHomePath)
: gradleHomePath;
String finalGradleHomePath;
if (myInstallationManager.isGradleSdkHome(gradleHomeFile)) {
finalGradleHomePath = gradleHomePath;
}
else {
finalGradleHomePath = myInstallationManager.suggestBetterGradleHomePath(gradleHomePath);
if (finalGradleHomePath != null) {
//noinspection SSBasedInspection
SwingUtilities.invokeLater(() -> {
myGradleHomePathField.setText(finalGradleHomePath);
});
}
}
if (StringUtil.isEmpty(finalGradleHomePath)) {
settings.setGradleHome(null);
}