ForceRenderer - Add some ReportingUtilities

MegaMek · Oct 21, 2024 · 43d1e34 · 43d1e34
1 parent edc7f11
commit 43d1e34
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/MekHQ/src/mekhq/gui/ForceRenderer.java b/MekHQ/src/mekhq/gui/ForceRenderer.java
@@ -33,6 +33,7 @@
 import mekhq.campaign.force.Force;
 import mekhq.campaign.personnel.Person;
 import mekhq.campaign.unit.Unit;
+import mekhq.utilities.ReportingUtilities;
 
 public class ForceRenderer extends DefaultTreeCellRenderer {
     private static final MMLogger logger = MMLogger.create(ForceRenderer.class);
@@ -51,7 +52,8 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
         setOpaque(false);
 
         if (value instanceof Unit) {
-            String name = "<font color='" + MekHQ.getMHQOptions().getFontColorNegativeHexColor() + "'>No Crew</font>";
+            String name = ReportingUtilities.messageSurroundedBySpanWithColor(
+                    MekHQ.getMHQOptions().getFontColorNegativeHexColor(), "No Crew");
             if (((Unit) value).getEntity() instanceof GunEmplacement) {
                 name = "AutoTurret";
             }
@@ -64,14 +66,14 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
                 name += " (" + unit.getEntity().getCrew().getGunnery() + '/'
                         + unit.getEntity().getCrew().getPiloting() + ')';
                 if (person.needsFixing() || (unit.getEntity().getCrew().getHits() > 0)) {
-                    name = "<font color='" + MekHQ.getMHQOptions().getFontColorNegativeHexColor() + "'>" + name
-                            + "</font>";
+                    name = ReportingUtilities.messageSurroundedBySpanWithColor(
+                            MekHQ.getMHQOptions().getFontColorNegativeHexColor(), name);
                 }
             }
-            String uname = "<i>" + unit.getName() + "</i>";
+            String unitName = "<i>" + unit.getName() + "</i>";
             if (unit.isDamaged()) {
-                uname = "<font color='" + MekHQ.getMHQOptions().getFontColorNegativeHexColor() + "'>" + uname
-                        + "</font>";
+                unitName = ReportingUtilities.messageSurroundedBySpanWithColor(
+                    MekHQ.getMHQOptions().getFontColorNegativeHexColor(), unitName);
             }
 
             Entity entity = unit.getEntity();
@@ -127,7 +129,7 @@ public Component getTreeCellRendererComponent(JTree tree, Object value, boolean
                 transport.append("<br>Transported by: ")
                         .append(unit.getTransportShipAssignment().getTransportShip().getName());
             }
-            String text = name + ", " + uname + c3network + transport;
+            String text = name + ", " + unitName + c3network + transport;
 
             Force force = unit.getCampaign().getForce(unit.getForceId());
             if((null != person) && (null != force) && (person.getId() == force.getForceCommanderID())) {