X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FMerger.java;h=613d52391450dca92675bec68b4b7079671ef87e;hb=b1e7855af2dfc15b4d6c1253dd77db02925162f3;hp=225a35a9111af47feb2cfa3cfd8c9cfa6edcbf3e;hpb=c1d0ddc342c482051fa6c455bb286617135bd3c3;p=Mograsim.git diff --git a/era.mi/src/era/mi/logic/components/Merger.java b/era.mi/src/era/mi/logic/components/Merger.java index 225a35a9..613d5239 100644 --- 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; -import java.util.Arrays; -import java.util.Collections; import java.util.List; import era.mi.logic.Bit; import era.mi.logic.wires.Wire; import era.mi.logic.wires.Wire.WireEnd; -import era.mi.logic.wires.WireArrayObserver; +import era.mi.logic.wires.WireObserver; -public class Merger implements WireArrayObserver, Component +public class Merger implements WireObserver, Component { private WireEnd out; private WireEnd[] inputs; @@ -73,12 +71,12 @@ public class Merger implements WireArrayObserver, Component @Override public List getAllInputs() { - return Collections.unmodifiableList(Arrays.asList(inputs)); + return List.of(inputs); } @Override public List getAllOutputs() { - return Collections.unmodifiableList(Arrays.asList(out)); + return List.of(out); } }