X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=plugins%2Fnet.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fserializing%2FIndirectModelComponentCreator.java;h=926e48b5b9dfd34936953cb3e26c6a1a2ccc4c4f;hb=13577856cd85c46f2cd4ad956332697bc820f425;hp=4bc9a36b9379862b757a49ee0371ab1adebe37a8;hpb=22b03c5749439c8601238669ef7b790f48077043;p=Mograsim.git

diff --git a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectModelComponentCreator.java b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectModelComponentCreator.java
index 4bc9a36b..926e48b5 100644
--- a/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectModelComponentCreator.java
+++ b/plugins/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/IndirectModelComponentCreator.java
@@ -10,7 +10,6 @@ import java.util.Objects;
 
 import com.google.gson.JsonElement;
 import com.google.gson.JsonNull;
-import com.google.gson.JsonObject;
 
 import net.mograsim.logic.model.model.LogicModelModifiable;
 import net.mograsim.logic.model.model.components.ModelComponent;
@@ -24,7 +23,7 @@ public class IndirectModelComponentCreator
 
 	private static final Map<String, ComponentSupplier> componentSuppliers = new HashMap<>();
 	private static final Map<String, ResourceLoader> resourceLoaders = new HashMap<>();
-	private static final Map<String, JsonObject> componentCache = new HashMap<>();
+	private static final Map<String, SubmodelComponentParams> componentCache = new HashMap<>();
 
 	private static final ResourceLoader defaultResourceLoader;
 	static
@@ -104,11 +103,11 @@ public class IndirectModelComponentCreator
 		String firstPart = parts[0];
 		if (firstPart.equals("jsonfile"))
 		{
-			JsonObject jsonContents;
+			SubmodelComponentParams jsonContents;
 			try
 			{
 				// don't use parts[1], because the path could contain ':'
-				jsonContents = JsonHandler.readJson(resolvedID.substring("jsonfile:".length()), JsonObject.class);
+				jsonContents = JsonHandler.readJson(resolvedID.substring("jsonfile:".length()), SubmodelComponentParams.class);
 			}
 			catch (IOException e)
 			{
@@ -139,12 +138,12 @@ public class IndirectModelComponentCreator
 		}
 		if (resTypeID.equals("jsonres"))
 		{
-			JsonObject jsonContents;
+			SubmodelComponentParams jsonContents;
 			try
 			{
 				@SuppressWarnings("resource") // jsonStream is closed in JsonHandler
 				InputStream jsonStream = Objects.requireNonNull(loader.loadResource(resID), "Error loading JSON resource: Not found");
-				jsonContents = JsonHandler.readJson(jsonStream, JsonObject.class);
+				jsonContents = JsonHandler.readJson(jsonStream, SubmodelComponentParams.class);
 			}
 			catch (IOException e)
 			{
@@ -185,15 +184,15 @@ public class IndirectModelComponentCreator
 	}
 
 	private static SubmodelComponent loadComponentFromJsonObject(LogicModelModifiable model, String id, String name,
-			JsonObject jsonContents)
+			SubmodelComponentParams jsonContents)
 	{
 		componentCache.putIfAbsent(id, jsonContents);
-		SerializablePojo jsonContentsAsSerializablePojo = JsonHandler.parser.fromJson(jsonContents, SerializablePojo.class);
-		if (jsonContentsAsSerializablePojo.version == null)
-			return LegacySubmodelComponentSerializer.deserialize(model,
-					JsonHandler.parser.fromJson(jsonContents, LegacySubmodelComponentParams.class), name, id, null);
-		return SubmodelComponentSerializer.deserialize(model, JsonHandler.parser.fromJson(jsonContents, SubmodelComponentParams.class),
-				name, id, null);
+		return SubmodelComponentSerializer.deserialize(model, jsonContents, name, id, null);
+	}
+
+	public static void clearComponentCache()
+	{
+		componentCache.clear();
 	}
 
 	public static void registerResourceLoader(ResourceLoader resourceLoader)