Timeline now passed via constructor

[Mograsim.git] / era.mi / src / era / mi / logic / components / Clock.java

diff --git a/era.mi/src/era/mi/logic/components/Clock.java b/era.mi/src/era/mi/logic/components/Clock.java
index 07419b4..01795e0 100644 (file)
--- a/era.mi/src/era/mi/logic/components/Clock.java
+++ b/era.mi/src/era/mi/logic/components/Clock.java
@@ -2,17 +2,18 @@ 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;
 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;
 
        /**
@@ -20,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();
@@ -35,24 +37,24 @@ public class Clock implements TimelineEventHandler, Component
                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 List.of();
        }
 
        @Override
-       public List<WireEnd> getAllOutputs()
+       public List<ReadWriteEnd> getAllOutputs()
        {
                return List.of(out);
        }