X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fwires%2FWireCrossPoint.java;fp=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fwires%2FWireCrossPoint.java;h=46262808fb76821df537e638b26e90c65e5d2a2c;hb=e7193d1fb16edc79e9cc3d8adcfb71caecd8463b;hp=927e4e508cec37acefbbae5f3b6267f3e8c52739;hpb=0cd1108bde5620d8d38001caea12471db3a5e633;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java
index 927e4e50..46262808 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java
@@ -1,23 +1,28 @@
 package net.mograsim.logic.ui.model.wires;
 
-import net.mograsim.logic.ui.ColorHelper;
-import net.mograsim.logic.ui.model.ViewModel;
-import net.mograsim.logic.ui.model.components.GUIComponent;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
+import net.mograsim.logic.core.LogicObservable;
+import net.mograsim.logic.core.LogicObserver;
 import net.mograsim.logic.core.types.BitVectorFormatter;
 import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.ui.ColorHelper;
+import net.mograsim.logic.ui.model.ViewModel;
+import net.mograsim.logic.ui.model.components.GUIComponent;
 
 public class WireCrossPoint extends GUIComponent
 {
 	private final Pin pin;
+	private final int logicWidth;
 
+	private final LogicObserver logicObs;
 	private ReadEnd end;
-	private final int logicWidth;
 
 	public WireCrossPoint(ViewModel model, int logicWidth)
 	{
 		super(model);
+		logicObs = (i) -> requestRedraw();
+
 		this.logicWidth = logicWidth;
 		setSize(0, 0);
 		addPin(this.pin = new Pin(this, logicWidth, 0, 0));
@@ -33,8 +38,21 @@ public class WireCrossPoint extends GUIComponent
 
 	public void setLogicModelBinding(ReadEnd end)
 	{
+		deregisterLogicObs(this.end);
 		this.end = end;
-		end.registerObserver((i) -> callComponentLookChangedListeners());
+		registerLogicObs(end);
+	}
+
+	private void registerLogicObs(LogicObservable observable)
+	{
+		if (observable != null)
+			observable.registerObserver(logicObs);
+	}
+
+	private void deregisterLogicObs(LogicObservable observable)
+	{
+		if (observable != null)
+			observable.deregisterObserver(logicObs);
 	}
 
 	public int getLogicWidth()