X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FMerger.java;h=ab38066558adeef215f56adfba0ea7f9134f3528;hb=6c67a9ff8361cd9fc082f40e2676f2c8b5911fe4;hp=a9d1410160808ebb866f57e34a90b395a4dab6b9;hpb=b7ce41467a2cbd9f45554982730741810e99feaa;p=Mograsim.git

diff --git a/era.mi/src/era/mi/logic/components/Merger.java b/era.mi/src/era/mi/logic/components/Merger.java
index a9d14101..ab380665 100644
--- 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;
 
 import java.util.List;
 
+import era.mi.logic.timeline.Timeline;
 import era.mi.logic.types.BitVector;
 import era.mi.logic.wires.Wire;
 import era.mi.logic.wires.Wire.ReadEnd;
 import era.mi.logic.wires.Wire.ReadWriteEnd;
 import era.mi.logic.wires.WireObserver;
 
-public class Merger implements WireObserver, Component
+public class Merger extends Component implements WireObserver
 {
 	private ReadWriteEnd out;
 	private ReadEnd[] inputs;
@@ -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().
 	 * @param inputs The inputs to be merged into the union
 	 */
-	public Merger(ReadWriteEnd union, ReadEnd... inputs)
+	public Merger(Timeline timeline, ReadWriteEnd union, ReadEnd... inputs)
 	{
+		super(timeline);
 		this.inputs = inputs;
 		this.out = union;
 		this.beginningIndex = new int[inputs.length];