find parts by ID rather than name

MegaMek · Aug 14, 2024 · a4cc0f9 · a4cc0f9
1 parent cdc6ddb
commit a4cc0f9
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 23 deletions.
diff --git a/MekHQ/src/mekhq/campaign/parts/PartInUse.java b/MekHQ/src/mekhq/campaign/parts/PartInUse.java
@@ -9,7 +9,7 @@
 
 public class PartInUse {
     private String description;
-    private String name;
+    private int id;
     private IAcquisitionWork partToBuy;
     private int useCount;
     private int storeCount;
@@ -35,14 +35,13 @@ public PartInUse(Part part) {
             appendDetails(sb, part);
         }
         part.setUnit(u);
-        this.name = part.getName();
+        this.id = part.getId();
         this.description = sb.toString();
         this.partToBuy = part.getAcquisitionWork();
         this.tonnagePerItem = part.getTonnage();
         // AmmoBin are special: They aren't buyable (yet?), but instead buy you the ammo inside
         // We redo the description based on that
         if (partToBuy instanceof AmmoStorage) {
-            this.name = ((AmmoStorage) partToBuy).getName();
             sb.setLength(0);
             sb.append(((AmmoStorage) partToBuy).getName());
             appendDetails(sb, (Part) ((AmmoStorage) partToBuy).getAcquisitionWork());
@@ -77,8 +76,8 @@ public String getDescription() {
         return description;
     }
 
-    public String getName() {
-        return name;
+    public int getId() {
+        return id;
     }
 
     public IAcquisitionWork getPartToBuy() {

diff --git a/MekHQ/src/mekhq/gui/dialog/PartsReportDialog.java b/MekHQ/src/mekhq/gui/dialog/PartsReportDialog.java
@@ -136,11 +136,16 @@ public void actionPerformed(ActionEvent e) {
             public void actionPerformed(ActionEvent e) {
                 int row = Integer.parseInt(e.getActionCommand());
                 PartInUse partInUse = overviewPartsModel.getPartInUse(row);
-                campaign.getWarehouse().getSpareParts().stream().filter(p ->
-                    Objects.equals(p.getName(), partInUse.getName()))
-                    .findFirst()
-                    .ifPresent(p -> campaign.getQuartermaster().sellPart(p, 1));
+                Part part = campaign.getWarehouse().getPart(partInUse.getId());
+                if (part == null) {
+                    return;
+                }
+                Part spare = campaign.getWarehouse().checkForExistingSparePart(part);
+                if (spare != null) {
+                    campaign.getQuartermaster().sellPart(spare, 1);
+                }
                 refreshOverviewPartsInUse();
+
             }
         };
 
@@ -149,20 +154,22 @@ public void actionPerformed(ActionEvent e) {
             public void actionPerformed(ActionEvent e) {
                 int row = Integer.parseInt(e.getActionCommand());
                 PartInUse partInUse = overviewPartsModel.getPartInUse(row);
-                campaign.getWarehouse().getSpareParts().stream().filter(p ->
-                                Objects.equals(p.getName(), partInUse.getName()))
-                        .findFirst()
-                        .ifPresent(p -> {
-                            int quantity = 1;
-                            PopupValueChoiceDialog popupValueChoiceDialog = new PopupValueChoiceDialog(gui.getFrame(), true,
-                                    "Sell how many " + p.getName(), quantity, 1, CampaignGUI.MAX_QUANTITY_SPINNER);
-                            popupValueChoiceDialog.setVisible(true);
-                            quantity = popupValueChoiceDialog.getValue();
-                            if (quantity <= 0) {
-                                return;
-                            }
-                            campaign.getQuartermaster().sellPart(p, quantity);
-                        });
+                Part part = campaign.getWarehouse().getPart(partInUse.getId());
+                if (part == null) {
+                    return;
+                }
+                Part spare = campaign.getWarehouse().checkForExistingSparePart(part);
+                if (spare != null) {
+                    int quantity = 1;
+                    PopupValueChoiceDialog popupValueChoiceDialog = new PopupValueChoiceDialog(gui.getFrame(), true,
+                        "Sell how many " + spare.getName(), quantity, 1, CampaignGUI.MAX_QUANTITY_SPINNER);
+                    popupValueChoiceDialog.setVisible(true);
+                    quantity = popupValueChoiceDialog.getValue();
+                    if (quantity <= 0) {
+                        return;
+                    }
+                    campaign.getQuartermaster().sellPart(spare, quantity);
+                }
                 refreshOverviewPartsInUse();
             }
         };