X-Git-Url: https://mograsim.net/gitweb/?a=blobdiff_plain;f=net.mograsim.logic.core%2Fsrc%2Fnet%2Fmograsim%2Flogic%2Fcore%2Ftypes%2FBitVectorFormatter.java;h=5f645a2ebcf8a8acb53f4669c1ea9fa93079b0c2;hb=8bed58cd47f4e53a0a83e066d38864aa6875502f;hp=987f36194734660303f22bf64d684635bf6cd3e0;hpb=2f2269e36940705063adba3ff89ed7830c0b2edf;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 987f3619..5f645a2e 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,6 +1,6 @@ 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.ColorDefinition.BuiltInColor; import net.mograsim.preferences.Preferences; @@ -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()); @@ -33,15 +33,15 @@ public class BitVectorFormatter 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.getLSBit(0)); }