Bug 581215: Use UTF-8 as default encoding when reading streams Change-Id: Iae9b57fa87eaaf2a5ddc962e1f151b9eaf71405d
diff --git a/plugins/org.eclipse.ease.modules.platform/src/org/eclipse/ease/modules/platform/resources/FilesystemHandle.java b/plugins/org.eclipse.ease.modules.platform/src/org/eclipse/ease/modules/platform/resources/FilesystemHandle.java index db0a99b..c735d6c 100644 --- a/plugins/org.eclipse.ease.modules.platform/src/org/eclipse/ease/modules/platform/resources/FilesystemHandle.java +++ b/plugins/org.eclipse.ease.modules.platform/src/org/eclipse/ease/modules/platform/resources/FilesystemHandle.java
@@ -23,6 +23,7 @@ import java.io.OutputStreamWriter; import java.io.PrintWriter; import java.io.Reader; +import java.nio.charset.StandardCharsets; import java.nio.file.Path; public class FilesystemHandle implements IFileHandle { @@ -39,7 +40,7 @@ } protected BufferedReader createReader() throws Exception { - return new BufferedReader(new InputStreamReader(new FileInputStream(fFile))); + return new BufferedReader(new InputStreamReader(new FileInputStream(fFile), StandardCharsets.UTF_8)); } private BufferedReader getReader() {
diff --git a/plugins/org.eclipse.ease.modules.platform/src/org/eclipse/ease/modules/platform/resources/ResourceHandle.java b/plugins/org.eclipse.ease.modules.platform/src/org/eclipse/ease/modules/platform/resources/ResourceHandle.java index ef19136..032fe94 100644 --- a/plugins/org.eclipse.ease.modules.platform/src/org/eclipse/ease/modules/platform/resources/ResourceHandle.java +++ b/plugins/org.eclipse.ease.modules.platform/src/org/eclipse/ease/modules/platform/resources/ResourceHandle.java
@@ -16,6 +16,7 @@ import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; import java.nio.file.Path; import org.eclipse.core.resources.IContainer; @@ -36,12 +37,12 @@ @Override protected BufferedReader createReader() throws Exception { - return new BufferedReader(new InputStreamReader(fFile.getContents())); + return new BufferedReader(new InputStreamReader(fFile.getContents(), StandardCharsets.UTF_8)); } @Override public void write(final String data) throws IOException { - write(data.getBytes()); + write(data.getBytes(StandardCharsets.UTF_8)); } @Override