X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2FGUIComponent.java;h=85b1e5a081b7d2598d722cb89b1790c258b90047;hb=3977f16649531ca3ba345c9cd5ec365e0b804783;hp=1b97cd311dbbd16f89337b039d1f9a9c577fcbfa;hpb=b5d8c2d71e27350ea7c9314e40df5bb0584271cd;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 1b97cd31..85b1e5a0 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,22 +14,26 @@ 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.snippets.HighLevelStateHandler;
+import net.mograsim.logic.model.serializing.IdentifierGetter;
+import net.mograsim.logic.model.serializing.JSONSerializable;
+import net.mograsim.logic.model.snippets.HighLevelStateHandler;
/**
* The base class for all GUI components.
- * A GUIComponent
has a position and size. The size can only be modified by subclasses.
+ * A GUIComponent
has a reference to the ViewModel it belongs to.
+ * A GUIComponent
has a name. This name is unique in the model the GUIComponent
belongs to.
+ * A GUIComponent
has a position and size. The size can only be modified by subclasses.
*
* @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;
@@ -49,6 +53,9 @@ public abstract class GUIComponent
private final List redrawListeners;
private final Runnable redrawListenerForSubcomponents;
+
+ private HighLevelStateHandler highLevelStateHandler;
+
// creation and destruction
public GUIComponent(ViewModelModifiable model, String name)
@@ -147,33 +154,44 @@ public abstract class GUIComponent
// high-level access
/**
- * Sets the given high-level state to the given value.
- * See {@link HighLevelStateHandler#setHighLevelState(String, Object)} 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;
}
/**
* Gets the current value of the given high-level state.
- * See {@link HighLevelStateHandler#setHighLevelState(String, Object)} for an explanation of high-level state IDs.
+ * See {@link HighLevelStateHandler} for an explanation of high-level state IDs.
*
* @see #setHighLevelState(String, Object)
* @see HighLevelStateHandler#getHighLevelState(String)
*
* @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.
+ * 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
@@ -276,8 +294,8 @@ public abstract class GUIComponent
// serializing
- @SuppressWarnings("static-method") // this method is intended to be overridden
- public JsonElement getParams()
+ @Override
+ public JsonElement getParamsForSerializing(IdentifierGetter idGetter)
{
return JsonNull.INSTANCE;
}