X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2FViewModel.java;h=c85f1fd3f037a94facd7c729ed70ca85cec6e76e;hb=bbe38c55aaa999d025f534245f9207a88643f6e5;hp=193813297d3584912290051a5875652a0a7a1647;hpb=47ea68ed5c444dd14864412639f6a6fd60ab8a0f;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModel.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModel.java
index 19381329..c85f1fd3 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModel.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/ViewModel.java
@@ -14,31 +14,29 @@ public class ViewModel
 {
 	private final Map<String, GUIComponent> components;
 	private final Map<String, GUIComponent> componentsUnmodifiable;
-	private final List<GUIWire> wires;
-	private final List<GUIWire> wiresUnmodifiable;
+	private final Map<String, GUIWire> wires;
+	private final Map<String, GUIWire> wiresUnmodifiable;
 
 	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;
-	private final List<Runnable> redrawListeners;
+	private final List<Consumer<? super Runnable>> redrawHandlerChangedListeners;
 
-	private final Runnable redrawListenerForSubcomponents;
+	private Runnable redrawHandler;
 
 	protected ViewModel()
 	{
 		components = new HashMap<>();
 		componentsUnmodifiable = Collections.unmodifiableMap(components);
-		wires = new ArrayList<>();
-		wiresUnmodifiable = Collections.unmodifiableList(wires);
+		wires = new HashMap<>();
+		wiresUnmodifiable = Collections.unmodifiableMap(wires);
 
 		componentAddedListeners = new ArrayList<>();
 		componentRemovedListeners = new ArrayList<>();
 		wireAddedListeners = new ArrayList<>();
 		wireRemovedListeners = new ArrayList<>();
-		redrawListeners = new ArrayList<>();
-
-		redrawListenerForSubcomponents = this::callRedrawListeners;
+		redrawHandlerChangedListeners = new ArrayList<>();
 	}
 
 	/**
@@ -51,8 +49,7 @@ public class ViewModel
 			throw new IllegalStateException("Don't add the same component twice!");
 		components.put(component.name, component);
 		callComponentAddedListeners(component);
-		component.addRedrawListener(redrawListenerForSubcomponents);
-		callRedrawListeners();
+		requestRedraw();
 	}
 
 	/**
@@ -65,8 +62,7 @@ public class ViewModel
 			throw new IllegalStateException("Don't remove the same component twice!");
 		components.remove(component.name);
 		callComponentRemovedListeners(component);
-		component.removeRedrawListener(redrawListenerForSubcomponents);
-		callRedrawListeners();
+		requestRedraw();
 	}
 
 	/**
@@ -75,12 +71,11 @@ public class ViewModel
 	 */
 	protected void wireCreated(GUIWire wire)
 	{
-		if (wires.contains(wire))
+		if (wires.containsKey(wire.name))
 			throw new IllegalStateException("Don't add the same wire twice!");
-		wires.add(wire);
+		wires.put(wire.name, wire);
 		callWireAddedListeners(wire);
-		wire.addRedrawListener(redrawListenerForSubcomponents);
-		callRedrawListeners();
+		requestRedraw();
 	}
 
 	/**
@@ -89,12 +84,11 @@ public class ViewModel
 	 */
 	protected void wireDestroyed(GUIWire wire)
 	{
-		if (!wires.contains(wire))
+		if (!wires.containsKey(wire.name))
 			throw new IllegalStateException("Don't remove the same wire twice!");
-		wires.remove(wire);
+		wires.remove(wire.name);
 		callWireRemovedListeners(wire);
-		wire.removeRedrawListener(redrawListenerForSubcomponents);
-		callRedrawListeners();
+		requestRedraw();
 	}
 
 	public Map<String, GUIComponent> getComponentsByName()
@@ -102,28 +96,45 @@ public class ViewModel
 		return componentsUnmodifiable;
 	}
 
-	public List<GUIWire> getWires()
+	public Map<String, GUIWire> getWiresByName()
 	{
 		return wiresUnmodifiable;
 	}
 
 	// @formatter:off
-	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 addRedrawListener             (Runnable                       listener) {redrawListeners          .add   (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);}
-	public void removeRedrawListener          (Runnable                       listener) {redrawListeners          .remove(listener);}
-
-	private void callComponentAddedListeners  (GUIComponent c) {componentAddedListeners  .forEach(l -> l.accept(c));}
-	private void callComponentRemovedListeners(GUIComponent c) {componentRemovedListeners.forEach(l -> l.accept(c));}
-	private void callWireAddedListeners       (GUIWire w     ) {wireAddedListeners       .forEach(l -> l.accept(w));}
-	private void callWireRemovedListeners     (GUIWire w     ) {wireRemovedListeners     .forEach(l -> l.accept(w));}
-	private void callRedrawListeners          (              ) {redrawListeners          .forEach(l -> l.run(    ));}
+	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 addRedrawHandlerChangedListener   (Consumer<? super Runnable    > listener) {redrawHandlerChangedListeners.add   (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);}
+	public void removeRedrawHandlerChangedListener(Consumer<? super Runnable    > listener) {redrawHandlerChangedListeners.remove(listener);}
+
+	private void callComponentAddedListeners     (GUIComponent c) {componentAddedListeners      .forEach(l -> l.accept(c));}
+	private void callComponentRemovedListeners   (GUIComponent c) {componentRemovedListeners    .forEach(l -> l.accept(c));}
+	private void callWireAddedListeners          (GUIWire      w) {wireAddedListeners           .forEach(l -> l.accept(w));}
+	private void callWireRemovedListeners        (GUIWire      w) {wireRemovedListeners         .forEach(l -> l.accept(w));}
+	private void callRedrawHandlerChangedListener(Runnable     r) {redrawHandlerChangedListeners.forEach(l -> l.accept(r));}
 	// @formatter:on
+
+	public void setRedrawHandler(Runnable handler)
+	{
+		this.redrawHandler = handler;
+		callRedrawHandlerChangedListener(handler);
+	}
+
+	public Runnable getRedrawHandler()
+	{
+		return redrawHandler;
+	}
+
+	public void requestRedraw()
+	{
+		if (redrawHandler != null)
+			redrawHandler.run();
+	}
 }
\ No newline at end of file