X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=net.mograsim.logic.ui%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fui%2Fmodel%2Fwires%2FWireCrossPoint.java;h=1a3f893abdc17265826005b3fad7022cccf15eb4;hb=9ca90120a47e07c9182162351dc47aa89ae703be;hp=3abf9f758e079e4edf3cb5511c04e6fb88617b07;hpb=1e4c26b6d59f2cc40ce5af657c54ce65788e2c43;p=Mograsim.git diff --git a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java index 3abf9f75..1a3f893a 100644 --- a/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java +++ b/net.mograsim.logic.ui/src/net/mograsim/logic/ui/model/wires/WireCrossPoint.java @@ -1,6 +1,7 @@ package net.mograsim.logic.ui.model.wires; -import java.util.Map; +import com.google.gson.JsonElement; +import com.google.gson.JsonPrimitive; import net.haspamelodica.swt.helper.gcs.GeneralGC; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; @@ -9,7 +10,7 @@ import net.mograsim.logic.core.types.BitVectorFormatter; import net.mograsim.logic.core.wires.Wire.ReadEnd; import net.mograsim.logic.ui.model.ViewModelModifiable; import net.mograsim.logic.ui.model.components.GUIComponent; -import net.mograsim.logic.ui.model.components.atomic.SimpleRectangularGUIGate; +import net.mograsim.logic.ui.serializing.IndirectGUIComponentCreator; import net.mograsim.preferences.ColorDefinition; import net.mograsim.preferences.ColorManager; @@ -110,10 +111,14 @@ public class WireCrossPoint extends GUIComponent implements ConnectionPoint // serializing @Override - public Map getInstantiationParameters() + public JsonElement getParams() { - Map m = super.getInstantiationParameters(); - m.put(SimpleRectangularGUIGate.kLogicWidth, pin.logicWidth); - return m; + return new JsonPrimitive(pin.logicWidth); + } + + static + { + IndirectGUIComponentCreator.setComponentProvider(WireCrossPoint.class.getCanonicalName(), + (m, p) -> new WireCrossPoint(m, p.getAsInt())); } } \ No newline at end of file