X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fserializing%2FSubmodelComponentSerializer.java;h=d09ed4a46144322e59dc16842b9aeea1d7ed4f1d;hb=93b398d6271a538a2a4c9f4de07a3b4a8a2a7fd4;hp=a062eaaaba0268dc0ee7bf3090e795e139770db7;hpb=fb7adf94b44702c6be2e52649f09c845a2572553;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentSerializer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentSerializer.java
index a062eaaa..d09ed4a4 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentSerializer.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/SubmodelComponentSerializer.java
@@ -129,9 +129,9 @@ public final class SubmodelComponentSerializer
 	 * 
 	 * @author Daniel Kirschten
 	 */
-	public static void serialize(SubmodelComponent comp, IdentifierGetter idGetter, String targetPath) throws IOException
+	public static void serialize(SubmodelComponent comp, IdentifyParams idParams, String targetPath) throws IOException
 	{
-		JsonHandler.writeJson(serialize(comp, idGetter), targetPath);
+		JsonHandler.writeJson(serialize(comp, idParams), targetPath);
 	}
 
 	/**
@@ -142,7 +142,7 @@ public final class SubmodelComponentSerializer
 	 */
 	public static SubmodelComponentParams serialize(SubmodelComponent comp)
 	{
-		return serialize(comp, new IdentifierGetter());
+		return serialize(comp, new IdentifyParams());
 	}
 
 	// "core" methods
@@ -158,7 +158,7 @@ public final class SubmodelComponentSerializer
 	 * @author Fabian Stemmler
 	 * @author Daniel Kirschten
 	 */
-	@SuppressWarnings("unused") // for GUIWire being created
+	@SuppressWarnings("unused") // for ModelWire being created
 	public static SubmodelComponent deserialize(ViewModelModifiable model, SubmodelComponentParams params, String name,
 			String idForSerializingOverride, JsonElement paramsForSerializingOverride)
 	{
@@ -195,11 +195,11 @@ public final class SubmodelComponentSerializer
 	 * @author Fabian Stemmler
 	 * @author Daniel Kirschten
 	 */
-	public static SubmodelComponentParams serialize(SubmodelComponent comp, IdentifierGetter idGetter)
+	public static SubmodelComponentParams serialize(SubmodelComponent comp, IdentifyParams idParams)
 	{
 		SubmodelComponentParams params = new SubmodelComponentParams(JSON_VERSION_CURRENT_SERIALIZING);
 		params.innerScale = comp.getSubmodelScale();
-		params.submodel = ViewModelSerializer.serialize(comp.submodel, idGetter);
+		params.submodel = ViewModelSerializer.serialize(comp.submodel, idParams);
 
 		params.width = comp.getWidth();
 		params.height = comp.getHeight();
@@ -222,22 +222,22 @@ public final class SubmodelComponentSerializer
 		Renderer symbolRenderer = comp.getSymbolRenderer();
 		if (symbolRenderer != null)
 		{
-			params.symbolRendererSnippetID = idGetter.symbolRendererIDs.apply(symbolRenderer);
-			params.symbolRendererParams = symbolRenderer.getParamsForSerializingJSON(idGetter);
+			params.symbolRendererSnippetID = symbolRenderer.getIDForSerializing(idParams);
+			params.symbolRendererParams = symbolRenderer.getParamsForSerializingJSON(idParams);
 		}
 
 		Renderer outlineRenderer = comp.getOutlineRenderer();
 		if (outlineRenderer != null)
 		{
-			params.outlineRendererSnippetID = idGetter.outlineRendererIDs.apply(outlineRenderer);
-			params.outlineRendererParams = outlineRenderer.getParamsForSerializingJSON(idGetter);
+			params.outlineRendererSnippetID = outlineRenderer.getIDForSerializing(idParams);
+			params.outlineRendererParams = outlineRenderer.getParamsForSerializingJSON(idParams);
 		}
 
 		HighLevelStateHandler highLevelStateHandler = comp.getHighLevelStateHandler();
 		if (highLevelStateHandler != null)
 		{
-			params.highLevelStateHandlerSnippetID = idGetter.highLevelStateHandlerIDs.apply(highLevelStateHandler);
-			params.highLevelStateHandlerParams = highLevelStateHandler.getParamsForSerializingJSON(idGetter);
+			params.highLevelStateHandlerSnippetID = highLevelStateHandler.getIDForSerializing(idParams);
+			params.highLevelStateHandlerParams = highLevelStateHandler.getParamsForSerializingJSON(idParams);
 		}
 
 		return params;