HLSShell now closes when the according LogicUICanvas is disposed

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

diff --git a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java
index d2d6de3..950b953 100644 (file)
--- a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java
+++ b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/util/JsonHandler.java
@@ -39,14 +39,7 @@ public class JsonHandler
 
        public static <T> T fromJson(String src, Class<T> type)
        {
-               // throw away legacy version line, but keep line numbers
-               int linesBeforeJsonStart = (int) src.lines().takeWhile(s -> s.length() == 0 || s.charAt(0) != '{').count();
-               String rawJson;
-               if (linesBeforeJsonStart == 0)
-                       rawJson = src;
-               else
-                       rawJson = "\n".repeat(linesBeforeJsonStart) + src.lines().skip(linesBeforeJsonStart).collect(Collectors.joining("\n"));
-               return parser.fromJson(rawJson, type);
+               return parser.fromJson(src, type);
        }
 
        public static <T> T fromJsonTree(JsonElement src, Class<T> type)