Made formatting uniform - commit for logicui

[Mograsim.git] / LogicUI / src / era / mi / gui / components / GUIManualSwitch.java

diff --git a/LogicUI/src/era/mi/gui/components/GUIManualSwitch.java b/LogicUI/src/era/mi/gui/components/GUIManualSwitch.java
index 3201bae..a4d0c23 100644 (file)
--- a/LogicUI/src/era/mi/gui/components/GUIManualSwitch.java
+++ b/LogicUI/src/era/mi/gui/components/GUIManualSwitch.java
@@ -2,8 +2,11 @@ package era.mi.gui.components;
 \r
 import java.util.ArrayList;\r
 import java.util.Collections;\r
+import java.util.HashMap;\r
 import java.util.List;\r
+import java.util.Map;\r
 \r
+import era.mi.logic.Bit;\r
 import era.mi.logic.components.ManualSwitch;\r
 import era.mi.logic.wires.WireArray;\r
 import net.haspamelodica.swt.helper.gcs.GeneralGC;\r
@@ -13,13 +16,28 @@ import net.haspamelodica.swt.helper.swtobjectwrappers.Rectangle;
 \r
 public class GUIManualSwitch extends ManualSwitch implements BasicGUIComponent\r
 {\r
-       private final List<WireArray>   connectedWireArrays;\r
-       private final List<Point>               wireArrayConnectionPoints;\r
+       private static final Map<Bit, String> bitNames;\r
+       static\r
+       {\r
+               Map<Bit, String> bitNamesModifiable = new HashMap<>();\r
+               bitNamesModifiable.put(Bit.ONE, "1");\r
+               bitNamesModifiable.put(Bit.ZERO, "0");\r
+               bitNamesModifiable.put(Bit.Z, "Z");\r
+               bitNamesModifiable.put(Bit.U, "U");\r
+               bitNamesModifiable.put(Bit.X, "X");\r
+               bitNames = Collections.unmodifiableMap(bitNamesModifiable);\r
+       }\r
+\r
+       private final WireArray wa;\r
+       private final List<WireArray> connectedWireArrays;\r
+       private final List<Point> wireArrayConnectionPoints;\r
 \r
        public GUIManualSwitch(WireArray output)\r
        {\r
                super(output);\r
 \r
+               this.wa = output;\r
+\r
                List<WireArray> connectedWireArraysModifiable = new ArrayList<>();\r
                List<Point> wireArrayConnectionPointsModifiable = new ArrayList<>();\r
 \r
@@ -35,11 +53,12 @@ public class GUIManualSwitch extends ManualSwitch implements BasicGUIComponent
        {\r
                return new Rectangle(0, 0, 20, 15);\r
        }\r
+\r
        @Override\r
        public void render(GeneralGC gc)\r
        {\r
                gc.drawRectangle(0, 0, 20, 15);\r
-               String label = isOn() ? "ON" : "OFF";\r
+               String label = bitNames.get(wa.getValue());\r
                Font oldFont = gc.getFont();\r
                Font labelFont = new Font(oldFont.getName(), 6, oldFont.getStyle());\r
                gc.setFont(labelFont);\r
@@ -47,6 +66,7 @@ public class GUIManualSwitch extends ManualSwitch implements BasicGUIComponent
                gc.drawText(label, 10 - textExtent.x / 2, 7.5 - textExtent.y / 2, true);\r
                gc.setFont(oldFont);\r
        }\r
+\r
        @Override\r
        public boolean clicked(double x, double y)\r
        {\r
@@ -59,11 +79,13 @@ public class GUIManualSwitch extends ManualSwitch implements BasicGUIComponent
        {\r
                return connectedWireArrays.size();\r
        }\r
+\r
        @Override\r
        public WireArray getConnectedWireArray(int connectionIndex)\r
        {\r
                return connectedWireArrays.get(connectionIndex);\r
        }\r
+\r
        @Override\r
        public Point getWireArrayConnectionPoint(int connectionI)\r
        {\r