WireArray(Input) is now Wire(End); all in-/outputs are now WireEnds

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

diff --git a/era.mi/src/era/mi/logic/components/gates/OrGate.java b/era.mi/src/era/mi/logic/components/gates/OrGate.java
index 8e145d1..ba8262a 100644 (file)
--- a/era.mi/src/era/mi/logic/components/gates/OrGate.java
+++ b/era.mi/src/era/mi/logic/components/gates/OrGate.java
@@ -1,59 +1,12 @@
 package era.mi.logic.components.gates;
 
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
 import era.mi.logic.Util;
-import era.mi.logic.components.BasicComponent;
-import era.mi.logic.wires.WireArray;
-import era.mi.logic.wires.WireArray.WireArrayInput;
+import era.mi.logic.wires.Wire.WireEnd;
 
-public class OrGate extends BasicComponent
+public class OrGate extends MultiInputGate
 {
-       private WireArray a, b, out;
-       private WireArrayInput outI;
-       
-       public OrGate(int processTime, WireArray a, WireArray b, WireArray out)
-       {
-               super(processTime);
-               this.a = a;
-               a.addObserver(this);
-               this.b = b;
-               b.addObserver(this);
-               this.out = out;
-               this.outI = out.createInput();
-       }
-
-       protected void compute()
-       {
-               outI.feedSignals(Util.or(a.getValues(), b.getValues()));
-       }
-
-       public WireArray getA()
-       {
-               return a;
-       }
-
-       public WireArray getB()
-       {
-               return b;
-       }
-
-       public WireArray getOut()
-       {
-               return out;
-       }
-       
-       @Override
-       public List<WireArray> getAllInputs()
-       {
-               return Collections.unmodifiableList(Arrays.asList(a, b));
-       }
-
-       @Override
-       public List<WireArray> getAllOutputs()
+       public OrGate(int processTime, WireEnd out, WireEnd... in)
        {
-               return Collections.unmodifiableList(Arrays.asList(out));
+               super(processTime, Util::or, out, in);
        }
 }