Timeline now passed via constructor

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

diff --git a/LogicUI/src/era/mi/gui/components/GUIMux.java b/LogicUI/src/era/mi/gui/components/GUIMux.java
index c16aa31..0eba8f5 100644 (file)
--- a/LogicUI/src/era/mi/gui/components/GUIMux.java
+++ b/LogicUI/src/era/mi/gui/components/GUIMux.java
@@ -6,7 +6,9 @@ import java.util.Collections;
 import java.util.List;
 
 import era.mi.logic.components.Mux;
-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;
@@ -14,19 +16,19 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 public class GUIMux extends Mux implements BasicGUIComponent
 {
        private final double height;
-       private final List<WireEnd> connectedWireEnds;
+       private final List<ReadEnd> connectedWireEnds;
        private final List<Point> WireEndConnectionPoints;
 
-       public GUIMux(int processTime, WireEnd out, WireEnd select, WireEnd... inputs)
+       public GUIMux(Timeline timeline, int processTime, ReadWriteEnd out, ReadEnd select, ReadEnd... inputs)
        {
-               super(processTime, out, select, inputs);
+               super(timeline, processTime, out, select, inputs);
 
                double height = inputs.length * 5;
                if (height < 10)
                        height = 10;
                this.height = height;
 
-               List<WireEnd> connectedWireEndsModifiable = new ArrayList<>();
+               List<ReadEnd> connectedWireEndsModifiable = new ArrayList<>();
                List<Point> WireEndConnectionPointsModifiable = new ArrayList<>();
 
                connectedWireEndsModifiable.add(out);
@@ -66,7 +68,7 @@ public class GUIMux extends Mux implements BasicGUIComponent
        }
 
        @Override
-       public WireEnd getConnectedWireEnd(int connectionIndex)
+       public ReadEnd getConnectedWireEnd(int connectionIndex)
        {
                return connectedWireEnds.get(connectionIndex);
        }