\r
import java.util.List;\r
\r
-import era.mi.logic.Simulation;\r
+import era.mi.logic.timeline.Timeline;\r
import era.mi.logic.timeline.TimelineEvent;\r
import era.mi.logic.timeline.TimelineEventHandler;\r
import era.mi.logic.types.Bit;\r
import era.mi.logic.wires.Wire.ReadEnd;\r
import era.mi.logic.wires.Wire.ReadWriteEnd;\r
\r
-public class Clock implements TimelineEventHandler, Component\r
+public class Clock extends Component implements TimelineEventHandler\r
{\r
private boolean toggle = false;\r
private ReadWriteEnd out;\r
* @param out {@link Wire} the clock's impulses are fed into\r
* @param delta ticks between rising and falling edge\r
*/\r
- public Clock(ReadWriteEnd out, int delta)\r
+ public Clock(Timeline timeline, ReadWriteEnd out, int delta)\r
{\r
+ super(timeline);\r
this.delta = delta;\r
this.out = out;\r
addToTimeline();\r
\r
private void addToTimeline()\r
{\r
- Simulation.TIMELINE.addEvent(this, delta);\r
+ timeline.addEvent(this, delta);\r
}\r
\r
@Override\r