X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2FGUIComponent.java;h=58c725dfea4fb2d323f379c142a24221926c255b;hb=9ca90120a47e07c9182162351dc47aa89ae703be;hp=4c86ae1d9d8bac84b4701fe5b4dbb0bc625792ec;hpb=f14ea37d69488dd51518a36413af7176916b8bd7;p=Mograsim.git

diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponent.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponent.java
index 4c86ae1d..58c725df 100644
--- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponent.java
+++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/components/GUIComponent.java
@@ -5,14 +5,14 @@ import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.TreeMap;
 import java.util.function.Consumer;
-import java.util.function.Supplier;
+
+import com.google.gson.JsonElement;
+import com.google.gson.JsonNull;
 
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 import net.mograsim.logic.ui.model.ViewModelModifiable;
-import net.mograsim.logic.ui.model.Visitable;
 import net.mograsim.logic.ui.model.wires.Pin;
 
 /**
@@ -21,7 +21,7 @@ import net.mograsim.logic.ui.model.wires.Pin;
  * 
  * @author Daniel Kirschten
  */
-public abstract class GUIComponent implements Visitable
+public abstract class GUIComponent
 {
 	/**
 	 * The model this component is a part of.
@@ -43,8 +43,6 @@ public abstract class GUIComponent implements Visitable
 	private final List<Runnable> redrawListeners;
 
 	private final Runnable redrawListenerForSubcomponents;
-	// Defines how the GUIComponent is referenced in SubmodelComponentParams
-	protected Supplier<String> identifierDelegate = () -> "class:".concat(getClass().getCanonicalName());
 
 	// creation and destruction
 
@@ -139,6 +137,38 @@ public abstract class GUIComponent implements Visitable
 		return pin;
 	}
 
+	// high-level access
+
+	/**
+	 * Sets the given high-level state to the given value. <br>
+	 * A high level state ID consists of parts separated by dots ('.').<br>
+	 * The last part (the part after the last dot) is called "atomic high level state ID". The parts before that part are called
+	 * "subcomponent ID"s.<br>
+	 * If there is no dot in a high level state ID, the whole high level state ID is called atomic.<br>
+	 * Note that subcomponent IDs don't have to correspond to actual subcomponents. For example, a RAM component may supply subcomponent IDs
+	 * "c0000", "c0001" ... "cFFFF" without actually having a subcomponent for each cell. It also is allowed for an atomic high level state
+	 * ID to be delegated to a subcomponent.
+	 * 
+	 * @author Daniel Kirschten
+	 */
+	@SuppressWarnings({ "static-method", "unused" }) // this method is intended to be overridden
+	public void setHighLevelState(String stateID, Object newState)
+	{
+		throw new IllegalArgumentException("No high level state with ID " + stateID);
+	}
+
+	/**
+	 * Gets the current value of the given high-level state. <br>
+	 * See {@link #setHighLevelState(String, Object)} for an explanation of high-level state IDs.
+	 * 
+	 * @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);
+	}
+
 	// "graphical" operations
 
 	/**
@@ -172,7 +202,7 @@ public abstract class GUIComponent implements Visitable
 	 * 
 	 * @author Daniel Kirschten
 	 */
-	public Rectangle getBounds()
+	public final Rectangle getBounds()
 	{
 		return new Rectangle(bounds.x, bounds.y, bounds.width, bounds.height);
 	}
@@ -238,18 +268,10 @@ public abstract class GUIComponent implements Visitable
 
 	// serializing
 
-	/**
-	 * @return an identifier used to reference this GUIComponent inside of {@link SubmodelComponentParams}
-	 */
-	public String getIdentifier()
-	{
-		return identifierDelegate.get();
-	}
-
-	@SuppressWarnings("static-method")
-	public Map<String, Object> getInstantiationParameters()
+	@SuppressWarnings("static-method") // this method is intended to be overridden
+	public JsonElement getParams()
 	{
-		return new TreeMap<>();
+		return JsonNull.INSTANCE;
 	}
 
 	// listeners