Renamed core components to have the common prefix Core

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

diff --git a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIinc12.java b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIinc12.java
index cbd1f9f..ca74076 100644 (file)
--- a/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIinc12.java
+++ b/net.mograsim.logic.model.am2900/src/net/mograsim/logic/model/am2900/components/GUIinc12.java
@@ -9,11 +9,12 @@ import java.util.Arrays;
 import java.util.Map;
 
 import net.mograsim.logic.core.types.Bit;
-import net.mograsim.logic.core.wires.Wire.ReadEnd;
-import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
+import net.mograsim.logic.core.wires.CoreWire.ReadEnd;
+import net.mograsim.logic.core.wires.CoreWire.ReadWriteEnd;
 import net.mograsim.logic.model.model.ViewModelModifiable;
 import net.mograsim.logic.model.model.components.atomic.SimpleRectangularHardcodedGUIComponent;
 import net.mograsim.logic.model.model.wires.Pin;
+import net.mograsim.logic.model.model.wires.PinUsage;
 import net.mograsim.logic.model.serializing.IndirectGUIComponentCreator;
 import net.mograsim.logic.model.snippets.symbolrenderers.PinNamesSymbolRenderer.PinNamesParams.Position;
 
@@ -21,15 +22,15 @@ public class GUIinc12 extends SimpleRectangularHardcodedGUIComponent
 {
        public GUIinc12(ViewModelModifiable model, String name)
        {
-               super(model, name, "Incrementer");
+               super(model, "GUIinc12", name, "Incrementer");
                setSize(40, 20);
-               addPin(new Pin(this, "A", 12, 20, 20), Usage.INPUT, Position.TOP);
-               addPin(new Pin(this, "CI", 1, 40, 10), Usage.INPUT, Position.LEFT);
-               addPin(new Pin(this, "Y", 12, 20, 0), Usage.OUTPUT, Position.BOTTOM);
+               addPin(new Pin(this, "A", 12, PinUsage.INPUT, 20, 20), Position.TOP);
+               addPin(new Pin(this, "CI", 1, PinUsage.INPUT, 40, 10), Position.LEFT);
+               addPin(new Pin(this, "Y", 12, PinUsage.OUTPUT, 20, 0), Position.BOTTOM);
        }
 
        @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[] ABits = readEnds.get("A").getValues().getBits();
                Bit CIVal = readEnds.get("CI").getValue();
@@ -46,7 +47,6 @@ public class GUIinc12 extends SimpleRectangularHardcodedGUIComponent
                {
                        Bit carry = Bit.ONE;
                        // TODO extract to helper. This code almost also exists in GUIAM2910RegCntr.
-                       // TODO maybe invert loop direction
                        for (int i = 11; i >= 0; i--)
                        {
                                Bit a = ABits[i];