X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Ftypes%2FBitVectorFormatter.java;h=4996dcb9f4c89be5f84974fc11672e22ae43a355;hb=f37f1f93f2c1ceb780f1c7ecab888bcb8f4f8b89;hp=987f36194734660303f22bf64d684635bf6cd3e0;hpb=2f2269e36940705063adba3ff89ed7830c0b2edf;p=Mograsim.git

diff --git a/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVectorFormatter.java b/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVectorFormatter.java
index 987f3619..4996dcb9 100644
--- a/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVectorFormatter.java
+++ b/net.mograsim.logic.core/src/net/mograsim/logic/core/types/BitVectorFormatter.java
@@ -19,7 +19,7 @@ public class BitVectorFormatter
 		return bitVector.toString();
 	}
 
-	// TODO doesn't this belong to logic.ui?
+	// TODO doesn't this belong to logic.model?
 	public static ColorDefinition formatAsColor(ReadEnd end)
 	{
 		return formatAsColor(end == null ? null : end.getValues());
@@ -28,20 +28,20 @@ public class BitVectorFormatter
 	public static ColorDefinition formatAsColor(BitVector bitVector)
 	{
 		// TODO maybe find a color assignment for multiple-bit bit vectors?
-		if (bitVector == null || bitVector.length() != 1)
+		if (bitVector == null || bitVector.width() != 1)
 			return new ColorDefinition(BuiltInColor.COLOR_BLACK);
 		switch (bitVector.getLSBit(0))
 		{
 		case ONE:
-			return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.one");
+			return Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.one");
 		case U:
-			return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.u");
+			return Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.u");
 		case X:
-			return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.x");
+			return Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.x");
 		case Z:
-			return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.z");
+			return Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.z");
 		case ZERO:
-			return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.zero");
+			return Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.zero");
 		default:
 			throw new IllegalArgumentException("Unknown enum constant: " + bitVector.getLSBit(0));
 		}