Merge logic of origin into logic

[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 3fe3611..d638617 100644 (file)
--- a/era.mi/src/era/mi/logic/components/Clock.java
+++ b/era.mi/src/era/mi/logic/components/Clock.java
@@ -1,54 +1,59 @@
 package era.mi.logic.components;
 
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
 import era.mi.logic.Bit;
 import era.mi.logic.Simulation;
 import era.mi.logic.timeline.TimelineEvent;
 import era.mi.logic.timeline.TimelineEventHandler;
-import era.mi.logic.wires.WireArray;
-import era.mi.logic.wires.WireArray.WireArrayInput;
+import era.mi.logic.wires.Wire;
+import era.mi.logic.wires.Wire.WireEnd;
 
-public class Clock implements TimelineEventHandler, Component {
+public class Clock implements TimelineEventHandler, Component
+{
        private boolean toggle = false;
-       private WireArrayInput outI;
+       private WireEnd out;
        private int delta;
 
        /**
         * 
-        * @param out   {@link WireArray} the clock's impulses are fed into
+        * @param out   {@link Wire} the clock's impulses are fed into
         * @param delta ticks between rising and falling edge
         */
-       public Clock(WireArray out, int delta) {
+       public Clock(WireEnd out, int delta)
+       {
                this.delta = delta;
-               this.outI = out.createInput();
-               Simulation.TIMELINE.addEvent(this, 50);
+               this.out = out;
+               addToTimeline();
        }
 
        @Override
-       public void handle(TimelineEvent e) {
+       public void handle(TimelineEvent e)
+       {
                addToTimeline();
-               outI.feedSignals(new Bit[] { toggle ? Bit.ONE : Bit.ZERO });
+               out.feedSignals(toggle ? Bit.ONE : Bit.ZERO);
                toggle = !toggle;
        }
 
-       public WireArray getOut() {
-               return outI.owner;
+       public WireEnd getOut()
+       {
+               return out;
        }
 
-       private void addToTimeline() {
+       private void addToTimeline()
+       {
                Simulation.TIMELINE.addEvent(this, delta);
        }
 
        @Override
-       public List<WireArray> getAllInputs() {
-               return Collections.unmodifiableList(Arrays.asList());
+       public List<WireEnd> getAllInputs()
+       {
+               return List.of();
        }
 
        @Override
-       public List<WireArray> getAllOutputs() {
-               return Collections.unmodifiableList(Arrays.asList(outI.owner));
+       public List<WireEnd> getAllOutputs()
+       {
+               return List.of(out);
        }
 }