Fixed a bug in Am2900; created dlatch8/80; relayouted some components

[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 3cb35b3..5f645a2 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
@@ -1,9 +1,9 @@
 package net.mograsim.logic.core.types;
 
-import net.mograsim.logic.core.wires.Wire.ReadEnd;
+import net.mograsim.logic.core.wires.CoreWire.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
 {
@@ -16,10 +16,10 @@ public class BitVectorFormatter
        {
                if (bitVector == null)
                        return "null";
-               return bitVector.toBitStringMSBFirst();
+               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().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.getBit(0));
+                       throw new IllegalArgumentException("Unknown enum constant: " + bitVector.getLSBit(0));
                }
        }