X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Futil%2FJsonHandler.java;h=dc8ace3d03a649213124678a2180e6afdb43d93b;hb=f14ea37d69488dd51518a36413af7176916b8bd7;hp=94231a3d80ab65f48b716a1a1f21d131334c51d2;hpb=6432c12630fa3f80ec19bf23229844abd42105e3;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 94231a3d..dc8ace3d 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
@@ -12,24 +12,22 @@ public class JsonHandler
 {
 	private static Gson parser = new GsonBuilder().setPrettyPrinting().create();
 
-	@SuppressWarnings("resource")
 	public static <T> T readJson(String path, Class<T> type) throws IOException
 	{
-		FileReader reader = new FileReader(path);
-		BufferedReader bf = new BufferedReader(reader);
-		bf.readLine(); // Skip version
-		String json = bf.lines().dropWhile(s -> s.length() == 0 || s.charAt(0) != '{').reduce("", (x, y) -> x.concat(y));
-		T params = parser.fromJson(json, type);
-		reader.close();
-		return params;
+		try (FileReader reader = new FileReader(path); 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);
+			return params;
+		}
 	}
 
 	public static void writeJson(Object o, String path) throws IOException
 	{
-		@SuppressWarnings("resource")
-		FileWriter writer = new FileWriter(path);
-		writer.write(String.format("mograsim version: %s\n", Version.current.toString()));
-		writer.write(parser.toJson(o));
-		writer.close(); // TODO: Insure that writer is closed
+		try (FileWriter writer = new FileWriter(path))
+		{
+			writer.write(String.format("mograsim version: %s\n", Version.jsonCompVersion.toString()));
+			writer.write(parser.toJson(o));
+		}
 	}
 }