X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Ftypes%2FBitVectorFormatter.java;h=c551fed9474bf566a8aef7cc4012ea56dd276ea5;hb=668d5f2a864ed026891a5befe628305fe7a77fac;hp=b612b59d4e667ca5710d7fbf71283f1b2ac31c43;hpb=dff3e01498ac766a7f1ec7b18ce2cc5acd257cb5;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 b612b59d..c551fed9 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
@@ -2,8 +2,8 @@ package net.mograsim.logic.core.types;
 
 import net.mograsim.logic.core.wires.Wire.ReadEnd;
 import net.mograsim.preferences.ColorDefinition;
-import net.mograsim.preferences.Preferences;
 import net.mograsim.preferences.ColorDefinition.BuiltInColor;
+import net.mograsim.preferences.Preferences;
 
 public class BitVectorFormatter
 {
@@ -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());
@@ -30,20 +30,20 @@ public class BitVectorFormatter
 		// TODO maybe find a color assignment for multiple-bit bit vectors?
 		if (bitVector == null || bitVector.length() != 1)
 			return new ColorDefinition(BuiltInColor.COLOR_BLACK);
-		switch (bitVector.getBit(0))
+		switch (bitVector.getLSBit(0))
 		{
 		case ONE:
-			return Preferences.current().getColor("net.mograsim.logic.ui.wire.bit.one");
+			return Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.one");
 		case U:
-			return Preferences.current().getColor("net.mograsim.logic.ui.wire.bit.u");
+			return Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.u");
 		case X:
-			return Preferences.current().getColor("net.mograsim.logic.ui.wire.bit.x");
+			return Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.x");
 		case Z:
-			return Preferences.current().getColor("net.mograsim.logic.ui.wire.bit.z");
+			return Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.z");
 		case ZERO:
-			return Preferences.current().getColor("net.mograsim.logic.ui.wire.bit.zero");
+			return Preferences.current().getColorDefinition("net.mograsim.logic.model.color.bit.zero");
 		default:
-			throw new IllegalArgumentException("Unknown enum constant: " + bitVector.getBit(0));
+			throw new IllegalArgumentException("Unknown enum constant: " + bitVector.getLSBit(0));
 		}
 	}