X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fserializing%2FViewModelSerializer.java;h=61d4915e61a569a58cb740f3be5670c4ed104f5a;hb=0a04a4ed66ecebd4254541c4977599f6052c115a;hp=38bdf9c492d4b0abe6be7ddf6fcbfdee548b6cc3;hpb=21ffb2a7f764069fb3c55b71647b43e8803e668c;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/ViewModelSerializer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/ViewModelSerializer.java
index 38bdf9c4..61d4915e 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/ViewModelSerializer.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/serializing/ViewModelSerializer.java
@@ -78,9 +78,9 @@ public class ViewModelSerializer
 	 * 
 	 * @author Daniel Kirschten
 	 */
-	public static void serialize(ViewModel model, IdentifierGetter idGetter, String targetPath) throws IOException
+	public static void serialize(ViewModel model, IdentifyParams idParams, String targetPath) throws IOException
 	{
-		JsonHandler.writeJson(serialize(model, idGetter), targetPath);
+		JsonHandler.writeJson(serialize(model, idParams), targetPath);
 	}
 
 	/**
@@ -91,7 +91,7 @@ public class ViewModelSerializer
 	 */
 	public static ViewModelParams serialize(ViewModel model)
 	{
-		return serialize(model, new IdentifierGetter());
+		return serialize(model, new IdentifyParams());
 	}
 
 	// "core" methods
@@ -137,7 +137,7 @@ public class ViewModelSerializer
 	 * @author Fabian Stemmler
 	 * @author Daniel Kirschten
 	 */
-	public static ViewModelParams serialize(ViewModel model, IdentifierGetter idGetter)
+	public static ViewModelParams serialize(ViewModel model, IdentifyParams idParams)
 	{
 		ViewModelParams modelParams = new ViewModelParams(CURRENT_JSON_VERSION);
 
@@ -157,8 +157,8 @@ public class ViewModelSerializer
 				compParams.params = innerCompCasted.paramsForSerializingOverride;
 			} else
 			{
-				compParams.id = idGetter.componentIDs.apply(component);
-				compParams.params = component.getParamsForSerializing(idGetter);
+				compParams.id = component.getIDForSerializing(idParams);
+				compParams.params = component.getParamsForSerializingJSON(idParams);
 			}
 			compParams.name = component.name;
 		}