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=2ffe890f27e35e23a0662d1bdf0fcbf0ec7a1766;hb=a36b5eded424a8c480140e9ce853145c2bcc9d7e;hp=c488de0633b2d9c57ba4bb696c9e056313d46915;hpb=a86976434d00dce2652d93256cc12b6e3a0f324a;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 c488de06..2ffe890f 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,7 +26,7 @@ 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.
@@ -51,6 +53,9 @@ public abstract class GUIComponent
 	private final List<Runnable> redrawListeners;
 
 	private final Runnable redrawListenerForSubcomponents;
+
+	private HighLevelStateHandler highLevelStateHandler;
+
 	// creation and destruction
 
 	public GUIComponent(ViewModelModifiable model, String name)
@@ -69,6 +74,8 @@ public abstract class GUIComponent
 
 		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);
 	}
 
@@ -149,18 +156,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 +177,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
@@ -278,8 +296,8 @@ 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;
 	}