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

Cleanup (javadoc corrected; condition optimized)

Browse Source
This commit is contained in:
Roman Shevchenko
2015-09-17 12:26:01 +03:00
parent 21b6d35e83
commit fb925fba8b
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/execution/configurations/EncodingEnvironmentUtil.java
+3 -4
View File
@@ -83,12 +83,11 @@ public class EncodingEnvironmentUtil {
}
private static boolean isLocaleDefined(@NotNull GeneralCommandLine commandLine) {
return isLocaleDefined(commandLine.getEnvironment()) ||
commandLine.isPassParentEnvironment() && isLocaleDefined(commandLine.getParentEnvironment());
return isLocaleDefined(commandLine.getEnvironment()) || isLocaleDefined(commandLine.getParentEnvironment());
}
private static boolean isLocaleDefined(@NotNull Map<String, String> env) {
return env.containsKey(LC_ALL) || env.containsKey(LC_CTYPE) || env.containsKey(LANG);
return !env.isEmpty() && (env.containsKey(LC_CTYPE) || env.containsKey(LC_ALL) || env.containsKey(LANG));
}
/** @deprecated use {@link #setLocaleEnvironmentIfMac(GeneralCommandLine)} instead (to be removed in IDEA 16) */
@@ -99,7 +98,7 @@ public class EncodingEnvironmentUtil {
}
}
/** @deprecated use {@link #setLocaleEnvironmentIfMac(Map, Charset)} instead (to be removed in IDEA 15) */
/** @deprecated use {@link #setLocaleEnvironmentIfMac(Map, Charset)} instead (to be removed in IDEA 16) */
@SuppressWarnings("unused")
public static void fixDefaultEncodingIfMac(@NotNull Map<String, String> env, @Nullable Project project) {
if (SystemInfo.isMac && !isLocaleDefined(env)) {