Merge logic of origin into logic

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

diff --git a/era.mi/src/era/mi/logic/tests/Connector.java b/era.mi/src/era/mi/logic/tests/Connector.java
index 7887ff2..39645bf 100644 (file)
--- a/era.mi/src/era/mi/logic/tests/Connector.java
+++ b/era.mi/src/era/mi/logic/tests/Connector.java
@@ -2,31 +2,31 @@ package era.mi.logic.tests;
 
 import era.mi.logic.Bit;
 import era.mi.logic.Simulation;
-import era.mi.logic.wires.WireArray;
-import era.mi.logic.wires.WireArray.WireArrayInput;
-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
+public class Connector implements WireObserver
 {
-       private final WireArray a;
-       private final WireArray b;
-       private final WireArrayInput aI;
-       private final WireArrayInput bI;
+       private final Wire a;
+//     private final WireArray b;
+       private final WireEnd aI;
+       private final WireEnd bI;
 
-       public Connector(WireArray a, WireArray b)
+       public Connector(Wire a, Wire b)
        {
                if (a.length != b.length)
-                       throw new IllegalArgumentException(String.format("WireArray width does not match: %o, %o", 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;
+//             this.b = b;
                a.addObserver(this);
                b.addObserver(this);
-               aI = a.createInput();
-               bI = b.createInput();
+               aI = a.createEnd();
+               bI = b.createEnd();
        }
 
        @Override
-       public void update(WireArray initiator, Bit[] oldValues)
+       public void update(Wire initiator, Bit[] oldValues)
        {
                Simulation.TIMELINE.addEvent((e) ->
                {