Splitted ViewModel and ViewModelModifiable

[Mograsim.git] / net.mograsim.logic.ui / src / net / mograsim / logic / ui / model / wires / GUIWire.java

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/GUIWire.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/GUIWire.java
index 736c0ea..771e2e3 100644 (file)
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/GUIWire.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/GUIWire.java
@@ -2,29 +2,32 @@ package net.mograsim.logic.ui.model.wires;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.function.Consumer;
 
-import net.mograsim.logic.ui.ColorHelper;
-import net.mograsim.logic.ui.model.ViewModel;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
+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.ViewModelModifiable;
 
 public class GUIWire
 {
-       private final ViewModel model;
+       private final ViewModelModifiable model;
        public final int logicWidth;
        private Pin pin1;
        private Pin pin2;
        private double[] path;
 
-       private final List<Consumer<? super GUIWire>> wireLookChangedListeners;
+       private final List<Runnable> redrawListeners;
 
+       private final LogicObserver logicObs;
        private ReadEnd end;
 
-       public GUIWire(ViewModel model, Pin pin1, Pin pin2, Point... path)
+       public GUIWire(ViewModelModifiable model, Pin pin1, Pin pin2, Point... path)
        {
+               logicObs = (i) -> callRedrawListeners();
                this.model = model;
                this.logicWidth = pin1.logicWidth;
                if (pin2.logicWidth != pin1.logicWidth)
@@ -39,7 +42,7 @@ public class GUIWire
                this.pin1 = pin1;
                this.pin2 = pin2;
 
-               wireLookChangedListeners = new ArrayList<>();
+               redrawListeners = new ArrayList<>();
 
                pin1.addPinMovedListener(p -> pin1Moved());
                pin2.addPinMovedListener(p -> pin2Moved());
@@ -54,6 +57,7 @@ public class GUIWire
                Point pos = pin1.getPos();
                this.path[0] = pos.x;
                this.path[1] = pos.y;
+               callRedrawListeners();
        }
 
        private void pin2Moved()
@@ -61,6 +65,7 @@ public class GUIWire
                Point pos = pin2.getPos();
                this.path[this.path.length - 2] = pos.x;
                this.path[this.path.length - 1] = pos.y;
+               callRedrawListeners();
        }
 
        public void destroy()
@@ -75,8 +80,21 @@ public class GUIWire
 
        public void setLogicModelBinding(ReadEnd end)
        {
+               deregisterLogicObs(this.end);
                this.end = end;
-               end.addObserver((i, o) -> callWireLookChangedListeners());
+               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 Pin getPin1()
@@ -90,11 +108,11 @@ public class GUIWire
        }
 
        // @formatter:off
-       public void addWireLookChangedListener   (Consumer<? super GUIWire> listener) {wireLookChangedListeners.add   (listener);}
+       public void addRedrawListener   (Runnable listener) {redrawListeners         .add   (listener);}
 
-       public void removeWireLookChangedListener(Consumer<? super GUIWire> listener) {wireLookChangedListeners.remove(listener);}
+       public void removeRedrawListener(Runnable listener) {redrawListeners         .remove(listener);}
 
-       private void callWireLookChangedListeners() {wireLookChangedListeners.forEach(l -> l.accept(this));}
+       private void callRedrawListeners() {redrawListeners.forEach(l -> l.run());}
        // @formatter:on
 
 }
\ No newline at end of file