Refactored BitVector methods to resolve ambiguity

[Mograsim.git] / net.mograsim.logic.core / src / net / mograsim / logic / core / types / BitVectorFormatter.java

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 87483a7..858f28a 100644 (file)
--- 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;
 \r
 import net.mograsim.logic.core.wires.Wire.ReadEnd;\r
 import net.mograsim.preferences.ColorDefinition;\r
-import net.mograsim.preferences.Preferences;\r
 import net.mograsim.preferences.ColorDefinition.BuiltInColor;\r
+import net.mograsim.preferences.Preferences;\r
 \r
 public class BitVectorFormatter\r
 {\r
@@ -30,20 +30,20 @@ public class BitVectorFormatter
                // TODO maybe find a color assignment for multiple-bit bit vectors?\r
                if (bitVector == null || bitVector.length() != 1)\r
                        return new ColorDefinition(BuiltInColor.COLOR_BLACK);\r
-               switch (bitVector.getBit(0))\r
+               switch (bitVector.getLSBit(0))\r
                {\r
                case ONE:\r
-                       return Preferences.current().getColor("net.mograsim.logic.ui.wire.bit.one");\r
+                       return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.one");\r
                case U:\r
-                       return Preferences.current().getColor("net.mograsim.logic.ui.wire.bit.u");\r
+                       return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.u");\r
                case X:\r
-                       return Preferences.current().getColor("net.mograsim.logic.ui.wire.bit.x");\r
+                       return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.x");\r
                case Z:\r
-                       return Preferences.current().getColor("net.mograsim.logic.ui.wire.bit.z");\r
+                       return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.z");\r
                case ZERO:\r
-                       return Preferences.current().getColor("net.mograsim.logic.ui.wire.bit.zero");\r
+                       return Preferences.current().getColorDefinition("net.mograsim.logic.ui.color.bit.zero");\r
                default:\r
-                       throw new IllegalArgumentException("Unknown enum constant: " + bitVector.getBit(0));\r
+                       throw new IllegalArgumentException("Unknown enum constant: " + bitVector.getLSBit(0));\r
                }\r
        }\r
 \r