X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FClock.java;h=01795e0111e2d7b156773e6fd48e18dd9b730902;hb=6c67a9ff8361cd9fc082f40e2676f2c8b5911fe4;hp=f7648554e2e1c3c4df92a0e798d082a25a8d9ca1;hpb=b7ce41467a2cbd9f45554982730741810e99feaa;p=Mograsim.git

diff --git a/era.mi/src/era/mi/logic/components/Clock.java b/era.mi/src/era/mi/logic/components/Clock.java
index f7648554..01795e01 100644
--- a/era.mi/src/era/mi/logic/components/Clock.java
+++ b/era.mi/src/era/mi/logic/components/Clock.java
@@ -2,7 +2,7 @@ package era.mi.logic.components;
 
 import java.util.List;
 
-import era.mi.logic.Simulation;
+import era.mi.logic.timeline.Timeline;
 import era.mi.logic.timeline.TimelineEvent;
 import era.mi.logic.timeline.TimelineEventHandler;
 import era.mi.logic.types.Bit;
@@ -10,7 +10,7 @@ import era.mi.logic.wires.Wire;
 import era.mi.logic.wires.Wire.ReadEnd;
 import era.mi.logic.wires.Wire.ReadWriteEnd;
 
-public class Clock implements TimelineEventHandler, Component
+public class Clock extends Component implements TimelineEventHandler
 {
 	private boolean toggle = false;
 	private ReadWriteEnd out;
@@ -21,8 +21,9 @@ public class Clock implements TimelineEventHandler, Component
 	 * @param out   {@link Wire} the clock's impulses are fed into
 	 * @param delta ticks between rising and falling edge
 	 */
-	public Clock(ReadWriteEnd out, int delta)
+	public Clock(Timeline timeline, ReadWriteEnd out, int delta)
 	{
+		super(timeline);
 		this.delta = delta;
 		this.out = out;
 		addToTimeline();
@@ -43,7 +44,7 @@ public class Clock implements TimelineEventHandler, Component
 
 	private void addToTimeline()
 	{
-		Simulation.TIMELINE.addEvent(this, delta);
+		timeline.addEvent(this, delta);
 	}
 
 	@Override