Timeline now passed via constructor

[Mograsim.git] / era.mi / src / era / mi / logic / components / gates / NotGate.java

diff --git a/era.mi/src/era/mi/logic/components/gates/NotGate.java b/era.mi/src/era/mi/logic/components/gates/NotGate.java
index eb719b1..7831cd2 100644 (file)
--- a/era.mi/src/era/mi/logic/components/gates/NotGate.java
+++ b/era.mi/src/era/mi/logic/components/gates/NotGate.java
@@ -1,21 +1,20 @@
 package era.mi.logic.components.gates;\r
 \r
-import java.util.Arrays;\r
-import java.util.Collections;\r
 import java.util.List;\r
 \r
-import era.mi.logic.Util;\r
 import era.mi.logic.components.BasicComponent;\r
-import era.mi.logic.wires.Wire.WireEnd;\r
+import era.mi.logic.timeline.Timeline;\r
+import era.mi.logic.wires.Wire.ReadEnd;\r
+import era.mi.logic.wires.Wire.ReadWriteEnd;\r
 \r
 public class NotGate extends BasicComponent\r
 {\r
-       private WireEnd in;\r
-       private WireEnd out;\r
+       private ReadEnd in;\r
+       private ReadWriteEnd out;\r
 \r
-       public NotGate(int processTime, WireEnd in, WireEnd out)\r
+       public NotGate(Timeline timeline, int processTime, ReadEnd in, ReadWriteEnd out)\r
        {\r
-               super(processTime);\r
+               super(timeline, processTime);\r
                this.in = in;\r
                in.addObserver(this);\r
                this.out = out;\r
@@ -24,28 +23,28 @@ public class NotGate extends BasicComponent
        @Override\r
        protected void compute()\r
        {\r
-               out.feedSignals(Util.not(in.getValues()));\r
+               out.feedSignals(in.getValues().not());\r
        }\r
 \r
-       public WireEnd getIn()\r
+       public ReadEnd getIn()\r
        {\r
                return in;\r
        }\r
 \r
-       public WireEnd getOut()\r
+       public ReadEnd getOut()\r
        {\r
                return out;\r
        }\r
 \r
        @Override\r
-       public List<WireEnd> getAllInputs()\r
+       public List<ReadEnd> getAllInputs()\r
        {\r
-               return Collections.unmodifiableList(Arrays.asList(in));\r
+               return List.of(in);\r
        }\r
 \r
        @Override\r
-       public List<WireEnd> getAllOutputs()\r
+       public List<ReadWriteEnd> getAllOutputs()\r
        {\r
-               return Collections.unmodifiableList(Arrays.asList(out));\r
+               return List.of(out);\r
        }\r
 }\r