diff options
Diffstat (limited to 'org.eclipse.core.filebuffers')
2 files changed, 10 insertions, 4 deletions
diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/JavaTextFileBuffer.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/JavaTextFileBuffer.java index 4a5415e0071..6fcdc412e2b 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/JavaTextFileBuffer.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/JavaTextFileBuffer.java @@ -357,8 +357,7 @@ public class JavaTextFileBuffer extends JavaFileBuffer implements ITextFileBuffe String encoding= description.getCharset(); if (encoding != null) return encoding; - } else if (fUTF8BOM != null) - return CHARSET_UTF_8; + } } catch (IOException ex) { // try next strategy } finally { @@ -369,6 +368,10 @@ public class JavaTextFileBuffer extends JavaFileBuffer implements ITextFileBuffe } } + // Use UTF-8 BOM if there was any + if (fUTF8BOM != null) + return CHARSET_UTF_8; + // Use global default return fManager.getDefaultEncoding(); } diff --git a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBuffer.java b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBuffer.java index 9c0caf86ad4..fdf2aee4a3a 100644 --- a/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBuffer.java +++ b/org.eclipse.core.filebuffers/src/org/eclipse/core/internal/filebuffers/ResourceTextFileBuffer.java @@ -397,8 +397,7 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF String encoding= description.getCharset(); if (encoding != null) return encoding; - } else if (fUTF8BOM != null) - return CHARSET_UTF_8; + } } catch (IOException ex) { // try next strategy } finally { @@ -409,6 +408,10 @@ public class ResourceTextFileBuffer extends ResourceFileBuffer implements ITextF } } + // Use UTF-8 BOM if there was any + if (fUTF8BOM != null) + return CHARSET_UTF_8; + // Use parent chain try { return fFile.getParent().getDefaultCharset(); |