X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FBitDisplay.java;h=971eb7a78f18a38bcb1e62328bf01a859f2fe14f;hb=5606ceefa2c360772194c85ed884e5f8f06f36aa;hp=051010b74c8c39bf887035958dce0f200178023f;hpb=4712d3e6ee08461b7754dbfba1c9e82372bb474d;p=Mograsim.git

diff --git a/era.mi/src/era/mi/logic/components/BitDisplay.java b/era.mi/src/era/mi/logic/components/BitDisplay.java
index 051010b7..971eb7a7 100644
--- a/era.mi/src/era/mi/logic/components/BitDisplay.java
+++ b/era.mi/src/era/mi/logic/components/BitDisplay.java
@@ -1,19 +1,17 @@
 package era.mi.logic.components;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
 import java.util.List;
 
-import era.mi.logic.Bit;
-import era.mi.logic.wires.WireArray;
+import era.mi.logic.types.Bit;
+import era.mi.logic.types.BitVector;
+import era.mi.logic.wires.Wire.WireEnd;
 
 public class BitDisplay extends BasicComponent
 {
-	private final WireArray in;
-	private Bit[] displayedValue;
+	private final WireEnd in;
+	private BitVector displayedValue;
 
-	public BitDisplay(WireArray in)
+	public BitDisplay(WireEnd in)
 	{
 		super(1);
 		this.in = in;
@@ -27,25 +25,25 @@ public class BitDisplay extends BasicComponent
 		displayedValue = in.getValues();
 	}
 
-	public Bit[] getDisplayedValue()
+	public BitVector getDisplayedValue()
 	{
 		return displayedValue;
 	}
 
 	public boolean isDisplaying(Bit... values)
 	{
-		return Arrays.equals(displayedValue, values);
+		return displayedValue.equals(BitVector.of(values));
 	}
 
 	@Override
-	public List<WireArray> getAllInputs()
+	public List<WireEnd> getAllInputs()
 	{
-		return Collections.unmodifiableList(Arrays.asList(in));
+		return List.of(in);
 	}
 
 	@Override
-	public List<WireArray> getAllOutputs()
+	public List<WireEnd> getAllOutputs()
 	{
-		return Collections.unmodifiableList(new ArrayList<WireArray>());
+		return List.of();
 	}
 }