X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=LogicUI%2Fsrc%2Fera%2Fmi%2Fgui%2Fcomponents%2FGUIMerger.java;h=240855c3a862b988af3527de1721d7fef305759f;hb=6c67a9ff8361cd9fc082f40e2676f2c8b5911fe4;hp=fed303ba97891be48bedf0d59f6a775c3a4e9c15;hpb=4be7eddcfc45e5e5794bd0dc1e2c2423fa43ec51;p=Mograsim.git

diff --git a/LogicUI/src/era/mi/gui/components/GUIMerger.java b/LogicUI/src/era/mi/gui/components/GUIMerger.java
index fed303ba..240855c3 100644
--- a/LogicUI/src/era/mi/gui/components/GUIMerger.java
+++ b/LogicUI/src/era/mi/gui/components/GUIMerger.java
@@ -6,7 +6,9 @@ import java.util.Collections;
 import java.util.List;
 
 import era.mi.logic.components.Merger;
-import era.mi.logic.wires.Wire.WireEnd;
+import era.mi.logic.timeline.Timeline;
+import era.mi.logic.wires.Wire.ReadEnd;
+import era.mi.logic.wires.Wire.ReadWriteEnd;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
@@ -15,14 +17,14 @@ public class GUIMerger extends Merger implements BasicGUIComponent
 {
 	private final int inputCount;
 	private final double height;
-	private final List<WireEnd> connectedWireEnds;
+	private final List<ReadEnd> connectedWireEnds;
 	private final List<Point> WireEndConnectionPoints;
 
-	public GUIMerger(WireEnd union, WireEnd... inputs)
+	public GUIMerger(Timeline timeline, ReadWriteEnd union, ReadEnd... inputs)
 	{
-		super(union, inputs);
+		super(timeline, union, inputs);
 
-		List<WireEnd> connectedWireEndsModifiable = new ArrayList<>();
+		List<ReadEnd> connectedWireEndsModifiable = new ArrayList<>();
 		List<Point> WireEndConnectionPointsModifiable = new ArrayList<>();
 
 		this.inputCount = inputs.length;
@@ -65,7 +67,7 @@ public class GUIMerger extends Merger implements BasicGUIComponent
 	}
 
 	@Override
-	public WireEnd getConnectedWireEnd(int connectionIndex)
+	public ReadEnd getConnectedWireEnd(int connectionIndex)
 	{
 		return connectedWireEnds.get(connectionIndex);
 	}