Generalized WireObserver to LogicObserver

[Mograsim.git] / net.mograsim.logic.core / src / net / mograsim / logic / core / components / BasicComponent.java

diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/BasicComponent.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/BasicComponent.java
index 426c6a1..e2d2d65 100644 (file)
--- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/BasicComponent.java
+++ b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/BasicComponent.java
@@ -1,36 +1,35 @@
-package net.mograsim.logic.core.components;
-
-import net.mograsim.logic.core.timeline.Timeline;
-import net.mograsim.logic.core.types.BitVector;
-import net.mograsim.logic.core.wires.WireObserver;
-import net.mograsim.logic.core.wires.Wire.ReadEnd;
-
-/**
- * A basic component that recomputes all outputs (with a delay), when it is updated.
- * 
- * @author Fabian Stemmler
- */
-public abstract class BasicComponent extends Component implements WireObserver
-{
-       private int processTime;
-
-       /**
-        * 
-        * @param processTime Amount of time this component takes to update its outputs. Must be more than 0, otherwise 1 is assumed.
-        * 
-        * @author Fabian Stemmler
-        */
-       public BasicComponent(Timeline timeline, int processTime)
-       {
-               super(timeline);
-               this.processTime = processTime > 0 ? processTime : 1;
-       }
-
-       @Override
-       public void update(ReadEnd initiator, BitVector oldValues)
-       {
-               timeline.addEvent(e -> compute(), processTime);
-       }
-
-       protected abstract void compute();
-}
+package net.mograsim.logic.core.components;\r
+\r
+import net.mograsim.logic.core.LogicObservable;\r
+import net.mograsim.logic.core.LogicObserver;\r
+import net.mograsim.logic.core.timeline.Timeline;\r
+\r
+/**\r
+ * A basic component that recomputes all outputs (with a delay), when it is updated.\r
+ * \r
+ * @author Fabian Stemmler\r
+ */\r
+public abstract class BasicComponent extends Component implements LogicObserver\r
+{\r
+       private int processTime;\r
+\r
+       /**\r
+        * \r
+        * @param processTime Amount of time this component takes to update its outputs. Must be more than 0, otherwise 1 is assumed.\r
+        * \r
+        * @author Fabian Stemmler\r
+        */\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(LogicObservable initiator)\r
+       {\r
+               timeline.addEvent(e -> compute(), processTime);\r
+       }\r
+\r
+       protected abstract void compute();\r
+}\r