X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fserializing%2FSubmodelComponentSerializer.java;h=b4b2ff9cfdca1a4cdced490f8e469a809483ec8f;hb=1f645882d229fc3d4081e4c5060559d75dc2cc24;hp=84e9fdb0ce35145788d076f0f626b94b070f8132;hpb=039f31334c661633b71e945aa4332cedb7055526;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 84e9fdb0..b4b2ff9c 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
@@ -6,7 +6,7 @@ import java.util.Comparator;
 
 import com.google.gson.JsonElement;
 
-import net.mograsim.logic.model.model.ViewModelModifiable;
+import net.mograsim.logic.model.model.LogicModelModifiable;
 import net.mograsim.logic.model.model.components.submodels.SubmodelComponent;
 import net.mograsim.logic.model.model.wires.MovablePin;
 import net.mograsim.logic.model.model.wires.Pin;
@@ -32,23 +32,23 @@ public final class SubmodelComponentSerializer
 	// convenience methods
 
 	/**
-	 * Like {@link #deserialize(ViewModelModifiable, SubmodelComponentParams)}, but first reading the {@link SubmodelComponentParams} from
+	 * Like {@link #deserialize(LogicModelModifiable, SubmodelComponentParams)}, but first reading the {@link SubmodelComponentParams} from
 	 * the given file path.
 	 * 
 	 * @author Daniel Kirschten
 	 */
-	public static SubmodelComponent deserialize(ViewModelModifiable model, String sourcePath) throws IOException
+	public static SubmodelComponent deserialize(LogicModelModifiable model, String sourcePath) throws IOException
 	{
 		return deserialize(model, JsonHandler.readJson(sourcePath, SubmodelComponentParams.class));
 	}
 
 	/**
-	 * Like {@link #deserialize(ViewModelModifiable, SubmodelComponentParams, String, JsonElement)}, but first reading the
+	 * Like {@link #deserialize(LogicModelModifiable, SubmodelComponentParams, String, JsonElement)}, but first reading the
 	 * {@link SubmodelComponentParams} from the given file path.
 	 * 
 	 * @author Daniel Kirschten
 	 */
-	public static SubmodelComponent deserialize(ViewModelModifiable model, String sourcePath, String idForSerializingOverride,
+	public static SubmodelComponent deserialize(LogicModelModifiable model, String sourcePath, String idForSerializingOverride,
 			JsonElement paramsForSerializingOverride) throws IOException
 	{
 		return deserialize(model, JsonHandler.readJson(sourcePath, SubmodelComponentParams.class), idForSerializingOverride,
@@ -56,23 +56,23 @@ public final class SubmodelComponentSerializer
 	}
 
 	/**
-	 * Like {@link #deserialize(ViewModelModifiable, SubmodelComponentParams, String)}, but first reading the
+	 * Like {@link #deserialize(LogicModelModifiable, SubmodelComponentParams, String)}, but first reading the
 	 * {@link SubmodelComponentParams} from the given file path.
 	 * 
 	 * @author Daniel Kirschten
 	 */
-	public static SubmodelComponent deserialize(ViewModelModifiable model, String sourcePath, String name) throws IOException
+	public static SubmodelComponent deserialize(LogicModelModifiable model, String sourcePath, String name) throws IOException
 	{
 		return deserialize(model, JsonHandler.readJson(sourcePath, SubmodelComponentParams.class), name);
 	}
 
 	/**
-	 * Like {@link #deserialize(ViewModelModifiable, SubmodelComponentParams, String, String, JsonElement)}, but first reading the
+	 * Like {@link #deserialize(LogicModelModifiable, SubmodelComponentParams, String, String, JsonElement)}, but first reading the
 	 * {@link SubmodelComponentParams} from the given file path.
 	 * 
 	 * @author Daniel Kirschten
 	 */
-	public static SubmodelComponent deserialize(ViewModelModifiable model, String sourcePath, String name, String idForSerializingOverride,
+	public static SubmodelComponent deserialize(LogicModelModifiable model, String sourcePath, String name, String idForSerializingOverride,
 			JsonElement paramsForSerializingOverride) throws IOException
 	{
 		return deserialize(model, JsonHandler.readJson(sourcePath, SubmodelComponentParams.class), name, idForSerializingOverride,
@@ -80,34 +80,34 @@ public final class SubmodelComponentSerializer
 	}
 
 	/**
-	 * {@link #deserialize(ViewModelModifiable, SubmodelComponentParams, String, String, JsonElement)} with no
+	 * {@link #deserialize(LogicModelModifiable, SubmodelComponentParams, String, String, JsonElement)} with no
 	 * <code>idForSerializingOverride</code> set and using the default name.
 	 * 
 	 * @author Daniel Kirschten
 	 */
-	public static SubmodelComponent deserialize(ViewModelModifiable model, SubmodelComponentParams params)
+	public static SubmodelComponent deserialize(LogicModelModifiable model, SubmodelComponentParams params)
 	{
 		return deserialize(model, params, null, null, null);
 	}
 
 	/**
-	 * {@link #deserialize(ViewModelModifiable, SubmodelComponentParams, String, String, JsonElement)} using the default name.
+	 * {@link #deserialize(LogicModelModifiable, SubmodelComponentParams, String, String, JsonElement)} using the default name.
 	 * 
 	 * @author Daniel Kirschten
 	 */
-	public static SubmodelComponent deserialize(ViewModelModifiable model, SubmodelComponentParams params, String idForSerializingOverride,
+	public static SubmodelComponent deserialize(LogicModelModifiable model, SubmodelComponentParams params, String idForSerializingOverride,
 			JsonElement paramsForSerializingOverride)
 	{
 		return deserialize(model, params, null, idForSerializingOverride, paramsForSerializingOverride);
 	}
 
 	/**
-	 * {@link #deserialize(ViewModelModifiable, SubmodelComponentParams, String, String, JsonElement)} with no
+	 * {@link #deserialize(LogicModelModifiable, SubmodelComponentParams, String, String, JsonElement)} with no
 	 * <code>idForSerializingOverride</code> set.
 	 * 
 	 * @author Daniel Kirschten
 	 */
-	public static SubmodelComponent deserialize(ViewModelModifiable model, SubmodelComponentParams params, String name)
+	public static SubmodelComponent deserialize(LogicModelModifiable model, SubmodelComponentParams params, String name)
 	{
 		return deserialize(model, params, name, null, null);
 	}
@@ -158,8 +158,8 @@ public final class SubmodelComponentSerializer
 	 * @author Fabian Stemmler
 	 * @author Daniel Kirschten
 	 */
-	@SuppressWarnings("unused") // for GUIWire being created
-	public static SubmodelComponent deserialize(ViewModelModifiable model, SubmodelComponentParams params, String name,
+	@SuppressWarnings("unused") // for ModelWire being created
+	public static SubmodelComponent deserialize(LogicModelModifiable model, SubmodelComponentParams params, String name,
 			String idForSerializingOverride, JsonElement paramsForSerializingOverride)
 	{
 		Version version = params.version;
@@ -172,10 +172,10 @@ public final class SubmodelComponentSerializer
 		comp.setSize(params.width, params.height);
 		for (InterfacePinParams iPinParams : params.interfacePins)
 			// TRISTATE because we don't have a better choice
-			comp.addSubmodelInterface(new MovablePin(comp, iPinParams.name, iPinParams.logicWidth,
+			comp.addSubmodelInterface(new MovablePin(model, comp, iPinParams.name, iPinParams.logicWidth,
 					hasUsageSerialized ? iPinParams.usage : PinUsage.TRISTATE, iPinParams.location.x, iPinParams.location.y));
-		ViewModelModifiable submodelModifiable = comp.getSubmodelModifiable();
-		ViewModelSerializer.deserialize(comp.getSubmodelModifiable(), params.submodel);
+		LogicModelModifiable submodelModifiable = comp.getSubmodelModifiable();
+		LogicModelSerializer.deserialize(comp.getSubmodelModifiable(), params.submodel);
 		comp.setSymbolRenderer(SubmodelComponentSnippetSuppliers.symbolRendererSupplier.getSnippetSupplier(params.symbolRendererSnippetID)
 				.create(comp, params.symbolRendererParams));
 		comp.setOutlineRenderer(SubmodelComponentSnippetSuppliers.outlineRendererSupplier
@@ -187,8 +187,8 @@ public final class SubmodelComponentSerializer
 
 	/**
 	 * Returns {@link SubmodelComponentParams}, which describe this {@link SubmodelComponent}. <br>
-	 * See {@link ViewModelSerializer#serialize(net.mograsim.logic.model.model.ViewModel, IdentifierGetter)
-	 * ViewModelSerializer.serialize(...)} for how subcomponents are serialized.<br>
+	 * See {@link LogicModelSerializer#serialize(net.mograsim.logic.model.model.LogicModel, IdentifierGetter)
+	 * LogicModelSerializer.serialize(...)} for how subcomponents are serialized.<br>
 	 * CodeSnippets are serialized using the ID defined by <code>idGetter</code> and the params obtained by the respective
 	 * <coce>getParamsForSerializing</code> methods ({@link Renderer#getParamsForSerializing()}).
 	 * 
@@ -199,7 +199,7 @@ public final class SubmodelComponentSerializer
 	{
 		SubmodelComponentParams params = new SubmodelComponentParams(JSON_VERSION_CURRENT_SERIALIZING);
 		params.innerScale = comp.getSubmodelScale();
-		params.submodel = ViewModelSerializer.serialize(comp.submodel, idParams);
+		params.submodel = LogicModelSerializer.serialize(comp.submodel, idParams);
 
 		params.width = comp.getWidth();
 		params.height = comp.getHeight();