X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FMerger.java;h=34ba217cf7a551806c2a4e732e15db9518357542;hb=373b945917f9d573e4b1bd0e97f98b02fb0d9c07;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..34ba217c 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.types.BitVector;
 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;
@@ -50,7 +48,7 @@ public class Merger implements WireArrayObserver, Component
 	}
 
 	@Override
-	public void update(Wire initiator, Bit[] oldValues)
+	public void update(Wire initiator, BitVector oldValues)
 	{
 		int index = find(initiator);
 		int beginning = beginningIndex[index];
@@ -73,12 +71,12 @@ public class Merger implements WireArrayObserver, Component
 	@Override
 	public List<WireEnd> getAllInputs()
 	{
-		return Collections.unmodifiableList(Arrays.asList(inputs));
+		return List.of(inputs);
 	}
 
 	@Override
 	public List<WireEnd> getAllOutputs()
 	{
-		return Collections.unmodifiableList(Arrays.asList(out));
+		return List.of(out);
 	}
 }