X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Futil%2FJsonHandler.java;fp=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Futil%2FJsonHandler.java;h=99ff8d1dd409efbe62e5cde663ea5007a4587804;hb=c5b5d3cb19298d33d787b5a3e0a87ce5d7f4a1a0;hp=dc8ace3d03a649213124678a2180e6afdb43d93b;hpb=847dd0a23c86ddd67c16c47170ae7e7732682140;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/util/JsonHandler.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/util/JsonHandler.java
index dc8ace3d..99ff8d1d 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/util/JsonHandler.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/util/JsonHandler.java
@@ -1,9 +1,11 @@
 package net.mograsim.logic.ui.util;
 
 import java.io.BufferedReader;
-import java.io.FileReader;
+import java.io.FileInputStream;
 import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
@@ -14,7 +16,18 @@ public class JsonHandler
 
 	public static <T> T readJson(String path, Class<T> type) throws IOException
 	{
-		try (FileReader reader = new FileReader(path); BufferedReader bf = new BufferedReader(reader))
+		try (FileInputStream jsonStream = new FileInputStream(path))
+		{
+			return readJson(jsonStream, type);
+		}
+	}
+
+	/**
+	 * @param input The Stream is closed after being read
+	 */
+	public static <T> T readJson(InputStream input, Class<T> type) throws IOException
+	{
+		try (InputStreamReader reader = new InputStreamReader(input); BufferedReader bf = new BufferedReader(reader))
 		{
 			String json = bf.lines().dropWhile(s -> s.length() == 0 || s.charAt(0) != '{').reduce("", (x, y) -> x.concat(y));
 			T params = parser.fromJson(json, type);