Did some clean up

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

diff --git a/era.mi/src/era/mi/logic/components/gates/MultiInputGate.java b/era.mi/src/era/mi/logic/components/gates/MultiInputGate.java
index d67e8ea..2094b84 100644 (file)
--- a/era.mi/src/era/mi/logic/components/gates/MultiInputGate.java
+++ b/era.mi/src/era/mi/logic/components/gates/MultiInputGate.java
@@ -1,29 +1,30 @@
 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.Bit;\r
 import era.mi.logic.components.BasicComponent;\r
 import era.mi.logic.wires.WireArray;\r
-import era.mi.logic.wires.WireArray.WireArrayInput;\r
+import era.mi.logic.wires.WireArray.WireArrayEnd;\r
 \r
-public abstract class MultiInputGate extends BasicComponent {\r
+public abstract class MultiInputGate extends BasicComponent\r
+{\r
        protected WireArray[] in;\r
        protected WireArray out;\r
-       protected WireArrayInput outI;\r
+       protected WireArrayEnd outI;\r
        protected final int length;\r
        protected Operation op;\r
 \r
-       protected MultiInputGate(int processTime, Operation op, WireArray out, WireArray... in) {\r
+       protected MultiInputGate(int processTime, Operation op, WireArray out, WireArray... in)\r
+       {\r
                super(processTime);\r
                this.op = op;\r
                length = out.length;\r
                this.in = in.clone();\r
                if (in.length < 1)\r
                        throw new IllegalArgumentException(String.format("Cannot create gate with %d wires.", in.length));\r
-               for (WireArray w : in) {\r
+               for (WireArray w : in)\r
+               {\r
                        if (w.length != length)\r
                                throw new IllegalArgumentException("All wires connected to the gate must be of uniform length.");\r
                        w.addObserver(this);\r
@@ -33,23 +34,28 @@ public abstract class MultiInputGate extends BasicComponent {
        }\r
 \r
        @Override\r
-       public List<WireArray> getAllInputs() {\r
-               return Collections.unmodifiableList(Arrays.asList(in));\r
+       public List<WireArray> 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<WireArray> getAllOutputs()\r
+       {\r
+               return List.of(out);\r
        }\r
 \r
-       protected void compute() {\r
+       @Override\r
+       protected void compute()\r
+       {\r
                Bit[] result = in[0].getValues();\r
                for (int i = 1; i < in.length; i++)\r
                        result = op.execute(result, in[i].getValues());\r
                outI.feedSignals(result);\r
        }\r
 \r
-       protected interface Operation {\r
+       protected interface Operation\r
+       {\r
                public Bit[] execute(Bit[] a, Bit[] b);\r
        }\r
 }\r