Made LogicUI compatible with ReadEnd and ReadWriteEnd

[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 60605fb..1919e85 100644 (file)
--- a/LogicUI/src/era/mi/gui/components/GUIMerger.java
+++ b/LogicUI/src/era/mi/gui/components/GUIMerger.java
@@ -6,7 +6,8 @@ import java.util.Collections;
 import java.util.List;\r
 \r
 import era.mi.logic.components.Merger;\r
-import era.mi.logic.wires.Wire.WireEnd;\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
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;\r
 import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;\r
@@ -15,14 +16,14 @@ public class GUIMerger extends Merger implements BasicGUIComponent
 {\r
        private final int inputCount;\r
        private final double height;\r
-       private final List<WireEnd> connectedWireEnds;\r
+       private final List<ReadEnd> connectedWireEnds;\r
        private final List<Point> WireEndConnectionPoints;\r
 \r
-       public GUIMerger(WireEnd union, WireEnd... inputs)\r
+       public GUIMerger(ReadWriteEnd union, ReadEnd... inputs)\r
        {\r
                super(union, inputs);\r
 \r
-               List<WireEnd> connectedWireEndsModifiable = new ArrayList<>();\r
+               List<ReadEnd> connectedWireEndsModifiable = new ArrayList<>();\r
                List<Point> WireEndConnectionPointsModifiable = new ArrayList<>();\r
 \r
                this.inputCount = inputs.length;\r
@@ -65,7 +66,7 @@ public class GUIMerger extends Merger implements BasicGUIComponent
        }\r
 \r
        @Override\r
-       public WireEnd getConnectedWireEnd(int connectionIndex)\r
+       public ReadEnd getConnectedWireEnd(int connectionIndex)\r
        {\r
                return connectedWireEnds.get(connectionIndex);\r
        }\r