rename TroopSpace to InfantryCompartment

MegaMek · Nov 5, 2024 · 4b741c1 · 4b741c1
1 parent 62055be
commit 4b741c1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/megameklab/src/megameklab/printing/PrintAero.java b/megameklab/src/megameklab/printing/PrintAero.java
@@ -184,7 +184,7 @@ public String formatFeatures() {
         Map<String, Double> transport = new HashMap<>();
         Map<String, Integer> seating = new HashMap<>();
         for (Transporter t : aero.getTransports()) {
-            if (t instanceof TroopSpace) {
+            if (t instanceof InfantryCompartment) {
                 transport.merge("Infantry Compartment", t.getUnused(), Double::sum);
             } else if (t instanceof StandardSeatCargoBay) {
                 seating.merge(((Bay) t).getType(), (int) ((Bay) t).getCapacity(), Integer::sum);

diff --git a/megameklab/src/megameklab/printing/PrintTank.java b/megameklab/src/megameklab/printing/PrintTank.java
@@ -33,7 +33,7 @@
 import megamek.common.StandardSeatCargoBay;
 import megamek.common.Tank;
 import megamek.common.Transporter;
-import megamek.common.TroopSpace;
+import megamek.common.InfantryCompartment;
 import megamek.common.VTOL;
 import megameklab.printing.reference.ClusterHitsTable;
 import megameklab.printing.reference.GroundMovementRecord;
@@ -199,7 +199,7 @@ public String formatFeatures() {
         Map<String, Double> transport = new HashMap<>();
         Map<String, Integer> seating = new HashMap<>();
         for (Transporter t : tank.getTransports()) {
-            if (t instanceof TroopSpace) {
+            if (t instanceof InfantryCompartment) {
                 transport.merge("Infantry Compartment", t.getUnused(), Double::sum);
             } else if (t instanceof StandardSeatCargoBay) {
                 seating.merge(((Bay) t).getType(), (int) ((Bay) t).getCapacity(), Integer::sum);

diff --git a/megameklab/src/megameklab/ui/combatVehicle/CVStructureTab.java b/megameklab/src/megameklab/ui/combatVehicle/CVStructureTab.java
@@ -680,16 +680,16 @@ public void turretBaseWtChanged(double turret1, double turret2) {
     @Override
     public void troopSpaceChanged(double fixed, double pod) {
         List<Transporter> toRemove = getTank().getTransports().stream()
-                .filter(t -> t instanceof TroopSpace).collect(Collectors.toList());
+                .filter(t -> t instanceof InfantryCompartment).collect(Collectors.toList());
         toRemove.forEach(t -> getTank().removeTransporter(t));
         double troopTons = Math
                 .round((fixed) * 2) / 2.0;
         if (troopTons > 0) {
-            getTank().addTransporter(new TroopSpace(troopTons), false);
+            getTank().addTransporter(new InfantryCompartment(troopTons), false);
         }
         troopTons = Math.round(pod * 2) / 2.0;
         if (troopTons > 0) {
-            getTank().addTransporter(new TroopSpace(troopTons), true);
+            getTank().addTransporter(new InfantryCompartment(troopTons), true);
         }
         panSummary.refresh();
         refresh.refreshStatus();

diff --git a/megameklab/src/megameklab/ui/generalUnit/TransportTab.java b/megameklab/src/megameklab/ui/generalUnit/TransportTab.java
@@ -47,7 +47,7 @@
 import megamek.common.Jumpship;
 import megamek.common.RoundWeight;
 import megamek.common.Transporter;
-import megamek.common.TroopSpace;
+import megamek.common.InfantryCompartment;
 import megamek.common.verifier.BayData;
 import megamek.common.verifier.TestAdvancedAerospace;
 import megamek.common.verifier.TestAero;
@@ -542,15 +542,15 @@ public void stateChanged(ChangeEvent ev) {
             final double pod = (Double) spnPodTroopSpace.getValue();
 
             List<Transporter> toRemove = getEntity().getTransports().stream()
-                    .filter(t -> t instanceof TroopSpace).collect(Collectors.toList());
+                    .filter(t -> t instanceof InfantryCompartment).collect(Collectors.toList());
             toRemove.forEach(t -> getEntity().removeTransporter(t));
             double troopTons = TestEntity.round(fixed, Ceil.HALFTON);
             if (troopTons > 0) {
-                getEntity().addTransporter(new TroopSpace(troopTons), false);
+                getEntity().addTransporter(new InfantryCompartment(troopTons), false);
             }
             troopTons = TestEntity.round(pod, Ceil.HALFTON);
             if (troopTons > 0) {
-                getEntity().addTransporter(new TroopSpace(troopTons), true);
+                getEntity().addTransporter(new InfantryCompartment(troopTons), true);
             }
             if (null != refresh) {
                 refresh.refreshStructure();