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
{
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());
// 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));
}
}