X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=LogicUI%2Fsrc%2Fera%2Fmi%2Fgui%2Fmodel%2Fcomponents%2FGUIComponent.java;h=dc06461785f3847b9b7203d60788663ddbe4c68a;hb=e618fa725540dd5f92ccf0ed7d65acdc8eb83f93;hp=7f4107d76f701f599be61da521f56da3a0de24b5;hpb=4a6a0a2c85c1a16112efaf7ca6d2b5fba3c9b466;p=Mograsim.git

diff --git a/LogicUI/src/era/mi/gui/model/components/GUIComponent.java b/LogicUI/src/era/mi/gui/model/components/GUIComponent.java
index 7f4107d7..dc064617 100644
--- a/LogicUI/src/era/mi/gui/model/components/GUIComponent.java
+++ b/LogicUI/src/era/mi/gui/model/components/GUIComponent.java
@@ -17,10 +17,10 @@ public abstract class GUIComponent
 	private final List<Pin> pins;
 	protected final List<Pin> pinsUnmodifiable;
 
-	private final List<Consumer<GUIComponent>> componentChangedListeners;
-	private final List<Consumer<GUIComponent>> componentMovedListeners;
-	private final List<Consumer<Pin>> pinAddedListeners;
-	private final List<Consumer<Pin>> pinRemovedListeners;
+	private final List<Consumer<? super GUIComponent>> componentChangedListeners;
+	private final List<Consumer<? super GUIComponent>> componentMovedListeners;
+	private final List<Consumer<? super Pin>> pinAddedListeners;
+	private final List<Consumer<? super Pin>> pinRemovedListeners;
 
 	public GUIComponent(ViewModel model)
 	{
@@ -33,6 +33,14 @@ public abstract class GUIComponent
 		this.componentMovedListeners = new ArrayList<>();
 		this.pinAddedListeners = new ArrayList<>();
 		this.pinRemovedListeners = new ArrayList<>();
+
+		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)
@@ -50,9 +58,9 @@ public abstract class GUIComponent
 		return new Rectangle(bounds.x, bounds.y, bounds.width, bounds.height);
 	}
 
-	// TODO
 	/**
-	 * Called when this component is clicked. Relative coordinates of the click are given. Returns true if this component has to be redrawn.
+	 * Called when this component is clicked. Absolute coordinates of the click are given. Returns true if this component consumed this
+	 * click.
 	 */
 	public boolean clicked(double x, double y)
 	{
@@ -68,21 +76,21 @@ public abstract class GUIComponent
 	}
 
 	// @formatter:off
-	public void addComponentChangedListener   (Consumer<GUIComponent> listener) {componentChangedListeners.add   (listener);}
-	public void addComponentMovedListener     (Consumer<GUIComponent> listener) {componentMovedListeners  .add   (listener);}
-	public void addPinAddedListener           (Consumer<Pin         > listener) {pinAddedListeners        .add   (listener);}
-	public void addPinRemovedListener         (Consumer<Pin         > listener) {pinRemovedListeners      .add   (listener);}
-
-	public void removeComponentChangedListener(Consumer<GUIComponent> listener) {componentChangedListeners.remove(listener);}
-	public void removeComponentMovedListener  (Consumer<GUIComponent> listener) {componentMovedListeners  .remove(listener);}
-	public void removePinAddedListener        (Consumer<Pin         > listener) {pinAddedListeners        .remove(listener);}
-	public void removePinRemovedListener      (Consumer<Pin         > listener) {pinRemovedListeners      .remove(listener);}
-
-	private void callComponentChangedListeners(     ) {componentChangedListeners.forEach(l -> l.accept(this));}
-	private void callComponentMovedListeners  (     ) {componentMovedListeners  .forEach(l -> l.accept(this));}
-	private void callPinAddedListeners        (Pin p) {pinAddedListeners        .forEach(l -> l.accept(p   ));}
-	private void callPinRemovedListeners      (Pin p) {pinRemovedListeners      .forEach(l -> l.accept(p   ));}
-	// @formatter:on
+	public void addComponentChangedListener   (Consumer<? super GUIComponent> listener) {componentChangedListeners.add   (listener);}
+	public void addComponentMovedListener     (Consumer<? super GUIComponent> listener) {componentMovedListeners  .add   (listener);}
+	public void addPinAddedListener           (Consumer<? super Pin         > listener) {pinAddedListeners        .add   (listener);}
+	public void addPinRemovedListener         (Consumer<? super Pin         > listener) {pinRemovedListeners      .add   (listener);}
+
+	public void removeComponentChangedListener(Consumer<? super GUIComponent> listener) {componentChangedListeners.remove(listener);}
+	public void removeComponentMovedListener  (Consumer<? super GUIComponent> listener) {componentMovedListeners  .remove(listener);}
+	public void removePinAddedListener        (Consumer<? super Pin         > listener) {pinAddedListeners        .remove(listener);}
+	public void removePinRemovedListener      (Consumer<? super Pin         > listener) {pinRemovedListeners      .remove(listener);}
+
+	protected void callComponentChangedListeners(     ) {componentChangedListeners.forEach(l -> l.accept(this));}
+	private   void callComponentMovedListeners  (     ) {componentMovedListeners  .forEach(l -> l.accept(this));}
+	private   void callPinAddedListeners        (Pin p) {pinAddedListeners        .forEach(l -> l.accept(p   ));}
+	private   void callPinRemovedListeners      (Pin p) {pinRemovedListeners      .forEach(l -> l.accept(p   ));}
+	// @form  atter:on
 
 	/**
 	 * Render this component to the given gc.