X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=LogicUI%2Fsrc%2Fera%2Fmi%2Fgui%2Fcomponents%2FGUIAndGate.java;fp=LogicUI%2Fsrc%2Fera%2Fmi%2Fgui%2Fcomponents%2FGUIAndGate.java;h=abc80ff9e4dac5c4ed7c03df2bd3db547ba2b47f;hb=4be7eddcfc45e5e5794bd0dc1e2c2423fa43ec51;hp=fa51232b8770fa07cb22e3034d68772036ed6d6f;hpb=d910c4db589f1a9f64ebe42703a0f33d5030a576;p=Mograsim.git

diff --git a/LogicUI/src/era/mi/gui/components/GUIAndGate.java b/LogicUI/src/era/mi/gui/components/GUIAndGate.java
index fa51232b..abc80ff9 100644
--- a/LogicUI/src/era/mi/gui/components/GUIAndGate.java
+++ b/LogicUI/src/era/mi/gui/components/GUIAndGate.java
@@ -6,7 +6,7 @@ import java.util.Collections;
 import java.util.List;
 
 import era.mi.logic.components.gates.AndGate;
-import era.mi.logic.wires.WireArray;
+import era.mi.logic.wires.Wire.WireEnd;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Font;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
@@ -18,31 +18,31 @@ public class GUIAndGate extends AndGate implements BasicGUIComponent
 
 	private final int inputCount;
 	private final double height;
-	private final List<WireArray> connectedWireArrays;
-	private final List<Point> wireArrayConnectionPoints;
+	private final List<WireEnd> connectedWireEnds;
+	private final List<Point> wireEndConnectionPoints;
 
-	public GUIAndGate(int processTime, WireArray out, WireArray... in)
+	public GUIAndGate(int processTime, WireEnd out, WireEnd... in)
 	{
 		super(processTime, out, in);
 
-		List<WireArray> connectedWireArraysModifiable = new ArrayList<>();
-		List<Point> wireArrayConnectionPointsModifiable = new ArrayList<>();
+		List<WireEnd> connectedWireEndsModifiable = new ArrayList<>();
+		List<Point> wireEndConnectionPointsModifiable = new ArrayList<>();
 
 		this.inputCount = in.length;
 		this.height = inputCount * 10;
 
 		{
-			connectedWireArraysModifiable.addAll(Arrays.asList(in));
+			connectedWireEndsModifiable.addAll(Arrays.asList(in));
 			double inputHeight = 5;
 			for (int i = 0; i < inputCount; i++, inputHeight += 10)
-				wireArrayConnectionPointsModifiable.add(new Point(0, inputHeight));
+				wireEndConnectionPointsModifiable.add(new Point(0, inputHeight));
 		}
 
-		connectedWireArraysModifiable.add(out);
-		wireArrayConnectionPointsModifiable.add(new Point(20, height / 2));
+		connectedWireEndsModifiable.add(out);
+		wireEndConnectionPointsModifiable.add(new Point(20, height / 2));
 
-		this.connectedWireArrays = Collections.unmodifiableList(connectedWireArraysModifiable);
-		this.wireArrayConnectionPoints = Collections.unmodifiableList(wireArrayConnectionPointsModifiable);
+		this.connectedWireEnds = Collections.unmodifiableList(connectedWireEndsModifiable);
+		this.wireEndConnectionPoints = Collections.unmodifiableList(wireEndConnectionPointsModifiable);
 	}
 
 	@Override
@@ -64,20 +64,20 @@ public class GUIAndGate extends AndGate implements BasicGUIComponent
 	}
 
 	@Override
-	public int getConnectedWireArraysCount()
+	public int getConnectedWireEndsCount()
 	{
-		return connectedWireArrays.size();
+		return connectedWireEnds.size();
 	}
 
 	@Override
-	public WireArray getConnectedWireArray(int connectionIndex)
+	public WireEnd 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