X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2Fgates%2FAndGate.java;h=2722f036cfe1fa4c694c343f1221efe85cfbb409;hb=c1d0ddc342c482051fa6c455bb286617135bd3c3;hp=b3269cbd48a4ffab3170dd2aaf0b99646f2ca8dc;hpb=fa95c348b3b8fb9681e4bf5c8284c5ac8eeed518;p=Mograsim.git

diff --git a/era.mi/src/era/mi/logic/components/gates/AndGate.java b/era.mi/src/era/mi/logic/components/gates/AndGate.java
index b3269cbd..2722f036 100644
--- a/era.mi/src/era/mi/logic/components/gates/AndGate.java
+++ b/era.mi/src/era/mi/logic/components/gates/AndGate.java
@@ -1,43 +1,12 @@
 package era.mi.logic.components.gates;
 
 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 AndGate extends BasicComponent
+public class AndGate extends MultiInputGate
 {
-	private WireArray a, b, out;
-	private WireArrayInput outI;
-	
-	public AndGate(int processTime, WireArray a, WireArray b, WireArray out)
+	public AndGate(int processTime, WireEnd out, WireEnd... in)
 	{
-		super(processTime);
-		this.a = a;
-		a.addObserver(this);
-		this.b = b;
-		b.addObserver(this);
-		this.out = out;
-		outI = out.createInput();
-	}
-
-	protected void compute()
-	{
-		outI.feedSignals(Util.and(a.getValues(), b.getValues()));
-	}
-
-	public WireArray getA()
-	{
-		return a;
-	}
-
-	public WireArray getB()
-	{
-		return b;
-	}
-
-	public WireArray getOut()
-	{
-		return out;
+		super(processTime, Util::and, out, in);
 	}
 }