From aea0b0e9df07423ae52dbed9ecc9fbe036c87cc8 Mon Sep 17 00:00:00 2001 From: Dmitry Avdeev Date: Thu, 31 Jan 2013 13:48:32 +0400 Subject: [PATCH] =?UTF-8?q?=D0=B2=D0=B0=D1=81=D1=8F=20=D0=BF=D1=83=D0=BF?= =?UTF-8?q?=D0=BA=D0=B8=D0=BD=20is=20back?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform/templates/SaveProjectAsTemplateAction.java | 2 +- .../com/intellij/platform/templates/TemplateModuleBuilder.java | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/java/idea-ui/src/com/intellij/platform/templates/SaveProjectAsTemplateAction.java b/java/idea-ui/src/com/intellij/platform/templates/SaveProjectAsTemplateAction.java index 1b4bbd21eee0..cc27cd2d46a0 100644 --- a/java/idea-ui/src/com/intellij/platform/templates/SaveProjectAsTemplateAction.java +++ b/java/idea-ui/src/com/intellij/platform/templates/SaveProjectAsTemplateAction.java @@ -175,7 +175,7 @@ public class SaveProjectAsTemplateAction extends AnAction { String s = VfsUtilCore.loadText(virtualFile); String result = convertTemplates(s, pattern, templateText); - return new ByteArrayInputStream(result.getBytes(virtualFile.getCharset())); + return new ByteArrayInputStream(result.getBytes(TemplateModuleBuilder.UTF_8)); } }); } diff --git a/java/idea-ui/src/com/intellij/platform/templates/TemplateModuleBuilder.java b/java/idea-ui/src/com/intellij/platform/templates/TemplateModuleBuilder.java index 52acb6471a16..cef8ec8bc74c 100644 --- a/java/idea-ui/src/com/intellij/platform/templates/TemplateModuleBuilder.java +++ b/java/idea-ui/src/com/intellij/platform/templates/TemplateModuleBuilder.java @@ -69,6 +69,7 @@ public class TemplateModuleBuilder extends ModuleBuilder { return s.contains(".idea") ? null : s; } }; + public static final String UTF_8 = "UTF-8"; private final ModuleType myType; private ArchivedProjectTemplate myTemplate; @@ -205,7 +206,7 @@ public class TemplateModuleBuilder extends ModuleBuilder { private static byte[] processTemplates(String s) throws IOException { Properties properties = FileTemplateManager.getInstance().getDefaultProperties(); String merged = FileTemplateUtil.mergeTemplate(properties, s, true); - return merged.replace("\\$", "$").replace("\\#", "#").getBytes(); + return merged.replace("\\$", "$").replace("\\#", "#").getBytes(UTF_8); } @Nullable