Timeline now passed via constructor

[Mograsim.git] / LogicUI / src / era / mi / gui / components / GUIMerger.java

diff --git a/LogicUI/src/era/mi/gui/components/GUIMerger.java b/LogicUI/src/era/mi/gui/components/GUIMerger.java
index 1919e85..1525d0b 100644 (file)
--- a/LogicUI/src/era/mi/gui/components/GUIMerger.java
+++ b/LogicUI/src/era/mi/gui/components/GUIMerger.java
@@ -6,6 +6,7 @@ import java.util.Collections;
 import java.util.List;\r
 \r
 import era.mi.logic.components.Merger;\r
+import era.mi.logic.timeline.Timeline;\r
 import era.mi.logic.wires.Wire.ReadEnd;\r
 import era.mi.logic.wires.Wire.ReadWriteEnd;\r
 import net.haspamelodica.swt.helper.gcs.GeneralGC;\r
@@ -19,9 +20,9 @@ public class GUIMerger extends Merger implements BasicGUIComponent
        private final List<ReadEnd> connectedWireEnds;\r
        private final List<Point> WireEndConnectionPoints;\r
 \r
-       public GUIMerger(ReadWriteEnd union, ReadEnd... inputs)\r
+       public GUIMerger(Timeline timeline, ReadWriteEnd union, ReadEnd... inputs)\r
        {\r
-               super(union, inputs);\r
+               super(timeline, union, inputs);\r
 \r
                List<ReadEnd> connectedWireEndsModifiable = new ArrayList<>();\r
                List<Point> WireEndConnectionPointsModifiable = new ArrayList<>();\r