projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merged logicui into master
[Mograsim.git]
/
era.mi
/
src
/
era
/
mi
/
logic
/
components
/
BitDisplay.java
diff --git
a/era.mi/src/era/mi/logic/components/BitDisplay.java
b/era.mi/src/era/mi/logic/components/BitDisplay.java
index
2cabbb8
..
971eb7a
100644
(file)
--- 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;
package era.mi.logic.components;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.List;
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);
super(1);
this.in = in;
in.addObserver(this);
@@
-20,25
+20,30
@@
public class BitDisplay extends BasicComponent {
}
@Override
}
@Override
- protected void compute() {
+ protected void compute()
+ {
displayedValue = in.getValues();
}
displayedValue = in.getValues();
}
- public Bit[] getDisplayedValue() {
+ public BitVector getDisplayedValue()
+ {
return displayedValue;
}
return displayedValue;
}
- public boolean isDisplaying(Bit... values) {
- return Arrays.equals(displayedValue, values);
+ public boolean isDisplaying(Bit... values)
+ {
+ return displayedValue.equals(BitVector.of(values));
}
@Override
}
@Override
- public List<WireArray> getAllInputs() {
- return Collections.unmodifiableList(Arrays.asList(in));
+ public List<WireEnd> getAllInputs()
+ {
+ return List.of(in);
}
@Override
}
@Override
- public List<WireArray> getAllOutputs() {
- return Collections.unmodifiableList(new ArrayList<WireArray>());
+ public List<WireEnd> getAllOutputs()
+ {
+ return List.of();
}
}
}
}