X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fsubmodels%2FSubmodelComponent.java;h=9388e2fb09fdc7e51ba8370f1b2c76e5700397f3;hb=fb26dcd2084072f24b96187e98bd82fb186eada6;hp=7eaba80595a597770a6ea3d7d64133988f933915;hpb=93b398d6271a538a2a4c9f4de07a3b4a8a2a7fd4;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java
index 7eaba805..9388e2fb 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/submodels/SubmodelComponent.java
@@ -11,8 +11,8 @@ import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.gcs.TranslatedGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 import net.mograsim.logic.model.LogicUIRenderer;
-import net.mograsim.logic.model.model.ViewModel;
-import net.mograsim.logic.model.model.ViewModelModifiable;
+import net.mograsim.logic.model.model.LogicModel;
+import net.mograsim.logic.model.model.LogicModelModifiable;
 import net.mograsim.logic.model.model.components.ModelComponent;
 import net.mograsim.logic.model.model.wires.MovablePin;
 import net.mograsim.logic.model.model.wires.Pin;
@@ -35,11 +35,11 @@ public abstract class SubmodelComponent extends ModelComponent
 	/**
 	 * A modifiable view of {@link #submodel}.
 	 */
-	protected final ViewModelModifiable submodelModifiable;
+	protected final LogicModelModifiable submodelModifiable;
 	/**
 	 * The model this {@link SubmodelComponent} consists of.
 	 */
-	public final ViewModel submodel;
+	public final LogicModel submodel;
 	/**
 	 * The list of all submodel interface pins of this {@link SubmodelComponent} on the submodel side.
 	 */
@@ -99,10 +99,15 @@ public abstract class SubmodelComponent extends ModelComponent
 
 	// creation and destruction
 
-	public SubmodelComponent(ViewModelModifiable model, String name)
+	public SubmodelComponent(LogicModelModifiable model, String name)
 	{
-		super(model, name);
-		this.submodelModifiable = new ViewModelModifiable();
+		this(model, name, true);
+	}
+
+	protected SubmodelComponent(LogicModelModifiable model, String name, boolean callInit)
+	{
+		super(model, name, false);
+		this.submodelModifiable = new LogicModelModifiable();
 		this.submodel = submodelModifiable;
 		this.submodelPins = new HashMap<>();
 		this.submodelMovablePinsUnmodifiable = Collections.unmodifiableMap(submodelPins);
@@ -110,7 +115,7 @@ public abstract class SubmodelComponent extends ModelComponent
 		this.supermodelPins = new HashMap<>();
 		this.supermodelMovablePinsUnmodifiable = Collections.unmodifiableMap(supermodelPins);
 		this.supermodelUnmovablePinsUnmodifiable = Collections.unmodifiableMap(supermodelPins);
-		this.submodelInterface = new SubmodelInterface(submodelModifiable, SUBMODEL_INTERFACE_NAME);
+		this.submodelInterface = new SubmodelInterface(submodelModifiable);
 
 		this.submodelScale = 1;
 		this.maxVisibleRegionFillRatioForAlpha0 = 0.8;
@@ -125,6 +130,9 @@ public abstract class SubmodelComponent extends ModelComponent
 				model.removeRedrawHandlerChangedListener(redrawHandlerChangedListener);
 		});
 		submodelModifiable.setRedrawHandler(model.getRedrawHandler());
+
+		if (callInit)
+			init();
 	}
 
 	// pins
@@ -159,7 +167,7 @@ public abstract class SubmodelComponent extends ModelComponent
 		default:
 			throw new IllegalArgumentException("Unknown enum constant: " + supermodelPin.usage);
 		}
-		MovablePin submodelPin = new MovablePin(submodelInterface, name, supermodelPin.logicWidth, submodelPinUsage,
+		MovablePin submodelPin = new MovablePin(submodelModifiable, submodelInterface, name, supermodelPin.logicWidth, submodelPinUsage,
 				supermodelPin.getRelX() / submodelScale, supermodelPin.getRelY() / submodelScale);
 
 		submodelPin.addPinMovedListener(p ->
@@ -421,14 +429,28 @@ public abstract class SubmodelComponent extends ModelComponent
 
 	// serializing
 
+	/**
+	 * {@link SubmodelComponent}'s implementation of {@link ModelComponent#getIDForSerializing(IdentifyParams)} returns "submodel". It is
+	 * recommended to override this behaviour.
+	 * 
+	 * @see ModelComponent#getIDForSerializing(IdentifyParams)
+	 * @see ModelComponent#getParamsForSerializing(IdentifyParams)
+	 */
 	@Override
 	public String getIDForSerializing(IdentifyParams idParams)
 	{
 		return "submodel";// TODO what ID?
 	}
 
+	/**
+	 * {@link SubmodelComponent}'s implementation of {@link ModelComponent#getParamsForSerializing(IdentifyParams)} returns an instance of
+	 * {@link SubmodelComponentParams}. It is recommended to override this behaviour.
+	 * 
+	 * @see ModelComponent#getIDForSerializing(IdentifyParams)
+	 * @see ModelComponent#getParamsForSerializing(IdentifyParams)
+	 */
 	@Override
-	public SubmodelComponentParams getParamsForSerializing(IdentifyParams idParams)
+	public Object getParamsForSerializing(IdentifyParams idParams)
 	{
 		return SubmodelComponentSerializer.serialize(this, idParams);
 	}