Suppressed warnings where the thing warned about is intentional

[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 4f211bf..558dbb6 100644 (file)
--- a/era.mi/src/era/mi/logic/components/Connector.java
+++ b/era.mi/src/era/mi/logic/components/Connector.java
@@ -2,20 +2,21 @@ package era.mi.logic.components;
 \r
 import java.util.List;\r
 \r
-import era.mi.logic.Simulation;\r
+import era.mi.logic.timeline.Timeline;\r
 import era.mi.logic.types.BitVector;\r
 import era.mi.logic.wires.Wire.ReadEnd;\r
 import era.mi.logic.wires.Wire.ReadWriteEnd;\r
 import era.mi.logic.wires.WireObserver;\r
 \r
-public class Connector implements WireObserver, Component\r
+public class Connector extends Component implements WireObserver\r
 {\r
        private boolean connected;\r
        private final ReadWriteEnd a;\r
        private final ReadWriteEnd b;\r
 \r
-       public Connector(ReadWriteEnd a, ReadWriteEnd b)\r
+       public Connector(Timeline timeline, ReadWriteEnd a, ReadWriteEnd b)\r
        {\r
+               super(timeline);\r
                if (a.length() != b.length())\r
                        throw new IllegalArgumentException(String.format("WireArray width does not match: %d, %d", a.length(), b.length()));\r
                this.a = a;\r
@@ -50,7 +51,7 @@ public class Connector implements WireObserver, Component
        public void update(ReadEnd initiator, BitVector oldValues)\r
        {\r
                if (connected)\r
-                       Simulation.TIMELINE.addEvent(e -> update(initiator), 1);\r
+                       timeline.addEvent(e -> update(initiator), 1);\r
        }\r
 \r
        private void update(ReadEnd initiator)\r