X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=LogicUI%2Fsrc%2Fera%2Fmi%2Fgui%2Fcomponents%2FGUIMux.java;h=0eba8f553c8ca11d258efbb62b2a44471ff0aa52;hb=6c67a9ff8361cd9fc082f40e2676f2c8b5911fe4;hp=c16aa31630462ee45f0874c91cd136a8fdc19fbd;hpb=4be7eddcfc45e5e5794bd0dc1e2c2423fa43ec51;p=Mograsim.git diff --git a/LogicUI/src/era/mi/gui/components/GUIMux.java b/LogicUI/src/era/mi/gui/components/GUIMux.java index c16aa316..0eba8f55 100644 --- 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 connectedWireEnds; + private final List connectedWireEnds; private final List 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 connectedWireEndsModifiable = new ArrayList<>(); + List connectedWireEndsModifiable = new ArrayList<>(); List 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); }