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

set explicit locale environment: GeneralCommandLine.getCharset() and LC_CTYPE should be the same, remove dependency on project and application default encodings

Browse Source
This commit is contained in:
Sergey Simonchik
2014-05-13 14:41:40 +04:00
parent 440a2e5842
commit 095153a7f9
1 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-api/src/com/intellij/execution/configurations/EncodingEnvironmentUtil.java
+29 -7
View File
@@ -52,32 +52,54 @@ public class EncodingEnvironmentUtil {
* LC_CTYPE value is taken from "Settings | File Encodings".
*
* @param commandLine GeneralCommandLine instance
* @param project Project instance if any
*/
public static void fixDefaultEncodingIfMac(@NotNull GeneralCommandLine commandLine, @Nullable Project project) {
public static void setLocaleEnvironmentIfMac(@NotNull GeneralCommandLine commandLine) {
if (SystemInfo.isMac) {
if (!isLocaleDefined(commandLine)) {
fixLocale(commandLine.getEnvironment(), project);
setLocaleEnvironment(commandLine.getEnvironment(), commandLine.getCharset());
}
}
}
private static void fixLocale(@NotNull Map<String, String> env, @Nullable Project project) {
Charset charset = getCharset(project);
/**
* @deprecated Use {@link #setLocaleEnvironmentIfMac(GeneralCommandLine)} instead. To be removed in IDEA 15.
*/
@Deprecated
public static void fixDefaultEncodingIfMac(@NotNull GeneralCommandLine commandLine, @Nullable Project project) {
if (SystemInfo.isMac) {
if (!isLocaleDefined(commandLine)) {
setLocaleEnvironment(commandLine.getEnvironment(), getCharset(project));
}
}
}
private static void setLocaleEnvironment(@NotNull Map<String, String> env, @NotNull Charset charset) {
env.put(LC_CTYPE, charset.name());
if (LOG.isDebugEnabled()) {
LOG.debug("Fixed mac locale: " + charset.name());
}
}
/**
* Sets default encoding on Mac if it's undefined. <br/>
* @deprecated Use {@link #setLocalEnvironmentIfMac(java.util.Map, java.nio.charset.Charset)} instead. To be removed in IDEA 15.
*/
@Deprecated
public static void fixDefaultEncodingIfMac(@NotNull Map<String, String> env, @Nullable Project project) {
if (SystemInfo.isMac) {
if (!isLocaleDefined(env)) {
setLocaleEnvironment(env, getCharset(project));
}
}
}
/**
* Sets default encoding on Mac if it's undefined. <br/>
*/
public static void fixDefaultEncodingIfMac(@NotNull Map<String, String> env, @Nullable Project project) {
public static void setLocalEnvironmentIfMac(@NotNull Map<String, String> env, @NotNull Charset charset) {
if (SystemInfo.isMac) {
if (!isLocaleDefined(env)) {
fixLocale(env, project);
setLocaleEnvironment(env, charset);
}
}
}