X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FBasicComponent.java;h=47a3057a09cdbbab8922b87574aa521b0de6c49d;hb=6c67a9ff8361cd9fc082f40e2676f2c8b5911fe4;hp=509c662b7f108bf79d78ea0f86326a52d37fd73a;hpb=4712d3e6ee08461b7754dbfba1c9e82372bb474d;p=Mograsim.git

diff --git a/era.mi/src/era/mi/logic/components/BasicComponent.java b/era.mi/src/era/mi/logic/components/BasicComponent.java
index 509c662b..47a3057a 100644
--- a/era.mi/src/era/mi/logic/components/BasicComponent.java
+++ b/era.mi/src/era/mi/logic/components/BasicComponent.java
@@ -1,16 +1,16 @@
 package era.mi.logic.components;
 
-import era.mi.logic.Bit;
-import era.mi.logic.Simulation;
-import era.mi.logic.wires.WireArray;
-import era.mi.logic.wires.WireArrayObserver;
+import era.mi.logic.timeline.Timeline;
+import era.mi.logic.types.BitVector;
+import era.mi.logic.wires.Wire.ReadEnd;
+import era.mi.logic.wires.WireObserver;
 
 /**
  * A basic component that recomputes all outputs (with a delay), when it is updated.
  * 
  * @author Fabian Stemmler
  */
-public abstract class BasicComponent implements WireArrayObserver, Component
+public abstract class BasicComponent extends Component implements WireObserver
 {
 	private int processTime;
 
@@ -20,18 +20,16 @@ public abstract class BasicComponent implements WireArrayObserver, Component
 	 * 
 	 * @author Fabian Stemmler
 	 */
-	public BasicComponent(int processTime)
+	public BasicComponent(Timeline timeline, int processTime)
 	{
+		super(timeline);
 		this.processTime = processTime > 0 ? processTime : 1;
 	}
 
 	@Override
-	public void update(WireArray initiator, Bit[] oldValues)
+	public void update(ReadEnd initiator, BitVector oldValues)
 	{
-		Simulation.TIMELINE.addEvent((e) ->
-		{
-			compute();
-		}, processTime);
+		timeline.addEvent(e -> compute(), processTime);
 	}
 
 	protected abstract void compute();