code cleanup

MegaMek · Nov 11, 2023 · 85cc221 · 85cc221
1 parent d2caa6e
commit 85cc221
Show file tree

Hide file tree

Showing 40 changed files with 178 additions and 174 deletions.
diff --git a/megamek/src/megamek/client/ui/swing/MovementDisplay.java b/megamek/src/megamek/client/ui/swing/MovementDisplay.java
@@ -4215,7 +4215,7 @@ private void dumpBombs() {
             r.subject = ce().getId();
             r.add(ce().getDisplayName());
             r.add(psr);
-            r.addDataWithTooltip(String.valueOf(rollValue), rollReport);
+            r.addDataWithTooltip(rollValue, rollReport);
             r.newlines = 0;
             r.indent(1);
             if (rollValue < psr.getValue()) {

diff --git a/megamek/src/megamek/common/Building.java b/megamek/src/megamek/common/Building.java
@@ -435,7 +435,7 @@ public boolean rollBasement(Coords coords, Board board, Vector<Report> vPhaseRep
             Roll diceRoll = Compute.rollD6(2);
             int rollValue = diceRoll.getIntValue();
             String rollReport = diceRoll.getReport();
-            r.addDataWithTooltip(String.valueOf(rollValue), rollReport);
+            r.addDataWithTooltip(rollValue, rollReport);
             if (rollValue == 2) {
                 basement.put(coords, BasementType.TWO_DEEP_FEET);
                 hex.addTerrain(new Terrain(Terrains.BLDG_BASEMENT_TYPE, basement.get(coords).ordinal()));

diff --git a/megamek/src/megamek/common/Entity.java b/megamek/src/megamek/common/Entity.java
@@ -13444,7 +13444,7 @@ private boolean doMASCOrSuperchargerFailureCheckFor(Mounted masc, Vector<Report>
             r.subject = getId();
             r.indent();
             r.add(isSupercharger ? getSuperchargerTarget() : getMASCTarget());
-            r.addDataWithTooltip(String.valueOf(rollValue), rollReport);
+            r.addDataWithTooltip(rollValue, rollReport);
 
             if ((!isSupercharger && (rollValue < getMASCTarget()))
                     || (isSupercharger && (rollValue < getSuperchargerTarget()))) {
@@ -13461,7 +13461,7 @@ private boolean doMASCOrSuperchargerFailureCheckFor(Mounted masc, Vector<Report>
                     String rollReport2 = diceRoll2.getReport();
                     r = new Report(6310);
                     r.subject = getId();
-                    r.addDataWithTooltip(String.valueOf(rollValue2), rollReport2);
+                    r.addDataWithTooltip(rollValue2, rollReport2);
                     r.newlines = 0;
                     vDesc.addElement(r);
                     if (rollValue2 <= 7) {

diff --git a/megamek/src/megamek/common/Mech.java b/megamek/src/megamek/common/Mech.java
@@ -5465,7 +5465,7 @@ public Vector<Report> doCheckEngineStallRoll(Vector<Report> vPhaseReport) {
             Roll diceRoll = getCrew().rollPilotingSkill();
             int rollValue = diceRoll.getIntValue();
             String rollReport = diceRoll.getReport();
-            Report r = Report.subjectReport(2300, getId()).add(psr).addDataWithTooltip(String.valueOf(rollValue), rollReport);
+            Report r = Report.subjectReport(2300, getId()).add(psr).addDataWithTooltip(rollValue, rollReport);
             if (rollValue < psr.getValue()) {
                 setStalled(true);
                 vPhaseReport.add(r.noNL().choose(false));
@@ -5497,7 +5497,7 @@ public void checkUnstall(Vector<Report> vPhaseReport) {
             Roll diceRoll = getCrew().rollPilotingSkill();
             int rollValue = diceRoll.getIntValue();
             String rollReport = diceRoll.getReport();
-            Report r = Report.subjectReport(2300, getId()).add(psr).addDataWithTooltip(String.valueOf(rollValue), rollReport);
+            Report r = Report.subjectReport(2300, getId()).add(psr).addDataWithTooltip(rollValue, rollReport);
             if (rollValue < psr.getValue()) {
                 vPhaseReport.add(r.choose(false));
             } else {
@@ -6258,7 +6258,7 @@ public boolean doRISCEmergencyCoolantCheckFor(Vector<Report> vDesc,
             bUsedCoolantSystem = true;
             vDesc.addElement(Report.subjectReport(2365, getId()).addDesc(this).add(coolantSystem.getName()));
             int requiredRoll = EMERGENCY_COOLANT_SYSTEM_FAILURE[nCoolantSystemLevel];
-            Report r = Report.subjectReport(2370, getId()).indent().add(requiredRoll).addDataWithTooltip(String.valueOf(rollValue), rollReport);
+            Report r = Report.subjectReport(2370, getId()).indent().add(requiredRoll).addDataWithTooltip(rollValue, rollReport);
 
             if (rollValue < requiredRoll) {
                 // uh oh

diff --git a/megamek/src/megamek/common/Report.java b/megamek/src/megamek/common/Report.java
@@ -409,6 +409,10 @@ public Report add(TargetRoll targetRoll) {
         return this;
     }
 
+    public Report addDataWithTooltip(Integer data, String tooltip) {
+        return addDataWithTooltip(String.valueOf(data), tooltip);
+    }
+
     /**
      * Adds a field to the report with additional data available as a tooltip
      *

diff --git a/megamek/src/megamek/common/weapons/ACCaselessHandler.java b/megamek/src/megamek/common/weapons/ACCaselessHandler.java
@@ -55,7 +55,7 @@ protected boolean doChecks(Vector<Report> vPhaseReport) {
 
             Report r = new Report(3164);
             r.subject = subjectId;
-            r.addDataWithTooltip(String.valueOf(rollValue), rollReport);
+            r.addDataWithTooltip(rollValue, rollReport);
 
             if (rollValue >= 8) {
                 // Round explodes destroying weapon

diff --git a/megamek/src/megamek/common/weapons/AR10Handler.java b/megamek/src/megamek/common/weapons/AR10Handler.java
@@ -166,7 +166,7 @@ public boolean handle(GamePhase phase, Vector<Report> vPhaseReport) {
             r = new Report(3155);
             r.newlines = 0;
             r.subject = subjectId;
-            r.addDataWithTooltip(String.valueOf(roll), rollReport);
+            r.addDataWithTooltip(roll, rollReport);
             vPhaseReport.addElement(r);
 
             // do we hit?

diff --git a/megamek/src/megamek/common/weapons/AmmoWeaponHandler.java b/megamek/src/megamek/common/weapons/AmmoWeaponHandler.java
@@ -105,7 +105,7 @@ protected boolean doAmmoFeedProblemCheck(Vector<Report> vPhaseReport) {
             Report r = new Report(3173);
             r.subject = subjectId;
             r.newlines = 0;
-            r.addDataWithTooltip(String.valueOf(rollValue), rollReport);
+            r.addDataWithTooltip(rollValue, rollReport);
             vPhaseReport.addElement(r);                
 
             if (rollValue == 12) {

diff --git a/megamek/src/megamek/common/weapons/AreaEffectHelper.java b/megamek/src/megamek/common/weapons/AreaEffectHelper.java
@@ -269,7 +269,7 @@ public static void checkInfantryDestruction(Entity entity, int distFromCenter, E
         r.subject = attacker.getId();
         r.newlines = 1;
         r.add(rollTarget);
-        r.addDataWithTooltip(String.valueOf(rollValue), rollReport);
+        r.addDataWithTooltip(rollValue, rollReport);
         r.add(distFromCenter);
         r.choose(destroyed);
         vPhaseReport.addElement(r);

diff --git a/megamek/src/megamek/common/weapons/ArtilleryBayWeaponIndirectFireHandler.java b/megamek/src/megamek/common/weapons/ArtilleryBayWeaponIndirectFireHandler.java
@@ -276,7 +276,7 @@ public boolean accept(Entity entity) {
         r = new Report(3155);
         r.newlines = 0;
         r.subject = subjectId;
-        r.addDataWithTooltip(String.valueOf(roll), rollReport);
+        r.addDataWithTooltip(roll, rollReport);
         vPhaseReport.addElement(r);
 
         // do we hit?

diff --git a/megamek/src/megamek/common/weapons/ArtilleryBayWeaponIndirectHomingHandler.java b/megamek/src/megamek/common/weapons/ArtilleryBayWeaponIndirectHomingHandler.java
@@ -150,7 +150,7 @@ public boolean handle(GamePhase phase, Vector<Report> vPhaseReport) {
         r = new Report(3155);
         r.newlines = 0;
         r.subject = subjectId;
-        r.addDataWithTooltip(String.valueOf(roll), rollReport);
+        r.addDataWithTooltip(roll, rollReport);
         vPhaseReport.addElement(r);
 
         // do we hit?
@@ -505,15 +505,15 @@ protected int handleAMS(Vector<Report> vPhaseReport, Mounted ammoUsed) {
                     r = new Report(3240);
                     r.subject = subjectId;
                     r.add("missile");
-                    r.addDataWithTooltip(String.valueOf(rollValue), rollReport);
+                    r.addDataWithTooltip(rollValue, rollReport);
                     vPhaseReport.add(r);
                     nDamPerHit = 0;
                     hits = 0;
 
                 } else {
                     r = new Report(3241);
                     r.add("missile");
-                    r.addDataWithTooltip(String.valueOf(rollValue), rollReport);
+                    r.addDataWithTooltip(rollValue, rollReport);
                     r.subject = subjectId;
                     vPhaseReport.add(r);
                     hits = 1;

diff --git a/megamek/src/megamek/common/weapons/ArtilleryCannonWeaponHandler.java b/megamek/src/megamek/common/weapons/ArtilleryCannonWeaponHandler.java
@@ -101,7 +101,7 @@ public boolean handle(GamePhase phase, Vector<Report> vPhaseReport) {
         r = new Report(3155);
         r.newlines = 0;
         r.subject = subjectId;
-        r.addDataWithTooltip(String.valueOf(roll), rollReport);
+        r.addDataWithTooltip(roll, rollReport);
         vPhaseReport.addElement(r);
 
         // do we hit?

diff --git a/megamek/src/megamek/common/weapons/ArtilleryWeaponIndirectFireHandler.java b/megamek/src/megamek/common/weapons/ArtilleryWeaponIndirectFireHandler.java
@@ -267,7 +267,7 @@ else if ((null != bestSpotter) && !(this instanceof ArtilleryWeaponDirectFireHan
         r = new Report(3155);
         r.newlines = 0;
         r.subject = subjectId;
-        r.addDataWithTooltip(String.valueOf(roll), rollReport);
+        r.addDataWithTooltip(roll, rollReport);
         vPhaseReport.addElement(r);
 
         // do we hit?

diff --git a/megamek/src/megamek/common/weapons/ArtilleryWeaponIndirectHomingHandler.java b/megamek/src/megamek/common/weapons/ArtilleryWeaponIndirectHomingHandler.java
@@ -144,7 +144,7 @@ public boolean handle(GamePhase phase, Vector<Report> vPhaseReport) {
         r = new Report(3155);
         r.newlines = 0;
         r.subject = subjectId;
-        r.addDataWithTooltip(String.valueOf(roll), rollReport);
+        r.addDataWithTooltip(roll, rollReport);
         vPhaseReport.addElement(r);
 
         // do we hit?

diff --git a/megamek/src/megamek/common/weapons/BayWeaponHandler.java b/megamek/src/megamek/common/weapons/BayWeaponHandler.java
@@ -190,7 +190,7 @@ public boolean handle(GamePhase phase, Vector<Report> vPhaseReport) {
         r = new Report(3155);
         r.newlines = 0;
         r.subject = subjectId;
-        r.addDataWithTooltip(String.valueOf(roll), rollReport);
+        r.addDataWithTooltip(roll, rollReport);
         vPhaseReport.addElement(r);
 
         // do we hit?
@@ -436,7 +436,7 @@ public boolean handleAeroSanity(GamePhase phase, Vector<Report> vPhaseReport) {
         r = new Report(3155);
         r.newlines = 0;
         r.subject = subjectId;
-        r.addDataWithTooltip(String.valueOf(roll), rollReport);
+        r.addDataWithTooltip(roll, rollReport);
         vPhaseReport.addElement(r);
 
         // do we hit?

diff --git a/megamek/src/megamek/common/weapons/BombAttackHandler.java b/megamek/src/megamek/common/weapons/BombAttackHandler.java
@@ -157,7 +157,7 @@ public boolean handle(GamePhase phase, Vector<Report> vPhaseReport) {
                 r = new Report(3155);
                 r.newlines = 0;
                 r.subject = subjectId;
-                r.addDataWithTooltip(String.valueOf(roll), rollReport);
+                r.addDataWithTooltip(roll, rollReport);
                 vPhaseReport.addElement(r);
 
                 // do we hit?

diff --git a/megamek/src/megamek/common/weapons/CLIATMHandler.java b/megamek/src/megamek/common/weapons/CLIATMHandler.java
@@ -473,7 +473,7 @@ public boolean handle(GamePhase phase, Vector<Report> vPhaseReport) {
             r = new Report(3155);
             r.newlines = 0;
             r.subject = subjectId;
-            r.addDataWithTooltip(String.valueOf(roll), rollReport);
+            r.addDataWithTooltip(roll, rollReport);
             vPhaseReport.addElement(r);
 
             // do we hit?
@@ -643,7 +643,7 @@ public boolean handle(GamePhase phase, Vector<Report> vPhaseReport) {
             r = new Report(3155);
             r.newlines = 0;
             r.subject = subjectId;
-            r.addDataWithTooltip(String.valueOf(roll), rollReport);
+            r.addDataWithTooltip(roll, rollReport);
             vPhaseReport.addElement(r);
 
             // do we hit?

diff --git a/megamek/src/megamek/common/weapons/CapitalMissileBayHandler.java b/megamek/src/megamek/common/weapons/CapitalMissileBayHandler.java
@@ -159,7 +159,7 @@ public boolean handle(GamePhase phase, Vector<Report> vPhaseReport) {
         r = new Report(3155);
         r.newlines = 0;
         r.subject = subjectId;
-        r.addDataWithTooltip(String.valueOf(roll), rollReport);
+        r.addDataWithTooltip(roll, rollReport);
         vPhaseReport.addElement(r);
 
         // do we hit?
@@ -641,7 +641,7 @@ public boolean handleAeroSanity(GamePhase phase, Vector<Report> vPhaseReport) {
         r = new Report(3155);
         r.newlines = 0;
         r.subject = subjectId;
-        r.addDataWithTooltip(String.valueOf(roll), rollReport);
+        r.addDataWithTooltip(roll, rollReport);
         vPhaseReport.addElement(r);
 
         // do we hit?

diff --git a/megamek/src/megamek/common/weapons/CapitalMissileBearingsOnlyHandler.java b/megamek/src/megamek/common/weapons/CapitalMissileBearingsOnlyHandler.java
@@ -222,7 +222,7 @@ public boolean handle(GamePhase phase, Vector<Report> vPhaseReport) {
         r = new Report(3155);
         r.newlines = 0;
         r.subject = subjectId;
-        r.addDataWithTooltip(String.valueOf(roll), rollReport);
+        r.addDataWithTooltip(roll, rollReport);
         vPhaseReport.addElement(r);
 
         // do we hit?

diff --git a/megamek/src/megamek/common/weapons/CapitalMissileHandler.java b/megamek/src/megamek/common/weapons/CapitalMissileHandler.java
@@ -199,7 +199,7 @@ && getParentBayHandler() != null) {
         r = new Report(3155);
         r.newlines = 0;
         r.subject = subjectId;
-        r.addDataWithTooltip(String.valueOf(roll), rollReport);
+        r.addDataWithTooltip(roll, rollReport);
         vPhaseReport.addElement(r);
 
         // do we hit?

diff --git a/megamek/src/megamek/common/weapons/CenturionWeaponSystemHandler.java b/megamek/src/megamek/common/weapons/CenturionWeaponSystemHandler.java
@@ -115,7 +115,7 @@ protected void handleEntityDamage(Entity entityTarget, Vector<Report> vPhaseRepo
             r.indent(3);
             r.addDesc(entityTarget);
             r.add(shutdown);
-            r.addDataWithTooltip(String.valueOf(rollValue), rollReport);
+            r.addDataWithTooltip(rollValue, rollReport);
             if (rollValue >= shutdown) {
                 // avoided
                 r.choose(true);

diff --git a/megamek/src/megamek/common/weapons/FluidGunCoolHandler.java b/megamek/src/megamek/common/weapons/FluidGunCoolHandler.java
@@ -61,7 +61,7 @@ protected void handleEntityDamage(Entity entityTarget, Vector<Report> vPhaseRepo
             Roll diceRoll = Compute.rollD6(2);
             int rollValue = diceRoll.getIntValue();
             String rollReport = diceRoll.getReport();
-            r.addDataWithTooltip(String.valueOf(rollValue), rollReport);
+            r.addDataWithTooltip(rollValue, rollReport);
             if (rollValue == 12) {
                 r.choose(true);
                 entityTarget.infernos.clear();
@@ -77,7 +77,7 @@ protected void handleEntityDamage(Entity entityTarget, Vector<Report> vPhaseRepo
             Roll diceRoll = Compute.rollD6(2);
             int rollValue = diceRoll.getIntValue();
             String rollReport = diceRoll.getReport();
-            r.addDataWithTooltip(String.valueOf(rollValue), rollReport);
+            r.addDataWithTooltip(rollValue, rollReport);
             if (rollValue >= 4) {
                 r.choose(true);
                 for (int i = 0; i < entityTarget.locations(); i++) {

diff --git a/megamek/src/megamek/common/weapons/LRMSwarmHandler.java b/megamek/src/megamek/common/weapons/LRMSwarmHandler.java
@@ -124,7 +124,7 @@ public boolean handle(GamePhase phase, Vector<Report> vPhaseReport) {
         r = new Report(3155);
         r.newlines = 0;
         r.subject = subjectId;
-        r.addDataWithTooltip(String.valueOf(roll), rollReport);
+        r.addDataWithTooltip(roll, rollReport);
         vPhaseReport.addElement(r);
 
         // do we hit?

diff --git a/megamek/src/megamek/common/weapons/MechTaserHandler.java b/megamek/src/megamek/common/weapons/MechTaserHandler.java
@@ -55,7 +55,7 @@ protected boolean specialResolution(Vector<Report> vPhaseReport, Entity entityTa
         Roll diceRoll = Compute.rollD6(2);
         int rollValue = diceRoll.getIntValue();
         String rollReport = diceRoll.getReport();
-        r.addDataWithTooltip(String.valueOf(rollValue), rollReport);
+        r.addDataWithTooltip(rollValue, rollReport);
         r.newlines = 0;
         vPhaseReport.add(r);
         if (entityTarget.getWeight() > 100) {

diff --git a/megamek/src/megamek/common/weapons/MekMortarAirburstHandler.java b/megamek/src/megamek/common/weapons/MekMortarAirburstHandler.java
@@ -90,7 +90,7 @@ public boolean handle(GamePhase phase, Vector<Report> vPhaseReport) {
         r = new Report(3155);
         r.newlines = 0;
         r.subject = subjectId;
-        r.addDataWithTooltip(String.valueOf(roll), rollReport);
+        r.addDataWithTooltip(roll, rollReport);
         vPhaseReport.addElement(r);
 
         // do we hit?

diff --git a/megamek/src/megamek/common/weapons/MekMortarFlareHandler.java b/megamek/src/megamek/common/weapons/MekMortarFlareHandler.java
@@ -95,7 +95,7 @@ public boolean handle(GamePhase phase, Vector<Report> vPhaseReport) {
         r = new Report(3155);
         r.newlines = 0;
         r.subject = subjectId;
-        r.addDataWithTooltip(String.valueOf(roll), rollReport);
+        r.addDataWithTooltip(roll, rollReport);
         vPhaseReport.addElement(r);
 
         // do we hit?

diff --git a/megamek/src/megamek/common/weapons/MekMortarSmokeHandler.java b/megamek/src/megamek/common/weapons/MekMortarSmokeHandler.java
@@ -96,7 +96,7 @@ public boolean handle(GamePhase phase, Vector<Report> vPhaseReport) {
         r = new Report(3155);
         r.newlines = 0;
         r.subject = subjectId;
-        r.addDataWithTooltip(String.valueOf(roll), rollReport);
+        r.addDataWithTooltip(roll, rollReport);
         vPhaseReport.addElement(r);
 
         // do we hit?

diff --git a/megamek/src/megamek/common/weapons/MissileBayWeaponHandler.java b/megamek/src/megamek/common/weapons/MissileBayWeaponHandler.java
@@ -343,7 +343,7 @@ public boolean handle(GamePhase phase, Vector<Report> vPhaseReport) {
         r = new Report(3155);
         r.newlines = 0;
         r.subject = subjectId;
-        r.addDataWithTooltip(String.valueOf(roll), rollReport);
+        r.addDataWithTooltip(roll, rollReport);
         vPhaseReport.addElement(r);
 
         // do we hit?

diff --git a/megamek/src/megamek/common/weapons/MissileMineClearanceHandler.java b/megamek/src/megamek/common/weapons/MissileMineClearanceHandler.java
@@ -93,7 +93,7 @@ public boolean handle(GamePhase phase, Vector<Report> vPhaseReport) {
         r = new Report(3155);
         r.newlines = 0;
         r.subject = subjectId;
-        r.addDataWithTooltip(String.valueOf(roll), rollReport);
+        r.addDataWithTooltip(roll, rollReport);
         vPhaseReport.addElement(r);
 
         // do we hit?

diff --git a/megamek/src/megamek/common/weapons/MissileWeaponHandler.java b/megamek/src/megamek/common/weapons/MissileWeaponHandler.java
@@ -739,7 +739,7 @@ public boolean handle(GamePhase phase, Vector<Report> vPhaseReport) {
         r = new Report(3155);
         r.newlines = 0;
         r.subject = subjectId;
-        r.addDataWithTooltip(String.valueOf(roll), rollReport);
+        r.addDataWithTooltip(roll, rollReport);
         vPhaseReport.addElement(r);
 
         // do we hit?
@@ -848,7 +848,7 @@ public boolean handle(GamePhase phase, Vector<Report> vPhaseReport) {
                     String rollReport = diceRoll.getReport();
                     r = new Report(3352);
                     r.subject = subjectId;
-                    r.addDataWithTooltip(String.valueOf(rollValue), rollReport);
+                    r.addDataWithTooltip(rollValue, rollReport);
                     vPhaseReport.add(r);
                     hits = Math.max(0, hits - rollValue);
                 }

diff --git a/megamek/src/megamek/common/weapons/NarcExplosiveHandler.java b/megamek/src/megamek/common/weapons/NarcExplosiveHandler.java
@@ -80,13 +80,13 @@ protected int calcHits(Vector<Report> vPhaseReport) {
                 r = new Report(3240);
                 r.subject = subjectId;
                 r.add("pod");
-                r.addDataWithTooltip(String.valueOf(rollValue), rollReport);
+                r.addDataWithTooltip(rollValue, rollReport);
                 vPhaseReport.add(r);
                 return 0;
             }
             r = new Report(3241);
             r.add("pod");
-            r.addDataWithTooltip(String.valueOf(rollValue), rollReport);
+            r.addDataWithTooltip(rollValue, rollReport);
             r.subject = subjectId;
             vPhaseReport.add(r);
         }

diff --git a/megamek/src/megamek/common/weapons/NarcHandler.java b/megamek/src/megamek/common/weapons/NarcHandler.java
@@ -88,13 +88,13 @@ protected int calcHits(Vector<Report> vPhaseReport) {
                 r = new Report(3240);
                 r.subject = subjectId;
                 r.add("pod");
-                r.addDataWithTooltip(String.valueOf(rollValue), rollReport);
+                r.addDataWithTooltip(rollValue, rollReport);
                 vPhaseReport.add(r);
                 return 0;
             }
             r = new Report(3241);
             r.add("pod");
-            r.addDataWithTooltip(String.valueOf(rollValue), rollReport);
+            r.addDataWithTooltip(rollValue, rollReport);
             r.subject = subjectId;
             vPhaseReport.add(r);
         }