Made finding the ID of a JsonSerializable less ugly

[Mograsim.git] / net.mograsim.logic.model.am2900 / src / net / mograsim / logic / model / am2900 / components / GUIsel4_12.java

diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIsel4_12.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIsel4_12.java
index d59b63f..17b70a5 100644 (file)
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIsel4_12.java
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIsel4_12.java
@@ -23,7 +23,7 @@ public class GUIsel4_12 extends SimpleRectangularHardcodedGUIComponent
 {
        public GUIsel4_12(ViewModelModifiable model, String name)
        {
-               super(model, name, "4-way SEL\n12 bit");
+               super(model, "GUIsel4_12", name, "4-way SEL\n12 bit");
                setSize(80, 40);
                addPin(new Pin(this, "SA", 1, PinUsage.INPUT, 0, 5), Position.RIGHT);
                addPin(new Pin(this, "SB", 1, PinUsage.INPUT, 0, 15), Position.RIGHT);
@@ -37,7 +37,7 @@ public class GUIsel4_12 extends SimpleRectangularHardcodedGUIComponent
        }
 
        @Override
-       protected Object recalculate(Object lastState, Map<String, ReadEnd> readEnds, Map<String, ReadWriteEnd> readWriteEnds)
+       public Object recalculate(Object lastState, Map<String, ReadEnd> readEnds, Map<String, ReadWriteEnd> readWriteEnds)
        {
                Bit SAVal = readEnds.get("SA").getValue();
                Bit SBVal = readEnds.get("SB").getValue();