Restructured high level state access

[Mograsim.git] / net.mograsim.logic.ui.am2900 / src / net / mograsim / logic / ui / model / components / mi / nandbased / GUIdlatch4.java

diff --git a/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdlatch4.java b/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdlatch4.java
index 61a239a..bda25ba 100644 (file)
--- a/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdlatch4.java
+++ b/net.mograsim.logic.ui.am2900/src/net/mograsim/logic/ui/model/components/mi/nandbased/GUIdlatch4.java
@@ -70,10 +70,16 @@ public class GUIdlatch4 extends SimpleRectangularSubmodelComponent
                new GUIWire(submodelModifiable, dlatch2.getPin("Q"), Q2, new Point[0]);
                new GUIWire(submodelModifiable, dlatch3.getPin("Q"), Q3, new Point[0]);
                new GUIWire(submodelModifiable, dlatch4.getPin("Q"), Q4, new Point[0]);
+
+               addAtomicHighLevelStateID("q1");
+               addAtomicHighLevelStateID("q2");
+               addAtomicHighLevelStateID("q3");
+               addAtomicHighLevelStateID("q4");
+               addAtomicHighLevelStateID("q");
        }
 
        @Override
-       public void setHighLevelState(String stateID, Object newState)
+       public void setAtomicHighLevelState(String stateID, Object newState)
        {
                switch (stateID)
                {
@@ -91,19 +97,19 @@ public class GUIdlatch4 extends SimpleRectangularSubmodelComponent
                        break;
                case "q":
                        BitVector newStateCasted = (BitVector) newState;
-                       setHighLevelState("q1", newStateCasted.getBit(3));
-                       setHighLevelState("q2", newStateCasted.getBit(2));
-                       setHighLevelState("q3", newStateCasted.getBit(1));
-                       setHighLevelState("q4", newStateCasted.getBit(0));
+                       setHighLevelState("q1", newStateCasted.getBit(0));
+                       setHighLevelState("q2", newStateCasted.getBit(1));
+                       setHighLevelState("q3", newStateCasted.getBit(2));
+                       setHighLevelState("q4", newStateCasted.getBit(3));
                        break;
                default:
-                       super.setHighLevelState(stateID, newState);
-                       break;
+                       // should not happen because we tell SubmodelComponent to only allow these state IDs.
+                       throw new IllegalStateException("Illegal atomic state ID: " + stateID);
                }
        }
 
        @Override
-       public Object getHighLevelState(String stateID)
+       public Object getAtomicHighLevelState(String stateID)
        {
                switch (stateID)
                {
@@ -120,9 +126,10 @@ public class GUIdlatch4 extends SimpleRectangularSubmodelComponent
                        Bit q2 = (Bit) getHighLevelState("q2");
                        Bit q3 = (Bit) getHighLevelState("q3");
                        Bit q4 = (Bit) getHighLevelState("q4");
-                       return BitVector.of(q4, q3, q2, q1);
+                       return BitVector.of(q1, q2, q3, q4);
                default:
-                       return super.getHighLevelState(stateID);
+                       // should not happen because we tell SubmodelComponent to only allow these state IDs.
+                       throw new IllegalStateException("Illegal atomic state ID: " + stateID);
                }
        }
 }
\ No newline at end of file