From dc0d79df41452755066004a12cdf55ae304791eb Mon Sep 17 00:00:00 2001 From: Bas Leijdekkers Date: Tue, 22 Jan 2013 16:14:00 +0100 Subject: [PATCH] restore convert line separators --- .../generate/tostring/template/TemplateResourceLocator.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/TemplateResourceLocator.java b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/TemplateResourceLocator.java index 6452516d793a..ef01c93a4221 100644 --- a/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/TemplateResourceLocator.java +++ b/plugins/generate-tostring/src/org/jetbrains/generate/tostring/template/TemplateResourceLocator.java @@ -16,6 +16,7 @@ package org.jetbrains.generate.tostring.template; import com.intellij.openapi.util.io.FileUtil; +import com.intellij.openapi.util.text.StringUtil; import org.jetbrains.generate.tostring.exception.TemplateResourceException; import java.io.BufferedInputStream; @@ -67,6 +68,6 @@ public class TemplateResourceLocator { */ private static String readFile(String resource) throws IOException { BufferedInputStream in = new BufferedInputStream(TemplateResourceLocator.class.getResourceAsStream(resource)); - return FileUtil.loadTextAndClose(new InputStreamReader(in, "UTF-8")); + return StringUtil.convertLineSeparators(FileUtil.loadTextAndClose(new InputStreamReader(in, "UTF-8"))); } }