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=34f4937401b24ebf476d9ece382b65dd4807ace8;hpb=c1d0ddc342c482051fa6c455bb286617135bd3c3;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 34f49374..01795e01 100644
--- a/era.mi/src/era/mi/logic/components/Clock.java
+++ b/era.mi/src/era/mi/logic/components/Clock.java
@@ -1,20 +1,19 @@
 package era.mi.logic.components;
 
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
-import era.mi.logic.Bit;
-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;
 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;
 
-public class Clock implements TimelineEventHandler, Component
+public class Clock extends Component implements TimelineEventHandler
 {
 	private boolean toggle = false;
-	private WireEnd out;
+	private ReadWriteEnd out;
 	private int delta;
 
 	/**
@@ -22,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(WireEnd out, int delta)
+	public Clock(Timeline timeline, ReadWriteEnd out, int delta)
 	{
+		super(timeline);
 		this.delta = delta;
 		this.out = out;
 		addToTimeline();
@@ -33,29 +33,29 @@ public class Clock implements TimelineEventHandler, Component
 	public void handle(TimelineEvent e)
 	{
 		addToTimeline();
-		out.feedSignals(new Bit[] { toggle ? Bit.ONE : Bit.ZERO });
+		out.feedSignals(toggle ? Bit.ONE : Bit.ZERO);
 		toggle = !toggle;
 	}
 
-	public WireEnd getOut()
+	public ReadWriteEnd getOut()
 	{
 		return out;
 	}
 
 	private void addToTimeline()
 	{
-		Simulation.TIMELINE.addEvent(this, delta);
+		timeline.addEvent(this, delta);
 	}
 
 	@Override
-	public List<WireEnd> getAllInputs()
+	public List<ReadEnd> getAllInputs()
 	{
-		return Collections.unmodifiableList(Arrays.asList());
+		return List.of();
 	}
 
 	@Override
-	public List<WireEnd> getAllOutputs()
+	public List<ReadWriteEnd> getAllOutputs()
 	{
-		return Collections.unmodifiableList(Arrays.asList(out));
+		return List.of(out);
 	}
 }