X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fwires%2FModelWire.java;h=8283749bde0227b8537db7d1fb25d9f111e823d6;hb=552986fd8718d5f2db00802015fdd1ecd58a5a2f;hp=1d7c9a44ceddfbe8c08c78d2e17bbd5bc7f6dce5;hpb=93b398d6271a538a2a4c9f4de07a3b4a8a2a7fd4;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/ModelWire.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/ModelWire.java
index 1d7c9a44..8283749b 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/ModelWire.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/wires/ModelWire.java
@@ -36,7 +36,7 @@ public class ModelWire
 	 */
 	public final String name;
 	/**
-	 * The logical width of this wire. Is equal to the logical with of {@link #pin1} and {@link #pin2}.
+	 * The logical width of this wire. Is equal to the logical width of {@link #pin1} and {@link #pin2}.
 	 */
 	public final int logicWidth;
 	/**
@@ -65,11 +65,11 @@ public class ModelWire
 	private final List<Consumer<ModelWire>> pathChangedListeners;
 
 	/**
-	 * A LogicObserver calling redrawListeners. Used for logic model bindings.
+	 * A LogicObserver calling redrawListeners. Used for core model bindings.
 	 */
 	private final LogicObserver logicObs;
 	/**
-	 * A ReadEnd of the logic wire this model wire currently is bound to.
+	 * A ReadEnd of the core wire this model wire currently is bound to.
 	 */
 	private ReadEnd end;
 
@@ -463,7 +463,7 @@ public class ModelWire
 		return new Point(p.x, p.y);
 	}
 
-	// logic model binding
+	// core model binding
 
 	/**
 	 * Binds this {@link ModelWire} to the given {@link ReadEnd}: The color of this {@link ModelWire} will now depend on the state of the
@@ -472,7 +472,7 @@ public class ModelWire
 	 * 
 	 * @author Daniel Kirschten
 	 */
-	public void setLogicModelBinding(ReadEnd end)
+	public void setCoreModelBinding(ReadEnd end)
 	{
 		if (this.end != null)
 			this.end.deregisterObserver(logicObs);
@@ -482,17 +482,17 @@ public class ModelWire
 	}
 
 	/**
-	 * Returns whether this {@link ModelWire} has a logic model binding or not.
+	 * Returns whether this {@link ModelWire} has a core model binding or not.
 	 * 
 	 * @author Daniel Kirschten
 	 */
-	public boolean hasLogicModelBinding()
+	public boolean hasCoreModelBinding()
 	{
 		return end != null;
 	}
 
 	/**
-	 * If this {@link ModelWire} has a logic model binding, delegates to {@link CoreWire#forceValues(BitVector)} for the {@link CoreWire}
+	 * If this {@link ModelWire} has a core model binding, delegates to {@link CoreWire#forceValues(BitVector)} for the {@link CoreWire}
 	 * corresponding to this {@link ModelWire}.
 	 * 
 	 * @author Daniel Kirschten
@@ -503,8 +503,8 @@ public class ModelWire
 	}
 
 	/**
-	 * If this {@link ModelWire} has a logic model binding, delegates to {@link ReadEnd#getValues()} for the {@link ReadEnd} corresponding
-	 * to this {@link ModelWire}.
+	 * If this {@link ModelWire} has a core model binding, delegates to {@link ReadEnd#getValues()} for the {@link ReadEnd} corresponding to
+	 * this {@link ModelWire}.
 	 * 
 	 * @author Daniel Kirschten
 	 */