X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2FModelComponent.java;h=6fcfa9a1d3413e91ab85720f959ce447b1ddedde;hb=92862c4723c5eff22257e8de06166a124efb5d77;hp=6853e382ccf44083ff906ae834d50e7be313c930;hpb=93b398d6271a538a2a4c9f4de07a3b4a8a2a7fd4;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/ModelComponent.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/ModelComponent.java
index 6853e382..6fcfa9a1 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/ModelComponent.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/ModelComponent.java
@@ -9,7 +9,7 @@ import java.util.function.Consumer;
 
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
-import net.mograsim.logic.model.model.ViewModelModifiable;
+import net.mograsim.logic.model.model.LogicModelModifiable;
 import net.mograsim.logic.model.model.wires.Pin;
 import net.mograsim.logic.model.serializing.IdentifyParams;
 import net.mograsim.logic.model.serializing.JSONSerializable;
@@ -17,7 +17,7 @@ import net.mograsim.logic.model.snippets.HighLevelStateHandler;
 
 /**
  * The base class for all model components.<br>
- * A <code>ModelComponent</code> has a reference to the ViewModel it belongs to.<br>
+ * A <code>ModelComponent</code> has a reference to the LogicModel it belongs to.<br>
  * A <code>ModelComponent</code> has a name. This name is unique in the model the <code>ModelComponent</code> belongs to.<br>
  * A <code>ModelComponent</code> has a position and size. The size can only be modified by subclasses.
  * 
@@ -28,7 +28,7 @@ public abstract class ModelComponent implements JSONSerializable
 	/**
 	 * The model this component is a part of.
 	 */
-	protected final ViewModelModifiable model;
+	protected final LogicModelModifiable model;
 	/**
 	 * The name of this component. Is unique for all components in its model.
 	 */
@@ -52,7 +52,18 @@ public abstract class ModelComponent implements JSONSerializable
 
 	// creation and destruction
 
-	public ModelComponent(ViewModelModifiable model, String name)
+	public ModelComponent(LogicModelModifiable model, String name)
+	{
+		this(model, name, true);
+	}
+
+	/**
+	 * Creates a new {@link ModelComponent} and, if <code>callInit</code>, initializes the component (See {@link #init()}).<br>
+	 * If <code>callInit==false</code>, make sure to call {@link #init()}!
+	 * 
+	 * @author Daniel Kirschten
+	 */
+	protected ModelComponent(LogicModelModifiable model, String name, boolean callInit)
 	{
 		this.model = model;
 		this.name = name == null ? model.getDefaultComponentName(this) : name;
@@ -65,21 +76,29 @@ public abstract class ModelComponent implements JSONSerializable
 		this.pinAddedListeners = new ArrayList<>();
 		this.pinRemovedListeners = new ArrayList<>();
 
-		// TODO this will crash the high level state debug shell because submodel is not yet set.
-		// The same problem exists in ViewModelModifiable.getDefaultComponentName; see there
+		if (callInit)
+			init();
+	}
+
+	/**
+	 * Initializes this component. This method should be called exactly once in this component's constructor.<br>
+	 * Currently, this method only registers this component in the model.
+	 */
+	protected void init()
+	{
 		model.componentCreated(this, this::destroyed);
 	}
 
 	/**
-	 * Destroys this component. This method is called from {@link ViewModelModifiable#componentDestroyed(ModelComponent) destroyComponent()}
-	 * of the model this component is a part of.<br>
+	 * Destroys this component. This method is called from {@link LogicModelModifiable#componentDestroyed(ModelComponent)
+	 * destroyComponent()} of the model this component is a part of.<br>
 	 * When overriding, make sure to also call the original implementation.
 	 * 
 	 * @author Daniel Kirschten
 	 */
 	protected void destroyed()
 	{
-		pinsByName.values().forEach(p -> pinRemovedListeners.forEach(l -> l.accept(p)));
+		pinsByName.values().forEach(this::removePinWithoutRedraw);
 	}
 
 	// pins
@@ -112,11 +131,16 @@ public abstract class ModelComponent implements JSONSerializable
 	 */
 	protected void removePin(String name)
 	{
-		Pin pin = pinsByName.remove(name);
-		callPinRemovedListeners(pin);
+		removePinWithoutRedraw(pinsByName.remove(name));
 		model.requestRedraw();
 	}
 
+	private void removePinWithoutRedraw(Pin pin)
+	{
+		pin.destroyed();
+		callPinRemovedListeners(pin);
+	}
+
 	/**
 	 * Returns a collection of pins of this component.
 	 *