From e73a7600fa5c2e58a87dbc73e6cd7eec4620c579 Mon Sep 17 00:00:00 2001 From: nik Date: Wed, 22 Oct 2014 12:41:09 +0400 Subject: [PATCH] external build: use UTF-8 as default encoding if nothing is specified in config files (IDEA-131602) --- .../serialization/JpsEncodingModelSerializerExtension.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsEncodingModelSerializerExtension.java b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsEncodingModelSerializerExtension.java index 191423c1b099..05d8752fe0d3 100644 --- a/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsEncodingModelSerializerExtension.java +++ b/jps/model-serialization/src/org/jetbrains/jps/model/serialization/JpsEncodingModelSerializerExtension.java @@ -17,6 +17,7 @@ package org.jetbrains.jps.model.serialization; import com.intellij.openapi.util.JDOMUtil; import com.intellij.openapi.util.text.StringUtil; +import com.intellij.openapi.vfs.CharsetToolkit; import org.jdom.Element; import org.jetbrains.annotations.NotNull; import org.jetbrains.jps.model.JpsEncodingConfigurationService; @@ -84,6 +85,11 @@ public class JpsEncodingModelSerializerExtension extends JpsModelSerializerExten JpsEncodingConfigurationService.getInstance().setGlobalEncoding(global, StringUtil.nullize(encoding)); } + @Override + public void loadExtensionWithDefaultSettings(@NotNull JpsGlobal global) { + JpsEncodingConfigurationService.getInstance().setGlobalEncoding(global, CharsetToolkit.UTF8); + } + @Override public void saveExtension(@NotNull JpsGlobal global, @NotNull Element componentTag) { componentTag.setAttribute(ENCODING_ATTRIBUTE, JpsEncodingConfigurationService.getInstance().getGlobalEncoding(global));