X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fwires%2FModelWireCrossPoint.java;h=0a634992a15b54bfd630830d162a2aa6fc313bd1;hb=1f645882d229fc3d4081e4c5060559d75dc2cc24;hp=f8d32ac5c9f3949a93f59527ff57eea0ece203e8;hpb=93b398d6271a538a2a4c9f4de07a3b4a8a2a7fd4;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/ModelWireCrossPoint.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/ModelWireCrossPoint.java
index f8d32ac5..0a634992 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/ModelWireCrossPoint.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/ModelWireCrossPoint.java
@@ -5,7 +5,7 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 import net.mograsim.logic.core.LogicObserver;
 import net.mograsim.logic.core.types.BitVectorFormatter;
 import net.mograsim.logic.core.wires.CoreWire.ReadEnd;
-import net.mograsim.logic.model.model.ViewModelModifiable;
+import net.mograsim.logic.model.model.LogicModelModifiable;
 import net.mograsim.logic.model.model.components.ModelComponent;
 import net.mograsim.logic.model.serializing.IdentifyParams;
 import net.mograsim.logic.model.serializing.IndirectModelComponentCreator;
@@ -46,19 +46,19 @@ public class ModelWireCrossPoint extends ModelComponent
 
 	// creation and destruction
 
-	public ModelWireCrossPoint(ViewModelModifiable model, int logicWidth)
+	public ModelWireCrossPoint(LogicModelModifiable model, int logicWidth)
 	{
 		this(model, logicWidth, null);
 	}
 
-	public ModelWireCrossPoint(ViewModelModifiable model, int logicWidth, String name)
+	public ModelWireCrossPoint(LogicModelModifiable model, int logicWidth, String name)
 	{
 		super(model, name);
 		this.logicWidth = logicWidth;
 		logicObs = (i) -> model.requestRedraw();
 
 		setSize(CIRCLE_DIAM, CIRCLE_DIAM);
-		addPin(this.pin = new Pin(this, "", logicWidth, PinUsage.TRISTATE, CIRCLE_RADIUS, CIRCLE_RADIUS));
+		addPin(this.pin = new Pin(model, this, "", logicWidth, PinUsage.TRISTATE, CIRCLE_RADIUS, CIRCLE_RADIUS));
 	}
 
 	// pins
@@ -89,7 +89,7 @@ public class ModelWireCrossPoint extends ModelComponent
 		gc.fillOval(getPosX(), getPosY(), CIRCLE_DIAM, CIRCLE_DIAM);
 	}
 
-	// logic model binding
+	// core model binding
 
 	/**
 	 * Binds this {@link ModelWireCrossPoint} to the given {@link ReadEnd}: The color of this {@link ModelWireCrossPoint} will now depend on
@@ -99,7 +99,7 @@ public class ModelWireCrossPoint extends ModelComponent
 	 * 
 	 * @author Daniel Kirschten
 	 */
-	public void setLogicModelBinding(ReadEnd end)
+	public void setCoreModelBinding(ReadEnd end)
 	{
 		if (this.end != null)
 			this.end.deregisterObserver(logicObs);
@@ -109,9 +109,9 @@ public class ModelWireCrossPoint extends ModelComponent
 	}
 
 	/**
-	 * Returns whether this {@link ModelWireCrossPoint} has a logic model binding or not.
+	 * Returns whether this {@link ModelWireCrossPoint} has a core model binding or not.
 	 */
-	public boolean hasLogicModelBinding()
+	public boolean hasCoreModelBinding()
 	{
 		return end != null;
 	}