Added destroy for GUIComponent and GUIWire

diff --git a/LogicUI/src/era/mi/gui/LogicUICanvas.java b/LogicUI/src/era/mi/gui/LogicUICanvas.java
index da33801..0b7641e 100644 (file)
--- a/LogicUI/src/era/mi/gui/LogicUICanvas.java
+++ b/LogicUI/src/era/mi/gui/LogicUICanvas.java
@@ -29,6 +29,8 @@ public class LogicUICanvas extends ZoomableCanvas
 
                model.addComponentAddedListener(c -> redrawThreadsafe());
                model.addWireAddedListener(c -> redrawThreadsafe());
+               model.addComponentRemovedListener(c -> redrawThreadsafe());
+               model.addWireRemovedListener(c -> redrawThreadsafe());
 
                addZoomedRenderer(gc ->
                {

diff --git a/LogicUI/src/era/mi/gui/model/components/GUIComponent.java b/LogicUI/src/era/mi/gui/model/components/GUIComponent.java
index cf9b23a..e266afb 100644 (file)
--- a/LogicUI/src/era/mi/gui/model/components/GUIComponent.java
+++ b/LogicUI/src/era/mi/gui/model/components/GUIComponent.java
@@ -37,6 +37,12 @@ public abstract class GUIComponent
                model.componentCreated(this);
        }
 
+       public void destroy()
+       {
+               pins.forEach(p -> pinRemovedListeners.forEach(l -> l.accept(p)));
+               model.componentDestroyed(this);
+       }
+
        public void moveTo(double x, double y)
        {
                bounds.x = x;

diff --git a/LogicUI/src/era/mi/gui/model/wires/GUIWire.java b/LogicUI/src/era/mi/gui/model/wires/GUIWire.java
index 649ddb6..1121335 100644 (file)
--- a/LogicUI/src/era/mi/gui/model/wires/GUIWire.java
+++ b/LogicUI/src/era/mi/gui/model/wires/GUIWire.java
@@ -11,6 +11,7 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 
 public class GUIWire
 {
+       private final ViewModel model;
        private Pin pin1;
        private Pin pin2;
        private double[] path;
@@ -19,6 +20,7 @@ public class GUIWire
 
        public GUIWire(ViewModel model, Pin pin1, Pin pin2, Point... path)
        {
+               this.model = model;
                this.path = new double[path.length * 2 + 4];
                for (int srcI = 0, dstI = 2; srcI < path.length; srcI++, dstI += 2)
                {
@@ -37,6 +39,11 @@ public class GUIWire
                model.wireCreated(this);
        }
 
+       public void destroy()
+       {
+               model.wireDestroyed(this);
+       }
+
        public void render(GeneralGC gc)
        {
                Color oldFG = gc.getForeground();

diff --git a/LogicUI/src/era/mi/gui/model/wires/Pin.java b/LogicUI/src/era/mi/gui/model/wires/Pin.java
index 3dc8967..cf59640 100644 (file)
--- a/LogicUI/src/era/mi/gui/model/wires/Pin.java
+++ b/LogicUI/src/era/mi/gui/model/wires/Pin.java
@@ -11,6 +11,7 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 public class Pin
 {
        public final GUIComponent component;
+
        protected double relX;
        protected double relY;