Renamed core components to have the common prefix Core

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

diff --git a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIBitDisplay.java b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIBitDisplay.java
index 9d6b57e..ac92ecb 100644 (file)
--- a/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIBitDisplay.java
+++ b/net.mograsim.logic.model/src/net/mograsim/logic/model/model/components/atomic/GUIBitDisplay.java
@@ -2,22 +2,20 @@ 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.BitDisplay;
+import net.mograsim.logic.core.components.CoreBitDisplay;
 import net.mograsim.logic.core.types.BitVectorFormatter;
 import net.mograsim.logic.model.model.ViewModelModifiable;
 import net.mograsim.logic.model.model.components.GUIComponent;
 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.BitDisplayAdapter;
-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;
 
@@ -31,7 +29,7 @@ public class GUIBitDisplay extends GUIComponent
        private final Pin inputPin;
 
        private final LogicObserver logicObs;
-       private BitDisplay bitDisplay;
+       private CoreBitDisplay bitDisplay;
 
        public GUIBitDisplay(ViewModelModifiable model, int logicWidth)
        {
@@ -45,7 +43,7 @@ public class GUIBitDisplay extends GUIComponent
                logicObs = (i) -> model.requestRedraw();
 
                setSize(width, height);
-               addPin(this.inputPin = new Pin(this, "", logicWidth, 0, height / 2));
+               addPin(this.inputPin = new Pin(this, "", logicWidth, PinUsage.INPUT, 0, height / 2));
        }
 
        @Override
@@ -68,7 +66,7 @@ public class GUIBitDisplay extends GUIComponent
                gc.setFont(oldFont);
        }
 
-       public void setLogicModelBinding(BitDisplay bitDisplay)
+       public void setLogicModelBinding(CoreBitDisplay bitDisplay)
        {
                if (this.bitDisplay != null)
                        this.bitDisplay.deregisterObserver(logicObs);
@@ -82,7 +80,7 @@ public class GUIBitDisplay extends GUIComponent
                return bitDisplay != null;
        }
 
-       public BitDisplay getBitDisplay()
+       public CoreBitDisplay getBitDisplay()
        {
                return bitDisplay;
        }
@@ -93,9 +91,15 @@ public class GUIBitDisplay extends GUIComponent
        }
 
        @Override
-       public JsonElement getParamsForSerializing(IdentifierGetter idGetter)
+       public String getIDForSerializing(IdentifyParams idParams)
+       {
+               return "GUIBitDisplay";
+       }
+
+       @Override
+       public Integer getParamsForSerializing(IdentifyParams idParams)
        {
-               return new JsonPrimitive(logicWidth);
+               return logicWidth;
        }
 
        static