Did some clean up

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

diff --git a/era.mi/src/era/mi/logic/components/Merger.java b/era.mi/src/era/mi/logic/components/Merger.java
index a54fb95..a738114 100644 (file)
--- a/era.mi/src/era/mi/logic/components/Merger.java
+++ b/era.mi/src/era/mi/logic/components/Merger.java
@@ -1,16 +1,15 @@
 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.Bit;\r
 import era.mi.logic.wires.WireArray;\r
-import era.mi.logic.wires.WireArray.WireArrayInput;\r
+import era.mi.logic.wires.WireArray.WireArrayEnd;\r
 import era.mi.logic.wires.WireArrayObserver;\r
 \r
-public class Merger implements WireArrayObserver, Component {\r
-       private WireArrayInput outI;\r
+public class Merger implements WireArrayObserver, Component\r
+{\r
+       private WireArrayEnd outI;\r
        private WireArray[] inputs;\r
        private int[] beginningIndex;\r
 \r
@@ -19,13 +18,15 @@ public class Merger implements WireArrayObserver, Component {
         * @param union  The output of merging n {@link WireArray}s into one. Must have length = a1.length() + a2.length() + ... + an.length().\r
         * @param inputs The inputs to be merged into the union\r
         */\r
-       public Merger(WireArray union, WireArray... inputs) {\r
+       public Merger(WireArray union, WireArray... inputs)\r
+       {\r
                this.inputs = inputs;\r
                this.outI = union.createInput();\r
                this.beginningIndex = new int[inputs.length];\r
 \r
                int length = 0;\r
-               for (int i = 0; i < inputs.length; i++) {\r
+               for (int i = 0; i < inputs.length; i++)\r
+               {\r
                        beginningIndex[i] = length;\r
                        length += inputs[i].length;\r
                        inputs[i].addObserver(this);\r
@@ -36,39 +37,46 @@ public class Merger implements WireArrayObserver, Component {
                                        "The output of merging n WireArrays into one must have length = a1.length() + a2.length() + ... + an.length().");\r
        }\r
 \r
-       public WireArray getInput(int index) {\r
+       public WireArray getInput(int index)\r
+       {\r
                return inputs[index];\r
        }\r
 \r
-       public WireArray getUnion() {\r
+       public WireArray getUnion()\r
+       {\r
                return outI.owner;\r
        }\r
 \r
        @Override\r
-       public void update(WireArray initiator, Bit[] oldValues) {\r
+       public void update(WireArray initiator, Bit[] oldValues)\r
+       {\r
                int index = find(initiator);\r
                int beginning = beginningIndex[index];\r
                outI.feedSignals(beginning, initiator.getValues());\r
        }\r
 \r
-       private int find(WireArray w) {\r
+       private int find(WireArray w)\r
+       {\r
                for (int i = 0; i < inputs.length; i++)\r
                        if (inputs[i] == w)\r
                                return i;\r
                return -1;\r
        }\r
 \r
-       public WireArray[] getInputs() {\r
+       public WireArray[] getInputs()\r
+       {\r
                return inputs.clone();\r
        }\r
 \r
        @Override\r
-       public List<WireArray> getAllInputs() {\r
-               return Collections.unmodifiableList(Arrays.asList(inputs));\r
+       public List<WireArray> getAllInputs()\r
+       {\r
+               return List.of(inputs);\r
        }\r
 \r
        @Override\r
-       public List<WireArray> getAllOutputs() {\r
-               return Collections.unmodifiableList(Arrays.asList(outI.owner));\r
+       public List<WireArray> getAllOutputs()\r
+       {\r
+               return List.of(outI.owner);\r
        }\r
 }\r