Updated LogicUI to Java 10

[Mograsim.git] / LogicUI / src / era / mi / gui / wires / GUIWire.java

diff --git a/LogicUI/src/era/mi/gui/wires/GUIWire.java b/LogicUI/src/era/mi/gui/wires/GUIWire.java
index e711acb..53e122a 100644 (file)
--- a/LogicUI/src/era/mi/gui/wires/GUIWire.java
+++ b/LogicUI/src/era/mi/gui/wires/GUIWire.java
@@ -6,24 +6,24 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 
 import era.mi.gui.components.BasicGUIComponent;
-import era.mi.logic.Bit;
-import era.mi.logic.wires.WireArray;
+import era.mi.logic.types.Bit;
+import era.mi.logic.wires.Wire;
 import net.haspamelodica.swt.helper.gcs.GeneralGC;
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;
 
 public class GUIWire
 {
-       private final WireArray wa;
+       private final Wire wire;
        private final double[] path;
 
        public GUIWire(Runnable redraw, BasicGUIComponent component1, int component1ConnectionIndex, Point component1Pos,
                        BasicGUIComponent component2, int component2ConnectionIndex, Point component2Pos, Point... path)
        {
-               this.wa = component1.getConnectedWireArray(component1ConnectionIndex);
-               if (!Objects.equals(wa, component2.getConnectedWireArray(component2ConnectionIndex)))
+               this.wire = component1.getConnectedWireEnd(component1ConnectionIndex).getWire();
+               if (!Objects.equals(wire, component2.getConnectedWireEnd(component2ConnectionIndex).getWire()))
                        throw new IllegalArgumentException("Given connection points are not connected!");
                this.path = new double[path.length * 2 + 4];
-               Point component1ConnectionPoint = component1.getWireArrayConnectionPoint(component1ConnectionIndex);
+               Point component1ConnectionPoint = component1.getWireEndConnectionPoint(component1ConnectionIndex);
                this.path[0] = component1Pos.x + component1ConnectionPoint.x;
                this.path[1] = component1Pos.y + component1ConnectionPoint.y;
                for (int srcI = 0, dstI = 2; srcI < path.length; srcI++, dstI += 2)
@@ -31,18 +31,18 @@ public class GUIWire
                        this.path[dstI + 0] = path[srcI].x;
                        this.path[dstI + 1] = path[srcI].y;
                }
-               Point component2ConnectionPoint = component2.getWireArrayConnectionPoint(component2ConnectionIndex);
+               Point component2ConnectionPoint = component2.getWireEndConnectionPoint(component2ConnectionIndex);
                this.path[this.path.length - 2] = component2Pos.x + component2ConnectionPoint.x;
                this.path[this.path.length - 1] = component2Pos.y + component2ConnectionPoint.y;
 
-               wa.addObserver((initiator, oldValues) -> redraw.run());
+               wire.createReadOnlyEnd().addObserver((initiator, oldValues) -> redraw.run());
        }
 
        public void render(GeneralGC gc)
        {
                Color oldFG = gc.getForeground();
-               if (wa.length == 1)
-                       gc.setForeground(gc.getDevice().getSystemColor(getSWTColorConstantForBit(wa.getValue())));
+               if (wire.length == 1)
+                       gc.setForeground(gc.getDevice().getSystemColor(getSWTColorConstantForBit(wire.getValue())));
                gc.drawPolyline(path);
                gc.setForeground(oldFG);
        }