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 01b2cc8..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,45 +1,50 @@
 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.WireArray;\r
-import era.mi.logic.wires.WireArray.WireArrayInput;\r
-\r
-public class NotGate extends BasicComponent {\r
-       private WireArray in, out;\r
-       private WireArrayInput outI;\r
-\r
-       public NotGate(int processTime, WireArray in, WireArray out) {\r
-               super(processTime);\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 ReadEnd in;\r
+       private ReadWriteEnd out;\r
+\r
+       public NotGate(Timeline timeline, int processTime, ReadEnd in, ReadWriteEnd out)\r
+       {\r
+               super(timeline, processTime);\r
                this.in = in;\r
                in.addObserver(this);\r
                this.out = out;\r
-               outI = out.createInput();\r
        }\r
 \r
-       public void compute() {\r
-               outI.feedSignals(Util.not(in.getValues()));\r
+       @Override\r
+       protected void compute()\r
+       {\r
+               out.feedSignals(in.getValues().not());\r
        }\r
 \r
-       public WireArray getIn() {\r
+       public ReadEnd getIn()\r
+       {\r
                return in;\r
        }\r
 \r
-       public WireArray getOut() {\r
+       public ReadEnd getOut()\r
+       {\r
                return out;\r
        }\r
 \r
        @Override\r
-       public List<WireArray> getAllInputs() {\r
-               return Collections.unmodifiableList(Arrays.asList(in));\r
+       public List<ReadEnd> getAllInputs()\r
+       {\r
+               return List.of(in);\r
        }\r
 \r
        @Override\r
-       public List<WireArray> getAllOutputs() {\r
-               return Collections.unmodifiableList(Arrays.asList(out));\r
+       public List<ReadWriteEnd> getAllOutputs()\r
+       {\r
+               return List.of(out);\r
        }\r
 }\r