X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FBitDisplay.java;h=f11fdf869fe511c62cc94ef3c3189e035ea19e70;hb=70afb26181aba8de30ea6f796ea5c2a573d9ecab;hp=25ee2f859143fa4125912d25ce55be5a01a958d0;hpb=72b00816f86e5d34d871c87fea76a94ffca25246;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 25ee2f85..f11fdf86 100644
--- a/era.mi/src/era/mi/logic/components/BitDisplay.java
+++ b/era.mi/src/era/mi/logic/components/BitDisplay.java
@@ -1,18 +1,18 @@
 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;
+public class BitDisplay extends BasicComponent
+{
+	private final WireEnd in;
+	private BitVector displayedValue;
 
-	public BitDisplay(WireArray in) {
+	public BitDisplay(WireEnd in)
+	{
 		super(1);
 		this.in = in;
 		in.addObserver(this);
@@ -20,25 +20,30 @@ public class BitDisplay extends BasicComponent {
 	}
 
 	@Override
-	protected void compute() {
+	protected void compute()
+	{
 		displayedValue = in.getValues();
 	}
 
-	public Bit[] getDisplayedValue() {
+	public BitVector getDisplayedValue()
+	{
 		return displayedValue;
 	}
 
-	public boolean isDisplaying(Bit... values) {
-		return Arrays.equals(displayedValue, values);
+	public boolean isDisplaying(Bit... values)
+	{
+		return displayedValue.equals(BitVector.of(values));
 	}
 
 	@Override
-	public List<WireArray> getAllInputs() {
-		return Collections.unmodifiableList(Arrays.asList(in));
+	public List<WireEnd> getAllInputs()
+	{
+		return List.of(in);
 	}
 
 	@Override
-	public List<WireArray> getAllOutputs() {
-		return Collections.unmodifiableList(new ArrayList<WireArray>());
+	public List<WireEnd> getAllOutputs()
+	{
+		return List.of();
 	}
 }