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 aa8c437..558dbb6 100644 (file)
--- a/era.mi/src/era/mi/logic/components/Connector.java
+++ b/era.mi/src/era/mi/logic/components/Connector.java
@@ -1,75 +1,76 @@
-package era.mi.logic.components;
-
-import java.util.List;
-
-import era.mi.logic.Simulation;
-import era.mi.logic.types.Bit;
-import era.mi.logic.wires.Wire;
-import era.mi.logic.wires.Wire.WireEnd;
-import era.mi.logic.wires.WireObserver;
-
-public class Connector implements WireObserver, Component
-{
-       private boolean connected;
-       private final WireEnd a;
-       private final WireEnd 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()));
-               this.a = a;
-               this.b = b;
-               a.addObserver(this);
-               b.addObserver(this);
-       }
-
-       public void connect()
-       {
-               connected = true;
-               update(a.getWire());
-               update(b.getWire());
-       }
-
-       public void disconnect()
-       {
-               connected = false;
-               a.clearSignals();
-               b.clearSignals();
-       }
-
-       public void setConnection(boolean connected)
-       {
-               if (connected)
-                       connect();
-               else
-                       disconnect();
-       }
-
-       @Override
-       public void update(Wire initiator, Bit[] oldValues)
-       {
-               if (connected)
-                       Simulation.TIMELINE.addEvent(e -> update(initiator), 1);
-       }
-
-       private void update(Wire initiator)
-       {
-               if (initiator == a.getWire())
-                       b.feedSignals(a.wireValuesExcludingMe());
-               else
-                       a.feedSignals(b.wireValuesExcludingMe());
-       }
-
-       @Override
-       public List<WireEnd> getAllInputs()
-       {
-               return List.of(a, b);
-       }
-
-       @Override
-       public List<WireEnd> getAllOutputs()
-       {
-               return List.of(a, b);
-       }
-}
+package era.mi.logic.components;\r
+\r
+import java.util.List;\r
+\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 extends Component implements WireObserver\r
+{\r
+       private boolean connected;\r
+       private final ReadWriteEnd a;\r
+       private final ReadWriteEnd b;\r
+\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
+               this.b = b;\r
+               a.addObserver(this);\r
+               b.addObserver(this);\r
+       }\r
+\r
+       public void connect()\r
+       {\r
+               connected = true;\r
+               update(a);\r
+               update(b);\r
+       }\r
+\r
+       public void disconnect()\r
+       {\r
+               connected = false;\r
+               a.clearSignals();\r
+               b.clearSignals();\r
+       }\r
+\r
+       public void setConnection(boolean connected)\r
+       {\r
+               if (connected)\r
+                       connect();\r
+               else\r
+                       disconnect();\r
+       }\r
+\r
+       @Override\r
+       public void update(ReadEnd initiator, BitVector oldValues)\r
+       {\r
+               if (connected)\r
+                       timeline.addEvent(e -> update(initiator), 1);\r
+       }\r
+\r
+       private void update(ReadEnd initiator)\r
+       {\r
+               if (initiator == a)\r
+                       b.feedSignals(a.wireValuesExcludingMe());\r
+               else\r
+                       a.feedSignals(b.wireValuesExcludingMe());\r
+       }\r
+\r
+       @Override\r
+       public List<ReadEnd> getAllInputs()\r
+       {\r
+               return List.of(a, b);\r
+       }\r
+\r
+       @Override\r
+       public List<ReadWriteEnd> getAllOutputs()\r
+       {\r
+               return List.of(a, b);\r
+       }\r
+}\r