Integrated new types, tests still work, not used yet

[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 2b5e0b9..7ef909b 100644 (file)
--- a/era.mi/src/era/mi/logic/components/Merger.java
+++ b/era.mi/src/era/mi/logic/components/Merger.java
@@ -1,15 +1,13 @@
 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.types.Bit;\r
 import era.mi.logic.wires.Wire;\r
 import era.mi.logic.wires.Wire.WireEnd;\r
-import era.mi.logic.wires.WireArrayObserver;\r
+import era.mi.logic.wires.WireObserver;\r
 \r
-public class Merger implements WireArrayObserver, Component\r
+public class Merger implements WireObserver, Component\r
 {\r
        private WireEnd out;\r
        private WireEnd[] inputs;\r
@@ -73,12 +71,12 @@ public class Merger implements WireArrayObserver, Component
        @Override\r
        public List<WireEnd> getAllInputs()\r
        {\r
-               return Collections.unmodifiableList(Arrays.asList(inputs));\r
+               return List.of(inputs);\r
        }\r
 \r
        @Override\r
        public List<WireEnd> getAllOutputs()\r
        {\r
-               return Collections.unmodifiableList(Arrays.asList(out));\r
+               return List.of(out);\r
        }\r
 }\r