Slight improvements in documentation.

[Mograsim.git] / net.mograsim.logic.ui / src / net / mograsim / logic / ui / util / JsonHandler.java

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 94231a3..99ff8d1 100644 (file)
--- 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;
@@ -12,24 +14,33 @@ 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 (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);
+                       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));
+               }
        }
 }