Renamed core components to have the common prefix Core

[Mograsim.git] / net.mograsim.logic.model / src / net / mograsim / logic / model / model / components / atomic / GUIManualSwitch.java

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 c721f46..48bff90 100644 (file)
--- 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
@@ -2,15 +2,12 @@ package net.mograsim.logic.model.model.components.atomic;
 
 import org.eclipse.swt.graphics.Color;
 
-import com.google.gson.JsonElement;
-import com.google.gson.JsonPrimitive;
-
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 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;
@@ -20,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;
 
@@ -35,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)
        {
@@ -95,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);
@@ -155,7 +152,7 @@ public class GUIManualSwitch extends GUIComponent
                return true;
        }
 
-       public ManualSwitch getManualSwitch()
+       public CoreManualSwitch getManualSwitch()
        {
                return logicSwitch;
        }
@@ -166,9 +163,15 @@ public class GUIManualSwitch extends GUIComponent
        }
 
        @Override
-       public JsonElement getParamsForSerializing(IdentifierGetter idGetter)
+       public String getIDForSerializing(IdentifyParams idParams)
+       {
+               return "GUIManualSwitch";
+       }
+
+       @Override
+       public Integer getParamsForSerializing(IdentifyParams idParams)
        {
-               return new JsonPrimitive(logicWidth);
+               return logicWidth;
        }
 
        static