X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=LogicUI%2Fsrc%2Fera%2Fmi%2Fgui%2Fcomponents%2FGUIMux.java;h=5f6dde77764abd0a96fa7cfe4b32163bdd12e727;hb=6d944b4deae46eef98beabdea0dab90c455e14a8;hp=88ccbd73a0e2b1c370699cd1f74afde071771d47;hpb=373b945917f9d573e4b1bd0e97f98b02fb0d9c07;p=Mograsim.git

diff --git a/LogicUI/src/era/mi/gui/components/GUIMux.java b/LogicUI/src/era/mi/gui/components/GUIMux.java
index 88ccbd73..5f6dde77 100644
--- a/LogicUI/src/era/mi/gui/components/GUIMux.java
+++ b/LogicUI/src/era/mi/gui/components/GUIMux.java
@@ -6,7 +6,8 @@ import java.util.Collections;
 import java.util.List;
 
 import era.mi.logic.components.Mux;
-import era.mi.logic.wires.WireArray;
+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,10 +15,10 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 public class GUIMux extends Mux implements BasicGUIComponent
 {
 	private final double height;
-	private final List<WireArray> connectedWireArrays;
-	private final List<Point> wireArrayConnectionPoints;
+	private final List<ReadEnd> connectedWireEnds;
+	private final List<Point> WireEndConnectionPoints;
 
-	public GUIMux(int processTime, WireArray out, WireArray select, WireArray... inputs)
+	public GUIMux(int processTime, ReadWriteEnd out, ReadEnd select, ReadEnd... inputs)
 	{
 		super(processTime, out, select, inputs);
 
@@ -26,25 +27,25 @@ public class GUIMux extends Mux implements BasicGUIComponent
 			height = 10;
 		this.height = height;
 
-		List<WireArray> connectedWireArraysModifiable = new ArrayList<>();
-		List<Point> wireArrayConnectionPointsModifiable = new ArrayList<>();
+		List<ReadEnd> connectedWireEndsModifiable = new ArrayList<>();
+		List<Point> WireEndConnectionPointsModifiable = new ArrayList<>();
 
-		connectedWireArraysModifiable.add(out);
-		wireArrayConnectionPointsModifiable.add(new Point(20, 10 + height / 2));
+		connectedWireEndsModifiable.add(out);
+		WireEndConnectionPointsModifiable.add(new Point(20, 10 + height / 2));
 
-		connectedWireArraysModifiable.add(select);
-		wireArrayConnectionPointsModifiable.add(new Point(10, 5));
+		connectedWireEndsModifiable.add(select);
+		WireEndConnectionPointsModifiable.add(new Point(10, 5));
 
 		{
-			connectedWireArraysModifiable.addAll(Arrays.asList(inputs));
+			connectedWireEndsModifiable.addAll(Arrays.asList(inputs));
 			double inputHeightIncrement = (height + 20) / inputs.length;
 			double inputHeight = inputHeightIncrement / 2;
 			for (int i = 0; i < inputs.length; i++, inputHeight += inputHeightIncrement)
-				wireArrayConnectionPointsModifiable.add(new Point(0, inputHeight));
+				WireEndConnectionPointsModifiable.add(new Point(0, inputHeight));
 		}
 
-		this.connectedWireArrays = Collections.unmodifiableList(connectedWireArraysModifiable);
-		this.wireArrayConnectionPoints = Collections.unmodifiableList(wireArrayConnectionPointsModifiable);
+		this.connectedWireEnds = Collections.unmodifiableList(connectedWireEndsModifiable);
+		this.WireEndConnectionPoints = Collections.unmodifiableList(WireEndConnectionPointsModifiable);
 	}
 
 	@Override
@@ -60,20 +61,20 @@ public class GUIMux extends Mux implements BasicGUIComponent
 	}
 
 	@Override
-	public int getConnectedWireArraysCount()
+	public int getConnectedWireEndsCount()
 	{
-		return connectedWireArrays.size();
+		return connectedWireEnds.size();
 	}
 
 	@Override
-	public WireArray getConnectedWireArray(int connectionIndex)
+	public ReadEnd getConnectedWireEnd(int connectionIndex)
 	{
-		return connectedWireArrays.get(connectionIndex);
+		return connectedWireEnds.get(connectionIndex);
 	}
 
 	@Override
-	public Point getWireArrayConnectionPoint(int connectionI)
+	public Point getWireEndConnectionPoint(int connectionI)
 	{
-		return wireArrayConnectionPoints.get(connectionI);
+		return WireEndConnectionPoints.get(connectionI);
 	}
 }
\ No newline at end of file