Timeline now passed via constructor

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

diff --git a/era.mi/src/era/mi/logic/components/BasicComponent.java b/era.mi/src/era/mi/logic/components/BasicComponent.java
index f73e0f7..1178568 100644 (file)
--- a/era.mi/src/era/mi/logic/components/BasicComponent.java
+++ b/era.mi/src/era/mi/logic/components/BasicComponent.java
@@ -1,6 +1,6 @@
 package era.mi.logic.components;\r
 \r
-import era.mi.logic.Simulation;\r
+import era.mi.logic.timeline.Timeline;\r
 import era.mi.logic.types.BitVector;\r
 import era.mi.logic.wires.Wire.ReadEnd;\r
 import era.mi.logic.wires.WireObserver;\r
@@ -10,7 +10,7 @@ import era.mi.logic.wires.WireObserver;
  * \r
  * @author Fabian Stemmler\r
  */\r
-public abstract class BasicComponent implements WireObserver, Component\r
+public abstract class BasicComponent extends Component implements WireObserver\r
 {\r
        private int processTime;\r
 \r
@@ -20,15 +20,16 @@ public abstract class BasicComponent implements WireObserver, Component
         * \r
         * @author Fabian Stemmler\r
         */\r
-       public BasicComponent(int processTime)\r
+       public BasicComponent(Timeline timeline, int processTime)\r
        {\r
+               super(timeline);\r
                this.processTime = processTime > 0 ? processTime : 1;\r
        }\r
 \r
        @Override\r
        public void update(ReadEnd initiator, BitVector oldValues)\r
        {\r
-               Simulation.TIMELINE.addEvent(e -> compute(), processTime);\r
+               timeline.addEvent(e -> compute(), processTime);\r
        }\r
 \r
        protected abstract void compute();\r