X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.model%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fmodel%2Fmodel%2Fcomponents%2Fatomic%2FGUIManualSwitch.java;h=48bff90f88b61b9d214a24441004214e166b395c;hb=0a04a4ed66ecebd4254541c4977599f6052c115a;hp=e9853a1e1bc6e38518cdc372f601441cbd2ac36f;hpb=8604106a28c3de0b93e46b406a74dc3611e7bca5;p=Mograsim.git diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java index e9853a1e..48bff90f 100644 --- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java +++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIManualSwitch.java @@ -7,7 +7,7 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Font; import net.haspamelodica.swt.helper.swtobjectwrappers.Point; import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle; import net.mograsim.logic.core.LogicObserver; -import net.mograsim.logic.core.components.ManualSwitch; +import net.mograsim.logic.core.components.CoreManualSwitch; import net.mograsim.logic.core.types.Bit; import net.mograsim.logic.core.types.BitVector; import net.mograsim.logic.core.types.BitVectorFormatter; @@ -17,7 +17,7 @@ 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.ManualSwitchAdapter; -import net.mograsim.logic.model.serializing.IdentifierGetter; +import net.mograsim.logic.model.serializing.IdentifyParams; import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator; import net.mograsim.preferences.Preferences; @@ -32,7 +32,7 @@ public class GUIManualSwitch extends GUIComponent private final Pin outputPin; private final LogicObserver logicObs; - private ManualSwitch logicSwitch; + private CoreManualSwitch logicSwitch; public GUIManualSwitch(ViewModelModifiable model, int logicWidth) { @@ -92,7 +92,7 @@ public class GUIManualSwitch extends GUIComponent } } - public void setLogicModelBinding(ManualSwitch logicSwitch) + public void setLogicModelBinding(CoreManualSwitch logicSwitch) { if (this.logicSwitch != null) this.logicSwitch.deregisterObserver(logicObs); @@ -152,7 +152,7 @@ public class GUIManualSwitch extends GUIComponent return true; } - public ManualSwitch getManualSwitch() + public CoreManualSwitch getManualSwitch() { return logicSwitch; } @@ -163,7 +163,13 @@ public class GUIManualSwitch extends GUIComponent } @Override - public Integer getParamsForSerializing(IdentifierGetter idGetter) + public String getIDForSerializing(IdentifyParams idParams) + { + return "GUIManualSwitch"; + } + + @Override + public Integer getParamsForSerializing(IdentifyParams idParams) { return logicWidth; }