X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FManualSwitch.java;h=9ae08ebaacf108bc1b784dc657306b0ad20f8120;hb=6c67a9ff8361cd9fc082f40e2676f2c8b5911fe4;hp=93018dddb222f901e7bcf6dd6d7a60a0c801e8d3;hpb=35608d1953b627e09b076a043b8b8526c28bba37;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 93018ddd..9ae08eba 100644
--- a/era.mi/src/era/mi/logic/components/ManualSwitch.java
+++ b/era.mi/src/era/mi/logic/components/ManualSwitch.java
@@ -2,9 +2,10 @@ 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.timeline.Timeline;
+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,60 +13,61 @@ import era.mi.logic.wires.WireArray.WireArrayInput;
  * @author Christian Femers
  *
  */
-public class ManualSwitch implements Component 
+public class ManualSwitch extends Component
 {
-	private WireArray output;
-	private WireArrayInput outputI;
+	private ReadWriteEnd output;
 	private boolean isOn;
-	
-	public ManualSwitch(WireArray output) 
+
+	public ManualSwitch(Timeline timeline, ReadWriteEnd output)
 	{
-		if(output.length != 1)
+		super(timeline);
+		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()
 	{
 		setState(true);
 	}
-	
+
 	public void switchOff()
 	{
 		setState(false);
 	}
-	
+
 	public void toggle()
 	{
 		setState(!isOn);
 	}
-	
+
 	public void setState(boolean isOn)
 	{
-		if(this.isOn == isOn)
+		if (this.isOn == isOn)
 			return;
 		this.isOn = isOn;
-		outputI.feedSignals(getValue());
+		output.feedSignals(getValue());
 	}
-	
+
 	public boolean isOn()
 	{
 		return isOn;
 	}
-	
+
 	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);
 	}