X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2FGUIComponent.java;h=60e8fb2a782e2dcd2d0f2c01f69094cc932e83fd;hb=026db85f46b6ea58e765ecff069545728eebdcac;hp=4baf33527e8f8907c0889fdf35ae78cd894c5b8c;hpb=a00663c79d0e26b494ff79eee4b6c049f086c7e0;p=Mograsim.git

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/GUIComponent.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/GUIComponent.java
index 4baf3352..60e8fb2a 100644
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/GUIComponent.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/GUIComponent.java
@@ -14,6 +14,8 @@ import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 import net.mograsim.logic.model.model.ViewModelModifiable;
 import net.mograsim.logic.model.model.wires.Pin;
+import net.mograsim.logic.model.serializing.IdentifierGetter;
+import net.mograsim.logic.model.serializing.JSONSerializable;
 import net.mograsim.logic.model.snippets.HighLevelStateHandler;
 
 /**
@@ -24,14 +26,14 @@ import net.mograsim.logic.model.snippets.HighLevelStateHandler;
  * 
  * @author Daniel Kirschten
  */
-public abstract class GUIComponent
+public abstract class GUIComponent implements JSONSerializable
 {
 	/**
 	 * The model this component is a part of.
 	 */
 	protected final ViewModelModifiable model;
 	/**
-	 * The name of this component. Is unique in its model.
+	 * The name of this component. Is unique for all components in its model.
 	 */
 	public final String name;
 	private final Rectangle bounds;
@@ -48,9 +50,9 @@ public abstract class GUIComponent
 	private final List<Consumer<? super GUIComponent>> componentResizedListeners;
 	private final List<Consumer<? super Pin>> pinAddedListeners;
 	private final List<Consumer<? super Pin>> pinRemovedListeners;
-	private final List<Runnable> redrawListeners;
 
-	private final Runnable redrawListenerForSubcomponents;
+	private HighLevelStateHandler highLevelStateHandler;
+
 	// creation and destruction
 
 	public GUIComponent(ViewModelModifiable model, String name)
@@ -65,10 +67,9 @@ public abstract class GUIComponent
 		this.componentResizedListeners = new ArrayList<>();
 		this.pinAddedListeners = new ArrayList<>();
 		this.pinRemovedListeners = new ArrayList<>();
-		this.redrawListeners = new ArrayList<>();
-
-		redrawListenerForSubcomponents = this::requestRedraw;
 
+		// TODO this will crash the high level state debug shell because submodel is not yet set.
+		// The same problem exists in ViewModelModifiable.getDefaultComponentName; see there
 		model.componentCreated(this);
 	}
 
@@ -102,8 +103,7 @@ public abstract class GUIComponent
 			throw new IllegalArgumentException("Duplicate pin name: " + pin.name);
 		pinsByName.put(pin.name, pin);
 		callPinAddedListeners(pin);
-		pin.addRedrawListener(redrawListenerForSubcomponents);
-		requestRedraw();
+		model.requestRedraw();
 	}
 
 	/**
@@ -117,8 +117,7 @@ public abstract class GUIComponent
 	{
 		Pin pin = pinsByName.remove(name);
 		callPinRemovedListeners(pin);
-		pin.removeRedrawListener(redrawListenerForSubcomponents);
-		requestRedraw();
+		model.requestRedraw();
 	}
 
 	/**
@@ -149,18 +148,16 @@ public abstract class GUIComponent
 	// high-level access
 
 	/**
-	 * Sets the given high-level state to the given value. <br>
-	 * See {@link HighLevelStateHandler} for an explanation of high-level state IDs.
-	 * 
-	 * @see #getHighLevelState(String)
-	 * @see HighLevelStateHandler#setHighLevelState(String, Object)
-	 * 
 	 * @author Daniel Kirschten
 	 */
-	@SuppressWarnings({ "static-method", "unused" }) // this method is intended to be overridden
-	public void setHighLevelState(String stateID, Object newState)
+	protected void setHighLevelStateHandler(HighLevelStateHandler highLevelStateHandler)
+	{
+		this.highLevelStateHandler = highLevelStateHandler;
+	}
+
+	public HighLevelStateHandler getHighLevelStateHandler()
 	{
-		throw new IllegalArgumentException("No high level state with ID " + stateID);
+		return highLevelStateHandler;
 	}
 
 	/**
@@ -172,10 +169,23 @@ public abstract class GUIComponent
 	 * 
 	 * @author Daniel Kirschten
 	 */
-	@SuppressWarnings("static-method") // this method is intended to be overridden
 	public Object getHighLevelState(String stateID)
 	{
-		throw new IllegalArgumentException("No high level state with ID " + stateID);
+		return highLevelStateHandler.getHighLevelState(stateID);
+	}
+
+	/**
+	 * Sets the given high-level state to the given value. <br>
+	 * See {@link HighLevelStateHandler} for an explanation of high-level state IDs.
+	 * 
+	 * @see #getHighLevelState(String)
+	 * @see HighLevelStateHandler#setHighLevelState(String, Object)
+	 * 
+	 * @author Daniel Kirschten
+	 */
+	public void setHighLevelState(String stateID, Object newState)
+	{
+		highLevelStateHandler.setHighLevelState(stateID, newState);
 	}
 
 	// "graphical" operations
@@ -190,7 +200,7 @@ public abstract class GUIComponent
 		bounds.x = x;
 		bounds.y = y;
 		callComponentMovedListeners();
-		requestRedraw();
+		model.requestRedraw();
 	}
 
 	/**
@@ -203,7 +213,7 @@ public abstract class GUIComponent
 		bounds.width = width;
 		bounds.height = height;
 		callComponentResizedListener();
-		requestRedraw();
+		model.requestRedraw();
 	}
 
 	/**
@@ -278,41 +288,28 @@ public abstract class GUIComponent
 
 	// serializing
 
-	@SuppressWarnings("static-method") // this method is intended to be overridden
-	public JsonElement getParamsForSerializing()
+	@Override
+	public JsonElement getParamsForSerializing(IdentifierGetter idGetter)
 	{
 		return JsonNull.INSTANCE;
 	}
 
 	// listeners
 
-	/**
-	 * Calls redraw listeners.
-	 * 
-	 * @author Daniel Kirschten
-	 */
-	protected void requestRedraw()
-	{
-		callRedrawListeners();
-	}
-
 	// @formatter:off
 	public void addComponentMovedListener      (Consumer<? super GUIComponent> listener) {componentMovedListeners  .add   (listener);}
 	public void addComponentResizedListener    (Consumer<? super GUIComponent> listener) {componentResizedListeners.add   (listener);}
 	public void addPinAddedListener            (Consumer<? super Pin         > listener) {pinAddedListeners        .add   (listener);}
 	public void addPinRemovedListener          (Consumer<? super Pin         > listener) {pinRemovedListeners      .add   (listener);}
-	public void addRedrawListener              (Runnable                       listener) {redrawListeners          .add   (listener);}
 
 	public void removeComponentMovedListener   (Consumer<? super GUIComponent> listener) {componentMovedListeners  .remove(listener);}
 	public void removeComponentResizedListener (Consumer<? super GUIComponent> listener) {componentResizedListeners.remove(listener);}
 	public void removePinAddedListener         (Consumer<? super Pin         > listener) {pinAddedListeners        .remove(listener);}
 	public void removePinRemovedListener       (Consumer<? super Pin         > listener) {pinRemovedListeners      .remove(listener);}
-	public void removeRedrawListener           (Runnable                       listener) {redrawListeners          .remove(listener);}
 
 	private void callComponentMovedListeners (     ) {componentMovedListeners  .forEach(l -> l.accept(this));}
 	private void callComponentResizedListener(     ) {componentResizedListeners.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   ));}
-	private void callRedrawListeners         (     ) {redrawListeners          .forEach(l -> l.run(       ));}
 	// @formatter:on
 }
\ No newline at end of file