Timeline now passed via constructor

[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 2c1ffcb..c5d8fdb 100644 (file)
--- a/era.mi/src/era/mi/logic/components/Merger.java
+++ b/era.mi/src/era/mi/logic/components/Merger.java
@@ -2,13 +2,14 @@ package era.mi.logic.components;
 \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;\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 ReadWriteEnd out;\r
        private ReadEnd[] inputs;\r
@@ -19,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(ReadWriteEnd union, ReadEnd... 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