Merge pull request #6600 from IllianiBird/imageUtilitiesMove

IllianiBird · web-flow · commit d2b7d98eb739 · 2025-04-08T18:35:47.000-05:00
Moved `ImageUtilities` Into MegaMek Package
diff --git a/MekHQ/src/mekhq/campaign/mission/AtBContract.java b/MekHQ/src/mekhq/campaign/mission/AtBContract.java
@@ -45,6 +45,7 @@
 import static megamek.common.enums.SkillLevel.REGULAR;
 import static megamek.common.enums.SkillLevel.parseFromInteger;
 import static megamek.common.enums.SkillLevel.parseFromString;
+import static megamek.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.campaign.force.CombatTeam.getStandardForceSize;
 import static mekhq.campaign.force.ForceType.STANDARD;
 import static mekhq.campaign.force.FormationLevel.BATTALION;
@@ -64,7 +65,6 @@
 import static mekhq.campaign.universe.Factions.getFactionLogo;
 import static mekhq.campaign.universe.fameAndInfamy.BatchallFactions.BATCHALL_FACTIONS;
 import static mekhq.utilities.EntityUtilities.getEntityFromUnitId;
-import static mekhq.utilities.ImageUtilities.scaleImageIcon;
 
 import java.awt.BorderLayout;
 import java.awt.FlowLayout;
diff --git a/MekHQ/src/mekhq/campaign/mission/AtBDynamicScenarioFactory.java b/MekHQ/src/mekhq/campaign/mission/AtBDynamicScenarioFactory.java
@@ -34,6 +34,7 @@
 import static megamek.common.Compute.d6;
 import static megamek.common.Compute.randomInt;
 import static megamek.common.UnitType.*;
+import static megamek.common.planetaryconditions.Atmosphere.THIN;
 import static megamek.common.planetaryconditions.Wind.TORNADO_F4;
 import static mekhq.campaign.force.CombatTeam.getStandardForceSize;
 import static mekhq.campaign.mission.AtBScenario.selectBotTeamCommanders;
@@ -69,6 +70,7 @@
 import megamek.common.enums.SkillLevel;
 import megamek.common.icons.Camouflage;
 import megamek.common.planetaryconditions.Atmosphere;
+import megamek.common.planetaryconditions.Wind;
 import megamek.logging.MMLogger;
 import mekhq.MHQConstants;
 import mekhq.MekHQ;
@@ -553,7 +555,8 @@ public static int generateForce(AtBDynamicScenario scenario, AtBContract contrac
         boolean allowsTanks = true;
 
         if (campaign.getCampaignOptions().isUsePlanetaryModifiers()) {
-            if (scenario.getAtmosphere().isLighterThan(Atmosphere.THIN)) {
+            if (scenario.getAtmosphere().isLighterThan(THIN)) {
+                logger.info("Atmosphere is lighter than {}, setting low pressure flag and disallowing Tanks", THIN);
                 isLowPressure = true;
                 allowsTanks = false;
             } else {
@@ -562,30 +565,36 @@ public static int generateForce(AtBDynamicScenario scenario, AtBContract contrac
                                                                                .getAtmosphere(currentDate);
 
                 switch (specific_atmosphere) {
-                    case TOXICPOISON:
-                    case TOXICCAUSTIC:
+                    case TOXICPOISON, TOXICCAUSTIC -> {
+                        logger.info("Atmosphere is {}, disallowing Tanks and Infantry", specific_atmosphere);
                         allowsConvInfantry = false;
                         allowsTanks = false;
-                        break;
-                    case TAINTEDPOISON:
-                    case TAINTEDCAUSTIC:
+                    }
+                    case TAINTEDPOISON, TAINTEDCAUSTIC -> {
+                        logger.info("Atmosphere is {}, setting tainted flag", specific_atmosphere);
                         isTainted = true;
-                        break;
-                    default:
-                        break;
+                    }
+                    default -> {
+                        // No action needed for the default case.
+                    }
                 }
             }
 
-            if (scenario.getGravity() <= 0.2) {
+            double gravity = scenario.getGravity();
+            if (gravity <= 0.2) {
+                logger.info("Gravity is {}, setting low gravity flag and disallowing tanks", gravity);
                 allowsTanks = false;
                 isLowGravity = true;
             }
         }
 
         if (campaign.getCampaignOptions().isUseWeatherConditions()) {
-            if (scenario.getWind().isTornadoF1ToF3() || scenario.getWind().isTornadoF4()) {
+            Wind wind = scenario.getWind();
+            if (wind.isTornadoF1ToF3() || wind.isTornadoF4()) {
+                logger.info("Tornado detected, disallowing Infantry");
                 allowsConvInfantry = false;
-                if (scenario.getWind().isTornadoF4()) {
+                if (wind.isTornadoF4()) {
+                    logger.info("F4 Tornado detected, disallowing Battle Armor and Tanks");
                     allowsTanks = false;
                     allowsBattleArmor = false;
                 }
@@ -991,8 +1000,7 @@ public static int generateForce(AtBDynamicScenario scenario, AtBContract contrac
 
                         boolean allowConventionalAircraft = scenario.getTemplate().mapParameters.getMapLocation() !=
                                                                   MapLocation.Space &&
-                                                                  scenario.getAtmosphere()
-                                                                        .isDenserThan(Atmosphere.THIN);
+                                                                  scenario.getAtmosphere().isDenserThan(THIN);
 
                         if (fighterMultiplier > 0 && allowConventionalAircraft) {
                             baseFighterCount *= fighterMultiplier;
diff --git a/MekHQ/src/mekhq/gui/StratconPanel.java b/MekHQ/src/mekhq/gui/StratconPanel.java
@@ -30,10 +30,10 @@
 import static java.awt.Color.BLACK;
 import static java.awt.Color.BLUE;
 import static java.awt.Font.BOLD;
+import static megamek.utilities.ImageUtilities.addTintToBufferedImage;
 import static mekhq.campaign.mission.ScenarioForceTemplate.ForceAlignment.Allied;
 import static mekhq.campaign.stratcon.StratconScenario.ScenarioState.PRIMARY_FORCES_COMMITTED;
 import static mekhq.campaign.stratcon.StratconScenario.ScenarioState.UNRESOLVED;
-import static mekhq.utilities.ImageUtilities.addTintToBufferedImage;
 
 import java.awt.*;
 import java.awt.event.ActionEvent;
diff --git a/MekHQ/src/mekhq/gui/baseComponents/AbstractMHQNagDialog.java b/MekHQ/src/mekhq/gui/baseComponents/AbstractMHQNagDialog.java
@@ -27,9 +27,9 @@
  */
 package mekhq.gui.baseComponents;
 
+import static megamek.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogCore.getSpeakerDescription;
 import static mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogCore.getSpeakerIcon;
-import static mekhq.utilities.ImageUtilities.scaleImageIcon;
 
 import java.awt.BorderLayout;
 import java.awt.Component;
diff --git a/MekHQ/src/mekhq/gui/baseComponents/immersiveDialogs/ImmersiveDialogCore.java b/MekHQ/src/mekhq/gui/baseComponents/immersiveDialogs/ImmersiveDialogCore.java
@@ -34,8 +34,8 @@
 import static megamek.client.ui.swing.util.FlatLafStyleBuilder.setFontScaling;
 import static megamek.client.ui.swing.util.UIUtil.scaleForGUI;
 import static megamek.common.icons.Portrait.DEFAULT_PORTRAIT_FILENAME;
+import static megamek.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.campaign.force.Force.FORCE_NONE;
-import static mekhq.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.utilities.MHQInternationalization.getFormattedTextAt;
 
 import java.awt.BorderLayout;
diff --git a/MekHQ/src/mekhq/gui/campaignOptions/SelectPresetDialog.java b/MekHQ/src/mekhq/gui/campaignOptions/SelectPresetDialog.java
@@ -27,8 +27,8 @@
  */
 package mekhq.gui.campaignOptions;
 
+import static megamek.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.gui.campaignOptions.CampaignOptionsUtilities.createGroupLayout;
-import static mekhq.utilities.ImageUtilities.scaleImageIcon;
 
 import java.awt.BorderLayout;
 import java.awt.Component;
@@ -125,7 +125,7 @@ public SelectPresetDialog(JFrame frame, boolean includePresetSelectOption, boole
         DefaultListCellRenderer listRenderer = new DefaultListCellRenderer() {
             @Override
             public Component getListCellRendererComponent(JList<?> list, Object value, int index, boolean isSelected,
-                                                          boolean cellHasFocus) {
+                  boolean cellHasFocus) {
                 if (value instanceof CampaignPreset preset) {
                     setText(preset.getTitle());
                 }
diff --git a/MekHQ/src/mekhq/gui/campaignOptions/components/CampaignOptionsHeaderPanel.java b/MekHQ/src/mekhq/gui/campaignOptions/components/CampaignOptionsHeaderPanel.java
@@ -28,7 +28,7 @@
 package mekhq.gui.campaignOptions.components;
 
 import static megamek.client.ui.swing.util.FlatLafStyleBuilder.setFontScaling;
-import static mekhq.utilities.ImageUtilities.scaleImageIcon;
+import static megamek.utilities.ImageUtilities.scaleImageIcon;
 
 import java.awt.GridBagConstraints;
 import java.util.ResourceBundle;
diff --git a/MekHQ/src/mekhq/gui/campaignOptions/contents/GeneralTab.java b/MekHQ/src/mekhq/gui/campaignOptions/contents/GeneralTab.java
@@ -29,8 +29,8 @@
 
 import static megamek.client.ui.swing.util.FlatLafStyleBuilder.setFontScaling;
 import static megamek.common.options.OptionsConstants.ALLOWED_YEAR;
+import static megamek.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.gui.campaignOptions.CampaignOptionsUtilities.createGroupLayout;
-import static mekhq.utilities.ImageUtilities.scaleImageIcon;
 
 import java.awt.Dimension;
 import java.awt.FlowLayout;
@@ -546,7 +546,7 @@ public void loadValuesFromCampaignOptions() {
      *                              the campaign's default faction is used.
      */
     public void loadValuesFromCampaignOptions(@Nullable CampaignOptions presetCampaignOptions,
-                                              @Nullable LocalDate presetDate, @Nullable Faction presetFaction) {
+          @Nullable LocalDate presetDate, @Nullable Faction presetFaction) {
         CampaignOptions options = presetCampaignOptions;
         if (presetCampaignOptions == null) {
             options = this.campaignOptions;
@@ -587,7 +587,7 @@ public void loadValuesFromCampaignOptions(@Nullable CampaignOptions presetCampai
      * @param isSaveAction          A boolean indicating if this is a save action.
      */
     public void applyCampaignOptionsToCampaign(@Nullable CampaignOptions presetCampaignOptions, boolean isStartUp,
-                                               boolean isSaveAction) {
+          boolean isSaveAction) {
         // First, we apply any updates to the campaign
         if (!isSaveAction) {
             campaign.setName(txtName.getText());
diff --git a/MekHQ/src/mekhq/gui/dialog/ContractAutomationDialog.java b/MekHQ/src/mekhq/gui/dialog/ContractAutomationDialog.java
@@ -27,9 +27,9 @@
  */
 package mekhq.gui.dialog;
 
+import static megamek.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogCore.getSpeakerDescription;
 import static mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogCore.getSpeakerIcon;
-import static mekhq.utilities.ImageUtilities.scaleImageIcon;
 
 import java.awt.BorderLayout;
 import java.awt.Component;
diff --git a/MekHQ/src/mekhq/gui/dialog/NewsDialog.java b/MekHQ/src/mekhq/gui/dialog/NewsDialog.java
@@ -27,7 +27,7 @@
  */
 package mekhq.gui.dialog;
 
-import static mekhq.utilities.ImageUtilities.scaleImageIcon;
+import static megamek.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.utilities.MHQInternationalization.getFormattedTextAt;
 
 import java.awt.Component;
diff --git a/MekHQ/src/mekhq/gui/dialog/randomEvents/GrayMondayDialog.java b/MekHQ/src/mekhq/gui/dialog/randomEvents/GrayMondayDialog.java
@@ -27,9 +27,9 @@
  */
 package mekhq.gui.dialog.randomEvents;
 
+import static megamek.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.campaign.Campaign.AdministratorSpecialization.LOGISTICS;
 import static mekhq.campaign.randomEvents.GrayMonday.EVENT_DATE_GRAY_MONDAY;
-import static mekhq.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.utilities.MHQInternationalization.getFormattedTextAt;
 
 import java.awt.Component;
diff --git a/MekHQ/src/mekhq/gui/dialog/resupplyAndCaches/DialogAbandonedConvoy.java b/MekHQ/src/mekhq/gui/dialog/resupplyAndCaches/DialogAbandonedConvoy.java
@@ -28,9 +28,9 @@
 package mekhq.gui.dialog.resupplyAndCaches;
 
 import static megamek.common.Compute.randomInt;
+import static megamek.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogCore.getSpeakerDescription;
 import static mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogCore.getSpeakerIcon;
-import static mekhq.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.utilities.MHQInternationalization.getFormattedTextAt;
 
 import java.awt.BorderLayout;
diff --git a/MekHQ/src/mekhq/gui/dialog/resupplyAndCaches/DialogContractStart.java b/MekHQ/src/mekhq/gui/dialog/resupplyAndCaches/DialogContractStart.java
@@ -27,12 +27,12 @@
  */
 package mekhq.gui.dialog.resupplyAndCaches;
 
+import static megamek.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.campaign.force.ForceType.CONVOY;
 import static mekhq.campaign.mission.resupplyAndCaches.Resupply.isProhibitedUnitType;
 import static mekhq.campaign.mission.resupplyAndCaches.ResupplyUtilities.estimateCargoRequirements;
 import static mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogCore.getSpeakerDescription;
 import static mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogCore.getSpeakerIcon;
-import static mekhq.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.utilities.MHQInternationalization.getFormattedTextAt;
 
 import java.awt.BorderLayout;
diff --git a/MekHQ/src/mekhq/gui/dialog/resupplyAndCaches/DialogInterception.java b/MekHQ/src/mekhq/gui/dialog/resupplyAndCaches/DialogInterception.java
@@ -28,9 +28,9 @@
 package mekhq.gui.dialog.resupplyAndCaches;
 
 import static megamek.common.Compute.randomInt;
+import static megamek.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogCore.getSpeakerDescription;
 import static mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogCore.getSpeakerIcon;
-import static mekhq.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.utilities.MHQInternationalization.getFormattedTextAt;
 
 import java.awt.BorderLayout;
diff --git a/MekHQ/src/mekhq/gui/dialog/resupplyAndCaches/DialogItinerary.java b/MekHQ/src/mekhq/gui/dialog/resupplyAndCaches/DialogItinerary.java
@@ -29,6 +29,7 @@
 
 import static javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE;
 import static megamek.common.Compute.randomInt;
+import static megamek.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.campaign.finances.enums.TransactionType.EQUIPMENT_PURCHASE;
 import static mekhq.campaign.mission.resupplyAndCaches.PerformResupply.loadPlayerConvoys;
 import static mekhq.campaign.mission.resupplyAndCaches.PerformResupply.makeDelivery;
@@ -42,7 +43,6 @@
 import static mekhq.gui.dialog.resupplyAndCaches.ResupplyDialogUtilities.createPartsReport;
 import static mekhq.gui.dialog.resupplyAndCaches.ResupplyDialogUtilities.formatColumnData;
 import static mekhq.gui.dialog.resupplyAndCaches.ResupplyDialogUtilities.getEnemyFactionReference;
-import static mekhq.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.utilities.MHQInternationalization.getFormattedTextAt;
 
 import java.awt.BorderLayout;
diff --git a/MekHQ/src/mekhq/gui/dialog/resupplyAndCaches/DialogPlayerConvoyOption.java b/MekHQ/src/mekhq/gui/dialog/resupplyAndCaches/DialogPlayerConvoyOption.java
@@ -27,9 +27,9 @@
  */
 package mekhq.gui.dialog.resupplyAndCaches;
 
+import static megamek.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogCore.getSpeakerDescription;
 import static mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogCore.getSpeakerIcon;
-import static mekhq.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.utilities.MHQInternationalization.getFormattedTextAt;
 
 import java.awt.BorderLayout;
diff --git a/MekHQ/src/mekhq/gui/dialog/resupplyAndCaches/DialogResupplyFocus.java b/MekHQ/src/mekhq/gui/dialog/resupplyAndCaches/DialogResupplyFocus.java
@@ -27,9 +27,9 @@
  */
 package mekhq.gui.dialog.resupplyAndCaches;
 
+import static megamek.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogCore.getSpeakerDescription;
 import static mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogCore.getSpeakerIcon;
-import static mekhq.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.utilities.MHQInternationalization.getFormattedTextAt;
 
 import java.awt.BorderLayout;
diff --git a/MekHQ/src/mekhq/gui/dialog/resupplyAndCaches/DialogRoleplayEvent.java b/MekHQ/src/mekhq/gui/dialog/resupplyAndCaches/DialogRoleplayEvent.java
@@ -27,9 +27,9 @@
  */
 package mekhq.gui.dialog.resupplyAndCaches;
 
+import static megamek.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogCore.getSpeakerDescription;
 import static mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogCore.getSpeakerIcon;
-import static mekhq.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.utilities.MHQInternationalization.getFormattedTextAt;
 
 import java.awt.BorderLayout;
diff --git a/MekHQ/src/mekhq/gui/dialog/resupplyAndCaches/DialogSwindled.java b/MekHQ/src/mekhq/gui/dialog/resupplyAndCaches/DialogSwindled.java
@@ -27,9 +27,9 @@
  */
 package mekhq.gui.dialog.resupplyAndCaches;
 
+import static megamek.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.campaign.universe.Factions.getFactionLogo;
 import static mekhq.gui.dialog.resupplyAndCaches.ResupplyDialogUtilities.getEnemyFactionReference;
-import static mekhq.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.utilities.MHQInternationalization.getFormattedTextAt;
 
 import java.awt.BorderLayout;
diff --git a/MekHQ/src/mekhq/gui/stratcon/StratconScenarioWizard.java b/MekHQ/src/mekhq/gui/stratcon/StratconScenarioWizard.java
@@ -27,6 +27,7 @@
  */
 package mekhq.gui.stratcon;
 
+import static megamek.utilities.ImageUtilities.scaleImageIcon;
 import static mekhq.campaign.mission.AtBDynamicScenarioFactory.scaleObjectiveTimeLimits;
 import static mekhq.campaign.mission.AtBDynamicScenarioFactory.translateTemplateObjectives;
 import static mekhq.campaign.personnel.skills.SkillType.S_LEADER;
@@ -44,7 +45,6 @@
 import static mekhq.campaign.utilities.CampaignTransportUtilities.getLeadershipDropdownVectorPair;
 import static mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogCore.getSpeakerDescription;
 import static mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogCore.getSpeakerIcon;
-import static mekhq.utilities.ImageUtilities.scaleImageIcon;
 
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
@@ -143,7 +143,7 @@ public StratconScenarioWizard(Campaign campaign, StratconPanel parent) {
      *                       </ul>
      */
     public void setCurrentScenario(StratconScenario scenario, StratconTrackState trackState,
-                                   StratconCampaignState campaignState, boolean isPrimaryForce) {
+          StratconCampaignState campaignState, boolean isPrimaryForce) {
         currentScenario = scenario;
         currentCampaignState = campaignState;
         currentTrackState = trackState;
@@ -481,7 +481,7 @@ private void setLeadershipUI(GridBagConstraints gbc, List<Unit> eligibleUnits, i
      * Add an "available force list" to the given control
      */
     private JList<Force> addAvailableForceList(JPanel parent, GridBagConstraints gbc,
-                                               ScenarioForceTemplate forceTemplate) {
+          ScenarioForceTemplate forceTemplate) {
         JScrollPane forceListContainer = new JScrollPaneWithSpeed();
 
         ScenarioWizardLanceModel lanceModel = new ScenarioWizardLanceModel(campaign,
@@ -514,7 +514,7 @@ private JList<Force> addAvailableForceList(JPanel parent, GridBagConstraints gbc
      * @return A JList of units that can be selected.
      */
     private JList<Unit> addIndividualUnitSelector(List<Unit> units, GridBagConstraints gridBagConstraints,
-                                                  int maxSelectionSize, boolean usesBV) {
+          int maxSelectionSize, boolean usesBV) {
         // Create the panel for the individual unit selector
         JPanel unitPanel = new JPanel();
         unitPanel.setLayout(new GridBagLayout());
@@ -949,7 +949,7 @@ private void reinforcementConfirmDialog() {
      *                                  {@code false} otherwise.
      */
     private void btnCommitClicked(ActionEvent evt, @Nullable Integer reinforcementTargetNumber,
-                                  boolean isGMReinforcement) {
+          boolean isGMReinforcement) {
         if (parent != null) {
             parent.setCommitForces(true);
         }
@@ -1097,7 +1097,7 @@ private void availableForceSelectorChanged(ListSelectionEvent e, JLabel forceSta
      *                            selected items, {@code false}
      */
     private void availableUnitSelectorChanged(ListSelectionEvent event, JLabel selectionCountLabel,
-                                              JLabel unitStatusLabel, int maxSelectionSize, boolean usesBV) {
+          JLabel unitStatusLabel, int maxSelectionSize, boolean usesBV) {
         if (!(event.getSource() instanceof JList<?>)) {
             return;
         }
@@ -1166,7 +1166,7 @@ private void availableUnitSelectorChanged(ListSelectionEvent event, JLabel selec
     }
 
     private void selectTransportedUnitsAndTransport(CampaignTransportType campaignTransportType, Unit unit,
-                                                    JList<Unit> changedList) {
+          JList<Unit> changedList) {
         if (campaignTransportType != null) {
             if (unit.hasTransportedUnits(campaignTransportType)) {
                 Set<Unit> potentialTransportedUnits = unit.getTransportedUnits(campaignTransportType);
diff --git a/MekHQ/src/mekhq/gui/view/PersonViewPanel.java b/MekHQ/src/mekhq/gui/view/PersonViewPanel.java
diff --git a/MekHQ/src/mekhq/utilities/ImageUtilities.java b/MekHQ/src/mekhq/utilities/ImageUtilities.java
