X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FManualSwitch.java;h=caaf49b4232b51ddaa10ce2f8d88c404ac87ffc8;hb=b7ce41467a2cbd9f45554982730741810e99feaa;hp=34c603c16a1445dda4a5bb1146cbedabb4a1a7b5;hpb=74aebd92f41d03f4a44c9a455ef8c05465136412;p=Mograsim.git

diff --git a/era.mi/src/era/mi/logic/components/ManualSwitch.java b/era.mi/src/era/mi/logic/components/ManualSwitch.java
index 34c603c1..caaf49b4 100644
--- a/era.mi/src/era/mi/logic/components/ManualSwitch.java
+++ b/era.mi/src/era/mi/logic/components/ManualSwitch.java
@@ -2,9 +2,9 @@ package era.mi.logic.components;
 
 import java.util.List;
 
-import era.mi.logic.Bit;
-import era.mi.logic.wires.WireArray;
-import era.mi.logic.wires.WireArray.WireArrayInput;
+import era.mi.logic.types.Bit;
+import era.mi.logic.wires.Wire.ReadEnd;
+import era.mi.logic.wires.Wire.ReadWriteEnd;
 
 /**
  * This class models a simple on/off (ONE/ZERO) switch for user interaction.
@@ -12,52 +12,60 @@ import era.mi.logic.wires.WireArray.WireArrayInput;
  * @author Christian Femers
  *
  */
-public class ManualSwitch implements Component {
-	private WireArray output;
-	private WireArrayInput outputI;
+public class ManualSwitch implements Component
+{
+	private ReadWriteEnd output;
 	private boolean isOn;
 
-	public ManualSwitch(WireArray output) {
-		if (output.length != 1)
+	public ManualSwitch(ReadWriteEnd output)
+	{
+		if (output.length() != 1)
 			throw new IllegalArgumentException("Switch output can be only a single wire");
 		this.output = output;
-		this.outputI = output.createInput();
 	}
 
-	public void switchOn() {
+	public void switchOn()
+	{
 		setState(true);
 	}
 
-	public void switchOff() {
+	public void switchOff()
+	{
 		setState(false);
 	}
 
-	public void toggle() {
+	public void toggle()
+	{
 		setState(!isOn);
 	}
 
-	public void setState(boolean isOn) {
+	public void setState(boolean isOn)
+	{
 		if (this.isOn == isOn)
 			return;
 		this.isOn = isOn;
-		outputI.feedSignals(getValue());
+		output.feedSignals(getValue());
 	}
 
-	public boolean isOn() {
+	public boolean isOn()
+	{
 		return isOn;
 	}
 
-	public Bit getValue() {
+	public Bit getValue()
+	{
 		return isOn ? Bit.ONE : Bit.ZERO;
 	}
 
 	@Override
-	public List<WireArray> getAllInputs() {
+	public List<ReadEnd> getAllInputs()
+	{
 		return List.of();
 	}
 
 	@Override
-	public List<WireArray> getAllOutputs() {
+	public List<ReadWriteEnd> getAllOutputs()
+	{
 		return List.of(output);
 	}