Merge logic of origin into logic

[Mograsim.git] / era.mi / src / era / mi / logic / components / Connector.java

diff --git a/era.mi/src/era/mi/logic/components/Connector.java b/era.mi/src/era/mi/logic/components/Connector.java
index 17c9f3c..47cf901 100644 (file)
--- a/era.mi/src/era/mi/logic/components/Connector.java
+++ b/era.mi/src/era/mi/logic/components/Connector.java
@@ -4,42 +4,38 @@ import java.util.List;
 
 import era.mi.logic.Bit;
 import era.mi.logic.Simulation;
-import era.mi.logic.wires.WireArray;
-import era.mi.logic.wires.WireArray.WireArrayEnd;
-import era.mi.logic.wires.WireArrayObserver;
+import era.mi.logic.wires.Wire;
+import era.mi.logic.wires.Wire.WireEnd;
+import era.mi.logic.wires.WireObserver;
 
-public class Connector implements WireArrayObserver, Component
+public class Connector implements WireObserver, Component
 {
        private boolean connected;
-       private final WireArray a;
-       private final WireArray b;
-       private final WireArrayEnd aI;
-       private final WireArrayEnd bI;
+       private final WireEnd a;
+       private final WireEnd b;
 
-       public Connector(WireArray a, WireArray b)
+       public Connector(WireEnd a, WireEnd b)
        {
-               if (a.length != b.length)
-                       throw new IllegalArgumentException(String.format("WireArray width does not match: %d, %d", a.length, b.length));
+               if (a.length() != b.length())
+                       throw new IllegalArgumentException(String.format("WireArray width does not match: %d, %d", a.length(), b.length()));
                this.a = a;
                this.b = b;
                a.addObserver(this);
                b.addObserver(this);
-               aI = a.createInput();
-               bI = b.createInput();
        }
 
        public void connect()
        {
                connected = true;
-               update(a);
-               update(b);
+               update(a.getWire());
+               update(b.getWire());
        }
 
        public void disconnect()
        {
                connected = false;
-               aI.clearSignals();
-               bI.clearSignals();
+               a.clearSignals();
+               b.clearSignals();
        }
 
        public void setConnection(boolean connected)
@@ -51,28 +47,28 @@ public class Connector implements WireArrayObserver, Component
        }
 
        @Override
-       public void update(WireArray initiator, Bit[] oldValues)
+       public void update(Wire initiator, Bit[] oldValues)
        {
                if (connected)
                        Simulation.TIMELINE.addEvent(e -> update(initiator), 1);
        }
 
-       private void update(WireArray initiator)
+       private void update(Wire initiator)
        {
-               if (initiator == a)
-                       bI.feedSignals(aI.wireValuesExcludingMe());
+               if (initiator == a.getWire())
+                       b.feedSignals(a.wireValuesExcludingMe());
                else
-                       aI.feedSignals(bI.wireValuesExcludingMe());
+                       a.feedSignals(b.wireValuesExcludingMe());
        }
 
        @Override
-       public List<WireArray> getAllInputs()
+       public List<WireEnd> getAllInputs()
        {
                return List.of(a, b);
        }
 
        @Override
-       public List<WireArray> getAllOutputs()
+       public List<WireEnd> getAllOutputs()
        {
                return List.of(a, b);
        }