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=bf9ea85bebfa82e37756cf3b38890dd0a661d0ee;hb=5ece0acf049bf9af2933f513fe0206565681f622;hp=655422a5b7c51c7a03d7db0ef158ab20d27b1526;hpb=35df5a4186f12073d5cdc956b645b882b43b858a;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 655422a5..bf9ea85b 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,16 @@ 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.wires.Pin;
+import net.mograsim.logic.ui.serializing.snippets.HighLevelStateHandler;
/**
* The base class for all GUI components.
@@ -26,6 +28,10 @@ public abstract class GUIComponent
* The model this component is a part of.
*/
protected final ViewModelModifiable model;
+ /**
+ * The name of this component. Is unique in its model.
+ */
+ public final String name;
private final Rectangle bounds;
/**
* The list of all pins of this component by name.
@@ -37,24 +43,24 @@ public abstract class GUIComponent
protected final Map pinsUnmodifiable;
private final List> componentMovedListeners;
+ private final List> componentResizedListeners;
private final List> pinAddedListeners;
private final List> pinRemovedListeners;
private final List redrawListeners;
private final Runnable redrawListenerForSubcomponents;
- // Defines how the GUIComponent is referenced in SubmodelComponentParams
- protected Supplier identifierDelegate = () -> getClass().getSimpleName();
-
// creation and destruction
- public GUIComponent(ViewModelModifiable model)
+ public GUIComponent(ViewModelModifiable model, String name)
{
this.model = model;
+ this.name = name == null ? model.getDefaultComponentName(this) : name;
this.bounds = new Rectangle(0, 0, 0, 0);
this.pinsByName = new HashMap<>();
this.pinsUnmodifiable = Collections.unmodifiableMap(pinsByName);
this.componentMovedListeners = new ArrayList<>();
+ this.componentResizedListeners = new ArrayList<>();
this.pinAddedListeners = new ArrayList<>();
this.pinRemovedListeners = new ArrayList<>();
this.redrawListeners = new ArrayList<>();
@@ -142,13 +148,10 @@ public abstract class GUIComponent
/**
* Sets the given high-level state to the given value.
- * A high level state ID consists of parts separated by dots ('.').
- * 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.
- * If there is no dot in a high level state ID, the whole high level state ID is called atomic.
- * 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.
+ * 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
*/
@@ -160,7 +163,10 @@ public abstract class GUIComponent
/**
* Gets the current value of the given high-level state.
- * See {@link #setHighLevelState(String, Object)} for an explanation of high-level state IDs.
+ * See {@link HighLevelStateHandler#setHighLevelState(String, Object)} for an explanation of high-level state IDs.
+ *
+ * @see #setHighLevelState(String, Object)
+ * @see HighLevelStateHandler#getHighLevelState(String)
*
* @author Daniel Kirschten
*/
@@ -194,6 +200,7 @@ public abstract class GUIComponent
{
bounds.width = width;
bounds.height = height;
+ callComponentResizedListener();
requestRedraw();
}
@@ -269,18 +276,10 @@ public abstract class GUIComponent
// serializing
- /**
- * @return an identifier used to reference this GUIComponent inside of {@link SubmodelComponentParams}
- */
- public String getIdentifier()
- {
- return identifierDelegate.get();
- }
-
- @SuppressWarnings("static-method")
- public Map getInstantiationParameters()
+ @SuppressWarnings("static-method") // this method is intended to be overridden
+ public JsonElement getParams()
{
- return new TreeMap<>();
+ return JsonNull.INSTANCE;
}
// listeners
@@ -296,19 +295,22 @@ public abstract class GUIComponent
}
// @formatter:off
- public void addComponentMovedListener (Consumer listener) {componentMovedListeners.add (listener);}
- public void addPinAddedListener (Consumer listener) {pinAddedListeners .add (listener);}
- public void addPinRemovedListener (Consumer listener) {pinRemovedListeners .add (listener);}
- public void addRedrawListener (Runnable listener) {redrawListeners .add (listener);}
-
- public void removeComponentMovedListener(Consumer listener) {componentMovedListeners .remove(listener);}
- public void removePinAddedListener (Consumer listener) {pinAddedListeners .remove(listener);}
- public void removePinRemovedListener (Consumer listener) {pinRemovedListeners .remove(listener);}
- public void removeRedrawListener (Runnable listener) {redrawListeners .remove(listener);}
-
- private void callComponentMovedListeners( ) {componentMovedListeners.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( ));}
+ public void addComponentMovedListener (Consumer listener) {componentMovedListeners .add (listener);}
+ public void addComponentResizedListener (Consumer listener) {componentResizedListeners.add (listener);}
+ public void addPinAddedListener (Consumer listener) {pinAddedListeners .add (listener);}
+ public void addPinRemovedListener (Consumer listener) {pinRemovedListeners .add (listener);}
+ public void addRedrawListener (Runnable listener) {redrawListeners .add (listener);}
+
+ public void removeComponentMovedListener (Consumer listener) {componentMovedListeners .remove(listener);}
+ public void removeComponentResizedListener (Consumer listener) {componentResizedListeners.remove(listener);}
+ public void removePinAddedListener (Consumer listener) {pinAddedListeners .remove(listener);}
+ public void removePinRemovedListener (Consumer 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