X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Fcomponents%2FConnector.java;h=dc8490a7119e70465e8ef1748265fe47548edf20;hb=ecc651406020231ff0ebc8d1bfc6f916693f69c6;hp=16b8e709275d1ef0ff51f5d136dc330e7ff7512c;hpb=67c1d352795802dae0c045cedeed82c883819d4e;p=Mograsim.git

diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/Connector.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/Connector.java
index 16b8e709..dc8490a7 100644
--- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/Connector.java
+++ b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/Connector.java
@@ -1,76 +1,76 @@
-package net.mograsim.logic.core.components;
-
-import java.util.List;
-
-import net.mograsim.logic.core.timeline.Timeline;
-import net.mograsim.logic.core.types.BitVector;
-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 Connector extends Component implements WireObserver
-{
-	private boolean connected;
-	private final ReadWriteEnd a;
-	private final ReadWriteEnd b;
-
-	public Connector(Timeline timeline, ReadWriteEnd a, ReadWriteEnd b)
-	{
-		super(timeline);
-		if (a.length() != b.length())
-			throw new IllegalArgumentException(String.format("WireArray width does not match: %d, %d", a.length(), b.length()));
-		this.a = a;
-		this.b = b;
-		a.addObserver(this);
-		b.addObserver(this);
-	}
-
-	public void connect()
-	{
-		connected = true;
-		update(a);
-		update(b);
-	}
-
-	public void disconnect()
-	{
-		connected = false;
-		a.clearSignals();
-		b.clearSignals();
-	}
-
-	public void setConnection(boolean connected)
-	{
-		if (connected)
-			connect();
-		else
-			disconnect();
-	}
-
-	@Override
-	public void update(ReadEnd initiator, BitVector oldValues)
-	{
-		if (connected)
-			timeline.addEvent(e -> update(initiator), 1);
-	}
-
-	private void update(ReadEnd initiator)
-	{
-		if (initiator == a)
-			b.feedSignals(a.wireValuesExcludingMe());
-		else
-			a.feedSignals(b.wireValuesExcludingMe());
-	}
-
-	@Override
-	public List<ReadEnd> getAllInputs()
-	{
-		return List.of(a, b);
-	}
-
-	@Override
-	public List<ReadWriteEnd> getAllOutputs()
-	{
-		return List.of(a, b);
-	}
-}
+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.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.wires.Wire.ReadWriteEnd;
+
+public class Connector extends Component implements LogicObserver
+{
+	private boolean connected;
+	private final ReadWriteEnd a;
+	private final ReadWriteEnd b;
+
+	public Connector(Timeline timeline, ReadWriteEnd a, ReadWriteEnd b)
+	{
+		super(timeline);
+		if (a.length() != b.length())
+			throw new IllegalArgumentException(String.format("WireArray width does not match: %d, %d", a.length(), b.length()));
+		this.a = a;
+		this.b = b;
+		a.registerObserver(this);
+		b.registerObserver(this);
+	}
+
+	public void connect()
+	{
+		connected = true;
+		update(a);
+		update(b);
+	}
+
+	public void disconnect()
+	{
+		connected = false;
+		a.clearSignals();
+		b.clearSignals();
+	}
+
+	public void setConnection(boolean connected)
+	{
+		if (connected)
+			connect();
+		else
+			disconnect();
+	}
+
+	@Override
+	public void update(LogicObservable initiator)
+	{
+		if (connected)
+			timeline.addEvent(e -> innerUpdate(initiator), 1);
+	}
+
+	private void innerUpdate(LogicObservable initiator)
+	{
+		if (initiator == a)
+			b.feedSignals(a.wireValuesExcludingMe());
+		else
+			a.feedSignals(b.wireValuesExcludingMe());
+	}
+
+	@Override
+	public List<ReadEnd> getAllInputs()
+	{
+		return List.of(a, b);
+	}
+
+	@Override
+	public List<ReadWriteEnd> getAllOutputs()
+	{
+		return List.of(a, b);
+	}
+}