X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=LogicUI%2Fsrc%2Fera%2Fmi%2Fgui%2Fmodel%2FViewModel.java;h=7eb55c18166f9e3bac2e22f037dabf4b2f8457e1;hb=80bfbd8ebf0ad8a7ad98584544a0c73f43e6f3b6;hp=4eb81e876ab10ad53fde06fcfac58e53e05d4b8a;hpb=f2886cbd57dd08b797921fc2421b41bd92915799;p=Mograsim.git

diff --git a/LogicUI/src/era/mi/gui/model/ViewModel.java b/LogicUI/src/era/mi/gui/model/ViewModel.java
index 4eb81e87..7eb55c18 100644
--- a/LogicUI/src/era/mi/gui/model/ViewModel.java
+++ b/LogicUI/src/era/mi/gui/model/ViewModel.java
@@ -15,10 +15,10 @@ public class ViewModel
 	private final List<GUIWire> wires;
 	private final List<GUIWire> wiresUnmodifiable;
 
-	private final List<Consumer<GUIComponent>> componentAddedListeners;
-	private final List<Consumer<GUIComponent>> componentRemovedListeners;
-	private final List<Consumer<GUIWire>> wireAddedListeners;
-	private final List<Consumer<GUIWire>> wireRemovedListeners;
+	private final List<Consumer<? super GUIComponent>> componentAddedListeners;
+	private final List<Consumer<? super GUIComponent>> componentRemovedListeners;
+	private final List<Consumer<? super GUIWire>> wireAddedListeners;
+	private final List<Consumer<? super GUIWire>> wireRemovedListeners;
 
 	public ViewModel()
 	{
@@ -92,15 +92,15 @@ public class ViewModel
 	}
 
 	// @formatter:off
-	public void addComponentAddedListener     (Consumer<GUIComponent> listener){componentAddedListeners  .add   (listener);}
-	public void addComponentRemovedListener   (Consumer<GUIComponent> listener){componentRemovedListeners.add   (listener);}
-	public void addWireAddedListener          (Consumer<GUIWire     > listener){wireAddedListeners       .add   (listener);}
-	public void addWireRemovedListener        (Consumer<GUIWire     > listener){wireRemovedListeners     .add   (listener);}
+	public void addComponentAddedListener     (Consumer<? super GUIComponent> listener){componentAddedListeners  .add   (listener);}
+	public void addComponentRemovedListener   (Consumer<? super GUIComponent> listener){componentRemovedListeners.add   (listener);}
+	public void addWireAddedListener          (Consumer<? super GUIWire     > listener){wireAddedListeners       .add   (listener);}
+	public void addWireRemovedListener        (Consumer<? super GUIWire     > listener){wireRemovedListeners     .add   (listener);}
 
-	public void removeComponentAddedListener  (Consumer<GUIComponent> listener){componentAddedListeners  .remove(listener);}
-	public void removeComponentRemovedListener(Consumer<GUIComponent> listener){componentRemovedListeners.remove(listener);}
-	public void removeWireAddedListener       (Consumer<GUIWire     > listener){wireAddedListeners       .remove(listener);}
-	public void removeWireRemovedListener     (Consumer<GUIWire     > listener){wireRemovedListeners     .remove(listener);}
+	public void removeComponentAddedListener  (Consumer<? super GUIComponent> listener){componentAddedListeners  .remove(listener);}
+	public void removeComponentRemovedListener(Consumer<? super GUIComponent> listener){componentRemovedListeners.remove(listener);}
+	public void removeWireAddedListener       (Consumer<? super GUIWire     > listener){wireAddedListeners       .remove(listener);}
+	public void removeWireRemovedListener     (Consumer<? super GUIWire     > listener){wireRemovedListeners     .remove(listener);}
 
 	private void callComponentAddedListeners  (GUIComponent c) {componentAddedListeners  .forEach(l -> l.accept(c));}
 	private void callComponentRemovedListeners(GUIComponent c) {componentRemovedListeners.forEach(l -> l.accept(c));}