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 2809027..1cf101b 100644 (file)
--- a/era.mi/src/era/mi/logic/components/Clock.java
+++ b/era.mi/src/era/mi/logic/components/Clock.java
@@ -2,58 +2,60 @@ package era.mi.logic.components;
 \r
 import java.util.List;\r
 \r
-import era.mi.logic.Bit;\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.wires.WireArray;\r
-import era.mi.logic.wires.WireArray.WireArrayEnd;\r
+import era.mi.logic.types.Bit;\r
+import era.mi.logic.wires.Wire;\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 WireArrayEnd outI;\r
+       private ReadWriteEnd out;\r
        private int delta;\r
 \r
        /**\r
         * \r
-        * @param out   {@link WireArray} the clock's impulses are fed into\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(WireArray out, int delta)\r
+       public Clock(Timeline timeline, ReadWriteEnd out, int delta)\r
        {\r
+               super(timeline);\r
                this.delta = delta;\r
-               this.outI = out.createInput();\r
-               Simulation.TIMELINE.addEvent(this, delta);\r
+               this.out = out;\r
+               addToTimeline();\r
        }\r
 \r
        @Override\r
        public void handle(TimelineEvent e)\r
        {\r
                addToTimeline();\r
-               outI.feedSignals(toggle ? Bit.ONE : Bit.ZERO);\r
+               out.feedSignals(toggle ? Bit.ONE : Bit.ZERO);\r
                toggle = !toggle;\r
        }\r
 \r
-       public WireArray getOut()\r
+       public ReadWriteEnd getOut()\r
        {\r
-               return outI.owner;\r
+               return out;\r
        }\r
 \r
        private void addToTimeline()\r
        {\r
-               Simulation.TIMELINE.addEvent(this, delta);\r
+               timeline.addEvent(this, delta);\r
        }\r
 \r
        @Override\r
-       public List<WireArray> getAllInputs()\r
+       public List<ReadEnd> getAllInputs()\r
        {\r
                return List.of();\r
        }\r
 \r
        @Override\r
-       public List<WireArray> getAllOutputs()\r
+       public List<ReadWriteEnd> getAllOutputs()\r
        {\r
-               return List.of(outI.owner);\r
+               return List.of(out);\r
        }\r
 }\r