X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Fcomponents%2FMerger.java;h=6fa5b93c126d057850a2e8430f1c7f702c47a8fe;hb=f14ea37d69488dd51518a36413af7176916b8bd7;hp=c4c7170144f4217f5d805de7e1efbf5a261fb6f2;hpb=07faf07e3acb8b2afdc2bf65a46bc868faaed0f8;p=Mograsim.git

diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/Merger.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/Merger.java
index c4c71701..6fa5b93c 100644
--- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/Merger.java
+++ b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/Merger.java
@@ -2,14 +2,14 @@ package net.mograsim.logic.core.components;
 
 import java.util.List;
 
+import net.mograsim.logic.core.LogicObservable;
+import net.mograsim.logic.core.LogicObserver;
 import net.mograsim.logic.core.timeline.Timeline;
-import net.mograsim.logic.core.types.BitVector;
 import net.mograsim.logic.core.wires.Wire;
-import net.mograsim.logic.core.wires.WireObserver;
 import net.mograsim.logic.core.wires.Wire.ReadEnd;
 import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
 
-public class Merger extends Component implements WireObserver
+public class Merger extends Component implements LogicObserver
 {
 	private ReadWriteEnd out;
 	private ReadEnd[] inputs;
@@ -32,7 +32,7 @@ public class Merger extends Component implements WireObserver
 		{
 			beginningIndex[i] = length;
 			length += inputs[i].length();
-			inputs[i].addObserver(this);
+			inputs[i].registerObserver(this);
 		}
 
 		if (length != union.length())
@@ -51,14 +51,14 @@ public class Merger extends Component implements WireObserver
 	}
 
 	@Override
-	public void update(ReadEnd initiator, BitVector oldValues)
+	public void update(LogicObservable initiator)
 	{
 		int index = find(initiator);
 		int beginning = beginningIndex[index];
 		out.feedSignals(beginning, inputs[index].getValues());
 	}
 
-	private int find(ReadEnd r)
+	private int find(LogicObservable r)
 	{
 		for (int i = 0; i < inputs.length; i++)
 			if (inputs[i] == r)