X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Fcomponents%2FDemux.java;h=5cf80747563af21c74610b630fa32b197fa2cead;hb=9b4850366c29fbd800ee8df1858c398d8c35a0c0;hp=5da1bf6a981dd7b04cfddbfd848706f730b78236;hpb=07faf07e3acb8b2afdc2bf65a46bc868faaed0f8;p=Mograsim.git

diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/Demux.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/Demux.java
index 5da1bf6a..5cf80747 100644
--- a/net.mograsim.logic.core/src/net/mograsim/logic/core/components/Demux.java
+++ b/net.mograsim.logic.core/src/net/mograsim/logic/core/components/Demux.java
@@ -22,34 +22,34 @@ public class Demux extends BasicComponent
 	private int selected = -1;
 
 	/**
-	 * Output {@link Wire}s and in must be of uniform length
+	 * Output {@link Wire}s and in must be of uniform width
 	 * 
-	 * @param in      Must be of uniform length with all outputs.
+	 * @param in      Must be of uniform width with all outputs.
 	 * @param select  Indexes the output array to which the input is mapped. Must have enough bits to index all outputs.
 	 * @param outputs One of these outputs receives the input signal, depending on the select bits
 	 */
 	public Demux(Timeline timeline, int processTime, ReadEnd in, ReadEnd select, ReadWriteEnd... outputs)
 	{
 		super(timeline, processTime);
-		outputSize = in.length();
+		outputSize = in.width();
 
 		this.in = in;
 		this.outputs = outputs;
 		for (int i = 0; i < this.outputs.length; i++)
 		{
-			if (outputs[i].length() != outputSize)
-				throw new IllegalArgumentException("All DEMUX wire arrays must be of uniform length!");
+			if (outputs[i].width() != outputSize)
+				throw new IllegalArgumentException("All DEMUX wire arrays must be of uniform width!");
 			this.outputs[i] = outputs[i];
 		}
 
 		this.select = select;
-		select.addObserver(this);
+		select.registerObserver(this);
 
-		int maxInputs = 1 << select.length();
+		int maxInputs = 1 << select.width();
 		if (this.outputs.length > maxInputs)
 			throw new IllegalArgumentException("There are more outputs (" + this.outputs.length + ") to the DEMUX than supported by "
-					+ select.length() + " select bits (" + maxInputs + ").");
-		in.addObserver(this);
+					+ select.width() + " select bits (" + maxInputs + ").");
+		in.registerObserver(this);
 	}
 
 	@Override