From: Daniel Kirschten <daniel.kirschten@gmx.de>
Date: Sat, 2 May 2020 12:18:23 +0000 (+0200)
Subject: SnippetDefinintion now delegates to JsonHandler instead of an own Gson
X-Git-Url: https://mograsim.net/gitweb/?a=commitdiff_plain;h=fe5bcf33d393bae78b8a735b0e714751025af0e1;hp=ec71c9fb2f2d458891839b09579829b96f303a22;p=Mograsim.git

SnippetDefinintion now delegates to JsonHandler instead of an own Gson
---

diff --git a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/SnippetDefinintion.java b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/SnippetDefinintion.java
index c5fecf25..94c7e4e2 100644
--- a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/SnippetDefinintion.java
+++ b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/snippets/SnippetDefinintion.java
@@ -2,9 +2,10 @@ package net.mograsim.logic.model.snippets;
 
 import java.util.function.BiFunction;
 
-import com.google.gson.Gson;
 import com.google.gson.JsonElement;
 
+import net.mograsim.logic.model.util.JsonHandler;
+
 public interface SnippetDefinintion<C, P, S>
 {
 	public Class<P> getParamClass();
@@ -20,7 +21,7 @@ public interface SnippetDefinintion<C, P, S>
 				throw new IllegalArgumentException("Params given where none were expected");
 			return create(context, (P) null);
 		}
-		return create(context, new Gson().fromJson(params, getParamClass()));
+		return create(context, JsonHandler.fromJson(params, getParamClass()));
 	}
 
 	public static <C, P, S> SnippetDefinintion<C, P, S> create(Class<P> paramClass, BiFunction<C, P, S> supplier)
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 7c8e3536..4c49104b 100644
--- 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
@@ -45,6 +45,11 @@ public class JsonHandler
 		return parser.fromJson(src, type);
 	}
 
+	public static <T> T fromJson(JsonElement json, Class<T> type)
+	{
+		return parser.fromJson(json, type);
+	}
+
 	public static <T> T fromJsonTree(JsonElement src, Class<T> type)
 	{
 		return parser.fromJson(src, type);