Timeline now passed via constructor

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

diff --git a/era.mi/src/era/mi/logic/components/Demux.java b/era.mi/src/era/mi/logic/components/Demux.java
index 89a06fe..c67756a 100644 (file)
--- a/era.mi/src/era/mi/logic/components/Demux.java
+++ b/era.mi/src/era/mi/logic/components/Demux.java
@@ -1,11 +1,11 @@
 package era.mi.logic.components;\r
 \r
-import java.util.Arrays;\r
-import java.util.Collections;\r
 import java.util.List;\r
 \r
+import era.mi.logic.timeline.Timeline;\r
 import era.mi.logic.wires.Wire;\r
-import era.mi.logic.wires.Wire.WireEnd;\r
+import era.mi.logic.wires.Wire.ReadEnd;\r
+import era.mi.logic.wires.Wire.ReadWriteEnd;\r
 \r
 /**\r
  * Models a multiplexer. Takes an arbitrary amount of input {@link Wire}s, one of which, as determined by select, is put through to the\r
@@ -16,21 +16,21 @@ import era.mi.logic.wires.Wire.WireEnd;
  */\r
 public class Demux extends BasicComponent\r
 {\r
-       private final WireEnd select, in;\r
-       private final WireEnd[] outputs;\r
+       private final ReadEnd select, in;\r
+       private final ReadWriteEnd[] outputs;\r
        private final int outputSize;\r
        private int selected = -1;\r
 \r
        /**\r
-        * Input {@link Wire}s and out must be of uniform length\r
+        * Output {@link Wire}s and in must be of uniform length\r
         * \r
-        * @param out     Must be of uniform length with all inputs.\r
-        * @param select  Indexes the input array which is to be mapped to the output. Must have enough bits to index all inputs.\r
-        * @param outputs One of these inputs is mapped to the output, depending on the select bits\r
+        * @param in      Must be of uniform length with all outputs.\r
+        * @param select  Indexes the output array to which the input is mapped. Must have enough bits to index all outputs.\r
+        * @param outputs One of these outputs receives the input signal, depending on the select bits\r
         */\r
-       public Demux(int processTime, WireEnd in, WireEnd select, WireEnd... outputs)\r
+       public Demux(Timeline timeline, int processTime, ReadEnd in, ReadEnd select, ReadWriteEnd... outputs)\r
        {\r
-               super(processTime);\r
+               super(timeline, processTime);\r
                outputSize = in.length();\r
 \r
                this.in = in;\r
@@ -69,14 +69,14 @@ public class Demux extends BasicComponent
        }\r
 \r
        @Override\r
-       public List<WireEnd> getAllInputs()\r
+       public List<ReadEnd> getAllInputs()\r
        {\r
-               return Collections.unmodifiableList(Arrays.asList(in, select));\r
+               return List.of(in, select);\r
        }\r
 \r
        @Override\r
-       public List<WireEnd> getAllOutputs()\r
+       public List<ReadWriteEnd> getAllOutputs()\r
        {\r
-               return Collections.unmodifiableList(Arrays.asList(outputs));\r
+               return List.of(outputs);\r
        }\r
 }\r