X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Ftypes%2FBitVectorFormatter.java;h=987f36194734660303f22bf64d684635bf6cd3e0;hb=2f2269e36940705063adba3ff89ed7830c0b2edf;hp=a79853197d1ece493c1adca89809b23c4ff49ea3;hpb=07faf07e3acb8b2afdc2bf65a46bc868faaed0f8;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 a7985319..987f3619 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
@@ -1,7 +1,9 @@
 package net.mograsim.logic.core.types;
 
-import net.mograsim.logic.core.types.ColorDefinition.BuiltInColor;
 import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.preferences.ColorDefinition;
+import net.mograsim.preferences.ColorDefinition.BuiltInColor;
+import net.mograsim.preferences.Preferences;
 
 public class BitVectorFormatter
 {
@@ -14,10 +16,10 @@ public class BitVectorFormatter
 	{
 		if (bitVector == null)
 			return "null";
-		else
-			return bitVector.toString();
+		return bitVector.toString();
 	}
 
+	// TODO doesn't this belong to logic.ui?
 	public static ColorDefinition formatAsColor(ReadEnd end)
 	{
 		return formatAsColor(end == null ? null : end.getValues());
@@ -28,22 +30,21 @@ 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);
-		else
-			switch (bitVector.getBit(0))
-			{
-			case ONE:
-				return new ColorDefinition(BuiltInColor.COLOR_GREEN);
-			case U:
-				return new ColorDefinition(BuiltInColor.COLOR_CYAN);
-			case X:
-				return new ColorDefinition(BuiltInColor.COLOR_RED);
-			case Z:
-				return new ColorDefinition(BuiltInColor.COLOR_YELLOW);
-			case ZERO:
-				return new ColorDefinition(BuiltInColor.COLOR_GRAY);
-			default:
-				throw new IllegalArgumentException("Unknown enum constant: " + bitVector.getBit(0));
-			}
+		switch (bitVector.getLSBit(0))
+		{
+		case ONE:
+			return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.one");
+		case U:
+			return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.u");
+		case X:
+			return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.x");
+		case Z:
+			return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.z");
+		case ZERO:
+			return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.zero");
+		default:
+			throw new IllegalArgumentException("Unknown enum constant: " + bitVector.getLSBit(0));
+		}
 	}
 
 	private BitVectorFormatter()