X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fatomic%2FGUITriStateBuffer.java;h=7f04102c75c77e4ae1462bd37e093aa7bfb8b167;hb=0a04a4ed66ecebd4254541c4977599f6052c115a;hp=83b89f54d69115dc99b45c250731707d0d41682d;hpb=ebdf5a12e795656aa71e4bba14fea840205d4c26;p=Mograsim.git diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUITriStateBuffer.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUITriStateBuffer.java index 83b89f54..7f04102c 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUITriStateBuffer.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUITriStateBuffer.java @@ -2,8 +2,6 @@ package net.mograsim.logic.model.model.components.atomic; import org.eclipse.swt.graphics.Color; -import com.google.gson.Gson; -import com.google.gson.JsonElement; import com.google.gson.JsonSyntaxException; import net.haspamelodica.swt.helper.gcs.GeneralGC; @@ -16,8 +14,9 @@ import net.mograsim.logic.model.model.wires.Pin; import net.mograsim.logic.model.model.wires.PinUsage; import net.mograsim.logic.model.modeladapter.ViewLogicModelAdapter; import net.mograsim.logic.model.modeladapter.componentadapters.TriStateBufferAdapter; -import net.mograsim.logic.model.serializing.IdentifierGetter; +import net.mograsim.logic.model.serializing.IdentifyParams; import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; +import net.mograsim.logic.model.util.JsonHandler; import net.mograsim.preferences.Preferences; public class GUITriStateBuffer extends GUIComponent @@ -88,9 +87,15 @@ public class GUITriStateBuffer extends GUIComponent } @Override - public JsonElement getParamsForSerializing(IdentifierGetter idGetter) + public String getIDForSerializing(IdentifyParams idParams) { - return new Gson().toJsonTree(params); + return "GUITriStateBuffer"; + } + + @Override + public GUITriStateBufferParams getParamsForSerializing(IdentifyParams idParams) + { + return params; } static @@ -98,7 +103,7 @@ public class GUITriStateBuffer extends GUIComponent ViewLogicModelAdapter.addComponentAdapter(new TriStateBufferAdapter()); IndirectGUIComponentCreator.setComponentSupplier(GUITriStateBuffer.class.getName(), (m, p, n) -> { - GUITriStateBufferParams params = new Gson().fromJson(p, GUITriStateBufferParams.class); + GUITriStateBufferParams params = JsonHandler.fromJsonTree(p, GUITriStateBufferParams.class); if (params == null) throw new JsonSyntaxException("Invalid!!!"); return new GUITriStateBuffer(m, params, n);