From 24adda710abaa2076d1ff6da4a474031698a157c Mon Sep 17 00:00:00 2001 From: Maxim Shafirov Date: Fri, 14 Jan 2005 16:22:03 +0300 Subject: [PATCH] Made the project/module files to be written with the same separators they've been read in. --- .../openapi/fileEditor/impl/FileDocumentManagerImpl.java | 2 +- util/src/com/intellij/openapi/util/JDOMUtil.java | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/source/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java b/source/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java index ac6c88cdf9db..0c95256a8d51 100644 --- a/source/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java +++ b/source/com/intellij/openapi/fileEditor/impl/FileDocumentManagerImpl.java @@ -315,7 +315,7 @@ public class FileDocumentManagerImpl extends FileDocumentManager implements Appl } public String getLineSeparator(VirtualFile file, Project project) { - String lineSeparator = file.getUserData(DETECTED_LINE_SEPARATOR_KEY); + String lineSeparator = file != null ? file.getUserData(DETECTED_LINE_SEPARATOR_KEY) : null; if (lineSeparator == null) { CodeStyleSettingsManager settingsManager = project == null ? CodeStyleSettingsManager.getInstance() diff --git a/util/src/com/intellij/openapi/util/JDOMUtil.java b/util/src/com/intellij/openapi/util/JDOMUtil.java index a5a48f8ca61d..3e3f539e847a 100644 --- a/util/src/com/intellij/openapi/util/JDOMUtil.java +++ b/util/src/com/intellij/openapi/util/JDOMUtil.java @@ -62,6 +62,10 @@ public class JDOMUtil { return w1.toString().equals(w2.toString()); } + public static Document loadDocument(char[] chars, int length) throws IOException, JDOMException { + SAXBuilder builder = createBuilder(); + return builder.build(new CharArrayReader(chars, 0, length)); + } public static Document loadDocument(File file) throws JDOMException, IOException { SAXBuilder saxBuilder = createBuilder();