Timeline now passed via constructor

[Mograsim.git] / LogicUI / src / era / mi / gui / components / GUINotGate.java

diff --git a/LogicUI/src/era/mi/gui/components/GUINotGate.java b/LogicUI/src/era/mi/gui/components/GUINotGate.java
index 24702fc..e860d9b 100644 (file)
--- a/LogicUI/src/era/mi/gui/components/GUINotGate.java
+++ b/LogicUI/src/era/mi/gui/components/GUINotGate.java
@@ -5,7 +5,9 @@ import java.util.Collections;
 import java.util.List;\r
 \r
 import era.mi.logic.components.gates.NotGate;\r
-import era.mi.logic.wires.WireArray;\r
+import era.mi.logic.timeline.Timeline;\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.Font;\r
 import net.haspamelodica.swt.helper.swtobjectwrappers.Point;\r
@@ -13,26 +15,26 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 \r
 public class GUINotGate extends NotGate implements BasicGUIComponent\r
 {\r
-       private static final String LABEL = "\u22651";//>=1\r
+       private static final String LABEL = "\u22651";// >=1\r
 \r
-       private final List<WireArray>   connectedWireArrays;\r
-       private final List<Point>               wireArrayConnectionPoints;\r
+       private final List<ReadEnd> connectedWireEnds;\r
+       private final List<Point> WireEndConnectionPoints;\r
 \r
-       public GUINotGate(int processTime, WireArray in, WireArray out)\r
+       public GUINotGate(Timeline timeline, int processTime, ReadEnd in, ReadWriteEnd out)\r
        {\r
-               super(processTime, in, out);\r
+               super(timeline, processTime, in, out);\r
 \r
-               List<WireArray> connectedWireArraysModifiable = new ArrayList<>();\r
-               List<Point> wireArrayConnectionPointsModifiable = new ArrayList<>();\r
+               List<ReadEnd> connectedWireEndsModifiable = new ArrayList<>();\r
+               List<Point> WireEndConnectionPointsModifiable = new ArrayList<>();\r
 \r
-               connectedWireArraysModifiable.add(in);\r
-               wireArrayConnectionPointsModifiable.add(new Point(0, 5));\r
+               connectedWireEndsModifiable.add(in);\r
+               WireEndConnectionPointsModifiable.add(new Point(0, 5));\r
 \r
-               connectedWireArraysModifiable.add(out);\r
-               wireArrayConnectionPointsModifiable.add(new Point(20, 5));\r
+               connectedWireEndsModifiable.add(out);\r
+               WireEndConnectionPointsModifiable.add(new Point(20, 5));\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
@@ -40,6 +42,7 @@ public class GUINotGate extends NotGate implements BasicGUIComponent
        {\r
                return new Rectangle(0, 0, 20, 10);\r
        }\r
+\r
        @Override\r
        public void render(GeneralGC gc)\r
        {\r
@@ -54,18 +57,20 @@ public class GUINotGate extends NotGate 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 ReadEnd 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