X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FConnector.java;h=5fd7ee4c13abd77ab1b64e585594ca78b6c3aca6;hb=6c67a9ff8361cd9fc082f40e2676f2c8b5911fe4;hp=89fb96eb4d6737ec44548f19458c8edc4d20e513;hpb=fb169b120e97337093a8707c62bbc4bb06098a9c;p=Mograsim.git

diff --git a/era.mi/src/era/mi/logic/components/Connector.java b/era.mi/src/era/mi/logic/components/Connector.java
index 89fb96eb..5fd7ee4c 100644
--- a/era.mi/src/era/mi/logic/components/Connector.java
+++ b/era.mi/src/era/mi/logic/components/Connector.java
@@ -2,20 +2,21 @@ package era.mi.logic.components;
 
 import java.util.List;
 
-import era.mi.logic.Simulation;
+import era.mi.logic.timeline.Timeline;
 import era.mi.logic.types.BitVector;
-import era.mi.logic.wires.Wire;
-import era.mi.logic.wires.Wire.WireEnd;
+import era.mi.logic.wires.Wire.ReadEnd;
+import era.mi.logic.wires.Wire.ReadWriteEnd;
 import era.mi.logic.wires.WireObserver;
 
-public class Connector implements WireObserver, Component
+public class Connector extends Component implements WireObserver
 {
 	private boolean connected;
-	private final WireEnd a;
-	private final WireEnd b;
+	private final ReadWriteEnd a;
+	private final ReadWriteEnd b;
 
-	public Connector(WireEnd a, WireEnd 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;
@@ -27,8 +28,8 @@ public class Connector implements WireObserver, Component
 	public void connect()
 	{
 		connected = true;
-		update(a.getWire());
-		update(b.getWire());
+		update(a);
+		update(b);
 	}
 
 	public void disconnect()
@@ -47,28 +48,28 @@ public class Connector implements WireObserver, Component
 	}
 
 	@Override
-	public void update(Wire initiator, BitVector oldValues)
+	public void update(ReadEnd initiator, BitVector oldValues)
 	{
 		if (connected)
-			Simulation.TIMELINE.addEvent(e -> update(initiator), 1);
+			timeline.addEvent(e -> update(initiator), 1);
 	}
 
-	private void update(Wire initiator)
+	private void update(ReadEnd initiator)
 	{
-		if (initiator == a.getWire())
+		if (initiator == a)
 			b.feedSignals(a.wireValuesExcludingMe());
 		else
 			a.feedSignals(b.wireValuesExcludingMe());
 	}
 
 	@Override
-	public List<WireEnd> getAllInputs()
+	public List<ReadEnd> getAllInputs()
 	{
 		return List.of(a, b);
 	}
 
 	@Override
-	public List<WireEnd> getAllOutputs()
+	public List<ReadWriteEnd> getAllOutputs()
 	{
 		return List.of(a, b);
 	}