projects
/
Mograsim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
WireArray(Input) is now Wire(End); all in-/outputs are now WireEnds
[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
..
5ddae96
100644
(file)
--- a/
era.mi/src/era/mi/logic/components/BitDisplay.java
+++ b/
era.mi/src/era/mi/logic/components/BitDisplay.java
@@
-6,13
+6,15
@@
import java.util.Collections;
import java.util.List;
import era.mi.logic.Bit;
import java.util.List;
import era.mi.logic.Bit;
-import era.mi.logic.wires.Wire
Array
;
+import era.mi.logic.wires.Wire
.WireEnd
;
-public class BitDisplay extends BasicComponent {
- private final WireArray in;
+public class BitDisplay extends BasicComponent
+{
+ private final WireEnd in;
private Bit[] displayedValue;
private Bit[] 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
+22,30
@@
public class BitDisplay extends BasicComponent {
}
@Override
}
@Override
- protected void compute() {
+ protected void compute()
+ {
displayedValue = in.getValues();
}
displayedValue = in.getValues();
}
- public Bit[] getDisplayedValue() {
+ public Bit[] getDisplayedValue()
+ {
return displayedValue;
}
return displayedValue;
}
- public boolean isDisplaying(Bit... values) {
+ public boolean isDisplaying(Bit... values)
+ {
return Arrays.equals(displayedValue, values);
}
@Override
return Arrays.equals(displayedValue, values);
}
@Override
- public List<WireArray> getAllInputs() {
+ public List<WireEnd> getAllInputs()
+ {
return Collections.unmodifiableList(Arrays.asList(in));
}
@Override
return Collections.unmodifiableList(Arrays.asList(in));
}
@Override
- public List<WireArray> getAllOutputs() {
- return Collections.unmodifiableList(new ArrayList<WireArray>());
+ public List<WireEnd> getAllOutputs()
+ {
+ return Collections.unmodifiableList(new ArrayList<WireEnd>());
}
}
}
}