X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Futil%2FJsonHandler.java;h=20491ce58f27ab3c278a06d1d7f1b196da9da1f7;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=4f60bdfd181d7fd5a6bdd64484c0deb6f3ac2f37;hpb=853d979edee5d49d3b3c5fe08609f6cfd82d863f;p=Mograsim.git

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 4f60bdfd..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> T readJson(InputStream input, Class<T> 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);
 		}
@@ -42,6 +44,11 @@ public class JsonHandler
 		return parser.fromJson(rawJson, type);
 	}
 
+	public static <T> T fromJsonTree(JsonElement src, Class<T> type)
+	{
+		return parser.fromJson(src, type);
+	}
+
 	public static void writeJson(Object o, String path) throws IOException
 	{
 		try (FileWriter writer = new FileWriter(path))
@@ -59,4 +66,4 @@ public class JsonHandler
 	{
 		return parser.toJsonTree(o);
 	}
-}
+}
\ No newline at end of file