Adjusted LogicUI to new Wire / WireEnd concept

[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 1bf8c80..60605fb 100644 (file)
--- a/LogicUI/src/era/mi/gui/components/GUIMerger.java
+++ b/LogicUI/src/era/mi/gui/components/GUIMerger.java
@@ -6,7 +6,7 @@ import java.util.Collections;
 import java.util.List;\r
 \r
 import era.mi.logic.components.Merger;\r
-import era.mi.logic.wires.WireArray;\r
+import era.mi.logic.wires.Wire.WireEnd;\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,31 +15,31 @@ public class GUIMerger extends Merger implements BasicGUIComponent
 {\r
        private final int inputCount;\r
        private final double height;\r
-       private final List<WireArray> connectedWireArrays;\r
-       private final List<Point> wireArrayConnectionPoints;\r
+       private final List<WireEnd> connectedWireEnds;\r
+       private final List<Point> WireEndConnectionPoints;\r
 \r
-       public GUIMerger(WireArray union, WireArray... inputs)\r
+       public GUIMerger(WireEnd union, WireEnd... inputs)\r
        {\r
                super(union, inputs);\r
 \r
-               List<WireArray> connectedWireArraysModifiable = new ArrayList<>();\r
-               List<Point> wireArrayConnectionPointsModifiable = new ArrayList<>();\r
+               List<WireEnd> connectedWireEndsModifiable = new ArrayList<>();\r
+               List<Point> WireEndConnectionPointsModifiable = new ArrayList<>();\r
 \r
                this.inputCount = inputs.length;\r
                this.height = (inputCount - 1) * 10;\r
 \r
                {\r
-                       connectedWireArraysModifiable.addAll(Arrays.asList(inputs));\r
+                       connectedWireEndsModifiable.addAll(Arrays.asList(inputs));\r
                        double inputHeight = 0;\r
                        for (int i = 0; i < inputCount; i++, inputHeight += 10)\r
-                               wireArrayConnectionPointsModifiable.add(new Point(0, inputHeight));\r
+                               WireEndConnectionPointsModifiable.add(new Point(0, inputHeight));\r
                }\r
 \r
-               connectedWireArraysModifiable.add(union);\r
-               wireArrayConnectionPointsModifiable.add(new Point(20, height / 2));\r
+               connectedWireEndsModifiable.add(union);\r
+               WireEndConnectionPointsModifiable.add(new Point(20, height / 2));\r
 \r
-               this.connectedWireArrays = Collections.unmodifiableList(connectedWireArraysModifiable);\r
-               this.wireArrayConnectionPoints = Collections.unmodifiableList(wireArrayConnectionPointsModifiable);\r
+               this.connectedWireEnds = Collections.unmodifiableList(connectedWireEndsModifiable);\r
+               this.WireEndConnectionPoints = Collections.unmodifiableList(WireEndConnectionPointsModifiable);\r
        }\r
 \r
        @Override\r
@@ -59,20 +59,20 @@ public class GUIMerger extends Merger implements BasicGUIComponent
        }\r
 \r
        @Override\r
-       public int getConnectedWireArraysCount()\r
+       public int getConnectedWireEndsCount()\r
        {\r
-               return connectedWireArrays.size();\r
+               return connectedWireEnds.size();\r
        }\r
 \r
        @Override\r
-       public WireArray getConnectedWireArray(int connectionIndex)\r
+       public WireEnd getConnectedWireEnd(int connectionIndex)\r
        {\r
-               return connectedWireArrays.get(connectionIndex);\r
+               return connectedWireEnds.get(connectionIndex);\r
        }\r
 \r
        @Override\r
-       public Point getWireArrayConnectionPoint(int connectionI)\r
+       public Point getWireEndConnectionPoint(int connectionI)\r
        {\r
-               return wireArrayConnectionPoints.get(connectionI);\r
+               return WireEndConnectionPoints.get(connectionI);\r
        }\r
 }
\ No newline at end of file