X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FSplitter.java;fp=era.mi%2Fsrc%2Fera%2Fmi%2Flogic%2Fcomponents%2FSplitter.java;h=58d48e7c563861d3555d1d862dabd6dca3f68c2c;hb=fa95c348b3b8fb9681e4bf5c8284c5ac8eeed518;hp=48db52d99416ee278b2ad4dbc6fa1fe30e9c150f;hpb=b8eed971607b7f60e44ec37a5ec066afa07172e1;p=Mograsim.git

diff --git a/era.mi/src/era/mi/logic/components/Splitter.java b/era.mi/src/era/mi/logic/components/Splitter.java
index 48db52d9..58d48e7c 100644
--- a/era.mi/src/era/mi/logic/components/Splitter.java
+++ b/era.mi/src/era/mi/logic/components/Splitter.java
@@ -1,8 +1,8 @@
 package era.mi.logic.components;
 
 import era.mi.logic.Bit;
-import era.mi.logic.WireArray;
-import era.mi.logic.WireArrayObserver;
+import era.mi.logic.wires.WireArray;
+import era.mi.logic.wires.WireArrayObserver;
 
 public class Splitter implements WireArrayObserver
 {
@@ -16,9 +16,9 @@ public class Splitter implements WireArrayObserver
 		input.addObserver(this);
 		int length = 0;
 		for(WireArray out : outputs)
-			length += out.length();
+			length += out.length;
 		
-		if(input.length() != length)
+		if(input.length != length)
 			throw new IllegalArgumentException("The input of splitting one into n WireArrays must have length = a1.length() + a2.length() + ... + an.length().");
 	}
 
@@ -28,10 +28,10 @@ public class Splitter implements WireArrayObserver
 		Bit[] inputBits = input.getValues();
 		for(int i = 0; i < outputs.length; i++)
 		{
-			Bit[] outputBits = new Bit[outputs[i].length()];
-			System.arraycopy(inputBits, startIndex, outputBits, 0, outputs[i].length());
+			Bit[] outputBits = new Bit[outputs[i].length];
+			System.arraycopy(inputBits, startIndex, outputBits, 0, outputs[i].length);
 			outputs[i].feedSignals(outputBits);
-			startIndex += outputs[i].length();
+			startIndex += outputs[i].length;
 		}
 	}