X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;ds=inline;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fcomponents%2FGUIComponent.java;h=83e6d61d47829187a46a9af099cf28143a7ee9fb;hb=6a7d43ee5a2b2964389e46fc027e47e426774ea1;hp=f9294036a20148bf3ad0e6fef789b0e67aaf9618;hpb=01c5d7035474a5eb58f216b6831b2c0d8c174efa;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 f9294036..83e6d61d 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,15 +5,15 @@ 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.SubmodelComponentParams;
/**
* The base class for all GUI components.
@@ -38,14 +38,12 @@ 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)
@@ -56,6 +54,7 @@ public abstract class GUIComponent
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<>();
@@ -195,6 +194,7 @@ public abstract class GUIComponent
{
bounds.width = width;
bounds.height = height;
+ callComponentResizedListener();
requestRedraw();
}
@@ -270,18 +270,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
@@ -297,19 +289,22 @@ public abstract class GUIComponent
}
// @formatter:off
- public void addComponentMovedListener (Consumer super GUIComponent> listener) {componentMovedListeners.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 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 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 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