From f8985e813a8984430378448b6ba5a3c36d1e0356 Mon Sep 17 00:00:00 2001 From: Daniel Kirschten Date: Sun, 8 Sep 2019 22:18:25 +0200 Subject: [PATCH] JsonHandler now supports Unicode (used in Am2904muSR) --- .../src/net/mograsim/logic/model/util/JsonHandler.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java index 0f151b98..20491ce5 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java @@ -6,6 +6,7 @@ import java.io.FileWriter; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; +import java.nio.charset.StandardCharsets; import java.util.stream.Collectors; import com.google.gson.Gson; @@ -29,7 +30,8 @@ public class JsonHandler */ public static T readJson(InputStream input, Class type) throws IOException { - try (InputStreamReader reader = new InputStreamReader(input); BufferedReader bf = new BufferedReader(reader)) + try (InputStreamReader reader = new InputStreamReader(input, StandardCharsets.UTF_8); + BufferedReader bf = new BufferedReader(reader)) { return fromJson(bf.lines().collect(Collectors.joining("\n")), type); } @@ -64,4 +66,4 @@ public class JsonHandler { return parser.toJsonTree(o); } -} +} \ No newline at end of file -- 2.17.1