X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2FGUIBitDisplay.java;fp=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2FGUIBitDisplay.java;h=3b909c51763f8ce1d6f9d87bcf8047cd91ed412f;hb=67c7e16eac6ef555f7ebe0cbe6048598d7f1187e;hp=b9c8a103a9ffe6e6fb509f60b7c6562b60fba4cf;hpb=847dd0a23c86ddd67c16c47170ae7e7732682140;p=Mograsim.git diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIBitDisplay.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIBitDisplay.java index b9c8a103..3b909c51 100644 --- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIBitDisplay.java +++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIBitDisplay.java @@ -6,7 +6,6 @@ import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Font; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; -import net.mograsim.logic.core.LogicObservable; import net.mograsim.logic.core.LogicObserver; import net.mograsim.logic.core.components.BitDisplay; import net.mograsim.logic.core.types.BitVectorFormatter; @@ -58,21 +57,16 @@ public class GUIBitDisplay extends GUIComponent public void setLogicModelBinding(BitDisplay bitDisplay) { - deregisterLogicObs(this.bitDisplay); + if (this.bitDisplay != null) + this.bitDisplay.deregisterObserver(logicObs); this.bitDisplay = bitDisplay; - registerLogicObs(bitDisplay); + if (bitDisplay != null) + bitDisplay.registerObserver(logicObs); } - private void registerLogicObs(LogicObservable observable) + public boolean hasLogicModelBinding() { - if (observable != null) - observable.registerObserver(logicObs); - } - - private void deregisterLogicObs(LogicObservable observable) - { - if (observable != null) - observable.deregisterObserver(logicObs); + return bitDisplay != null; } public BitDisplay getBitDisplay()