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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Dmitry Trofimov
2013-08-05 16:39:46 +02:00
parent 1acdfa8ee3 611502e95c
commit 234e2ee8c6
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/gradle/src/org/jetbrains/plugins/gradle/service/settings/GradleSystemSettingsControl.java
+6 -2
View File
@@ -136,12 +136,16 @@ public class GradleSystemSettingsControl implements ExternalSystemSettingsContro
return (myServiceDirectoryPathModifiedByUser
&& !Comparing.equal(ExternalSystemApiUtil.normalizePath(myServiceDirectoryPathField.getText()),
ExternalSystemApiUtil.normalizePath(myInitialSettings.getServiceDirectoryPath())))
|| myInitialSettings.getGradleVmOptions() != null && !Comparing.equal(trimIfPossible(myGradleVmOptionsField.getText()), trimIfPossible(myInitialSettings.getGradleVmOptions()));
|| !Comparing.equal(trimIfPossible(myGradleVmOptionsField.getText()), trimIfPossible(myInitialSettings.getGradleVmOptions()));
}
@Nullable
private static String trimIfPossible(@Nullable String s) {
return s == null ? null : s.trim();
if (s == null) {
return null;
}
String result = s.trim();
return result.isEmpty() ? null : result;
}
@Override