Fixed a bug in Am2900; created dlatch8/80; relayouted some components

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

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 2ada2e7..20491ce 100644 (file)
--- 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,15 +6,16 @@ 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;
 import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
 
 public class JsonHandler
 {
-       // TODO: write versions differently
-       private static Gson parser = new GsonBuilder().setPrettyPrinting().create();
+       public final static Gson parser = new GsonBuilder().setPrettyPrinting().create();
 
        public static <T> T readJson(String path, Class<T> type) throws IOException
        {
@@ -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);
                }
@@ -37,11 +39,16 @@ public class JsonHandler
 
        public static <T> T fromJson(String src, Class<T> type)
        {
-               // TODO actually parse and compare version
+               // throw away legacy version line
                String rawJson = src.lines().dropWhile(s -> s.length() == 0 || s.charAt(0) != '{').collect(Collectors.joining());
                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))
@@ -52,6 +59,11 @@ public class JsonHandler
 
        public static String toJson(Object o)
        {
-               return String.format("mograsim version: %s\n%s", Version.jsonCompVersion.toString(), parser.toJson(o));
+               return parser.toJson(o);
+       }
+
+       public static JsonElement toJsonTree(Object o)
+       {
+               return parser.toJsonTree(o);
        }
-}
+}
\ No newline at end of file