Merge pull request #6558 from psikomonkie/pr/show-engine-tonnage-in-parts-in-use

Show engine tonnage in parts-in-use table

Author: IllianiCBT

MekHQ/src/mekhq/campaign/parts/MissingEnginePart.java

@@ -30,9 +30,6 @@
 
 import java.io.PrintWriter;
 
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
 import megamek.common.Aero;
 import megamek.common.CriticalSlot;
 import megamek.common.Engine;
@@ -48,6 +45,8 @@
 import mekhq.campaign.Campaign;
 import mekhq.campaign.parts.enums.PartRepairType;
 import mekhq.utilities.MHQXMLUtility;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
 
 /**
  * @author Jay Lawson (jaylawson39 at yahoo.com)
@@ -239,7 +238,7 @@ public void updateConditionFromPart() {
 
     @Override
     public String getAcquisitionName() {
-        return getPartName() + ",  " + getTonnage() + " tons";
+        return getPartName() + ",  " + getUnitTonnage() + " tons";
     }
 
     @Override

MekHQ/src/mekhq/campaign/parts/PartInUse.java

@@ -28,7 +28,11 @@
 
 package mekhq.campaign.parts;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import megamek.common.AmmoType;
@@ -92,7 +96,7 @@ public PartInUse(Part part) {
         if (null != partToBuy) {
             this.cost = partToBuy.getBuyCost();
             String descString = partToBuy.getAcquisitionName();
-            if( !(descString.contains("(") && descString.contains(")"))) {
+            if( !(descString.contains("(") && descString.contains(")")) && !(part instanceof EnginePart)) {
                 descString = descString.split(",")[0];
                 descString = descString.split("<")[0];
             }