Suppressed warnings where the thing warned about is intentional

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

diff --git a/era.mi/src/era/mi/logic/components/Merger.java b/era.mi/src/era/mi/logic/components/Merger.java
index 860c010..c5d8fdb 100644 (file)
--- a/era.mi/src/era/mi/logic/components/Merger.java
+++ b/era.mi/src/era/mi/logic/components/Merger.java
@@ -2,15 +2,17 @@ package era.mi.logic.components;
 \r
 import java.util.List;\r
 \r
-import era.mi.logic.Bit;\r
+import era.mi.logic.timeline.Timeline;\r
+import era.mi.logic.types.BitVector;\r
 import era.mi.logic.wires.Wire;\r
-import era.mi.logic.wires.Wire.WireEnd;\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 Merger implements WireObserver, Component\r
+public class Merger extends Component implements WireObserver\r
 {\r
-       private WireEnd out;\r
-       private WireEnd[] inputs;\r
+       private ReadWriteEnd out;\r
+       private ReadEnd[] inputs;\r
        private int[] beginningIndex;\r
 \r
        /**\r
@@ -18,8 +20,9 @@ public class Merger implements WireObserver, Component
         * @param union  The output of merging n {@link Wire}s into one. Must have length = a1.length() + a2.length() + ... + an.length().\r
         * @param inputs The inputs to be merged into the union\r
         */\r
-       public Merger(WireEnd union, WireEnd... inputs)\r
+       public Merger(Timeline timeline, ReadWriteEnd union, ReadEnd... inputs)\r
        {\r
+               super(timeline);\r
                this.inputs = inputs;\r
                this.out = union;\r
                this.beginningIndex = new int[inputs.length];\r
@@ -37,45 +40,45 @@ public class Merger implements WireObserver, Component
                                        "The output of merging n WireArrays into one must have length = a1.length() + a2.length() + ... + an.length().");\r
        }\r
 \r
-       public WireEnd getInput(int index)\r
+       public ReadEnd getInput(int index)\r
        {\r
                return inputs[index];\r
        }\r
 \r
-       public WireEnd getUnion()\r
+       public ReadEnd getUnion()\r
        {\r
                return out;\r
        }\r
 \r
        @Override\r
-       public void update(Wire initiator, Bit[] oldValues)\r
+       public void update(ReadEnd initiator, BitVector oldValues)\r
        {\r
                int index = find(initiator);\r
                int beginning = beginningIndex[index];\r
                out.feedSignals(beginning, inputs[index].getValues());\r
        }\r
 \r
-       private int find(Wire w)\r
+       private int find(ReadEnd r)\r
        {\r
                for (int i = 0; i < inputs.length; i++)\r
-                       if (inputs[i].getWire() == w)\r
+                       if (inputs[i] == r)\r
                                return i;\r
                return -1;\r
        }\r
 \r
-       public WireEnd[] getInputs()\r
+       public ReadEnd[] getInputs()\r
        {\r
                return inputs.clone();\r
        }\r
 \r
        @Override\r
-       public List<WireEnd> getAllInputs()\r
+       public List<ReadEnd> getAllInputs()\r
        {\r
                return List.of(inputs);\r
        }\r
 \r
        @Override\r
-       public List<WireEnd> getAllOutputs()\r
+       public List<ReadWriteEnd> getAllOutputs()\r
        {\r
                return List.of(out);\r
        }\r