From 578f1d83579966dd8f6989b1f742a86b17aa6baf Mon Sep 17 00:00:00 2001
From: IllianiCBT <danielfarbrace@icloud.com>
Date: Sat, 28 Sep 2024 19:38:11 -0500
Subject: [PATCH] Add Sorter for Maintenance Column in Hangar Tab

Introduced `FormattedNumberSorter` for the maintenance column.
---
 MekHQ/src/mekhq/gui/HangarTab.java | 33 ++++++++++++------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/MekHQ/src/mekhq/gui/HangarTab.java b/MekHQ/src/mekhq/gui/HangarTab.java
index a49143373e..16aef350a0 100644
--- a/MekHQ/src/mekhq/gui/HangarTab.java
+++ b/MekHQ/src/mekhq/gui/HangarTab.java
@@ -18,20 +18,6 @@
  */
 package mekhq.gui;
 
-import java.awt.Dimension;
-import java.awt.GridBagConstraints;
-import java.awt.GridBagLayout;
-import java.awt.Insets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.ResourceBundle;
-import java.util.UUID;
-
-import javax.swing.*;
-import javax.swing.RowSorter.SortKey;
-import javax.swing.table.TableColumn;
-import javax.swing.table.TableRowSorter;
-
 import megamek.client.ui.models.XTableColumnModel;
 import megamek.client.ui.preferences.JComboBoxPreference;
 import megamek.client.ui.preferences.JTablePreference;
@@ -48,13 +34,19 @@
 import mekhq.gui.adapter.UnitTableMouseAdapter;
 import mekhq.gui.enums.MHQTabType;
 import mekhq.gui.model.UnitTableModel;
-import mekhq.gui.sorter.FormattedNumberSorter;
-import mekhq.gui.sorter.PersonTitleStringSorter;
-import mekhq.gui.sorter.UnitStatusSorter;
-import mekhq.gui.sorter.UnitTypeSorter;
-import mekhq.gui.sorter.WeightClassSorter;
+import mekhq.gui.sorter.*;
 import mekhq.gui.view.UnitViewPanel;
 
+import javax.swing.*;
+import javax.swing.RowSorter.SortKey;
+import javax.swing.table.TableColumn;
+import javax.swing.table.TableRowSorter;
+import java.awt.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.ResourceBundle;
+import java.util.UUID;
+
 /**
  * Displays a table of all units in the force.
  */
@@ -79,7 +71,7 @@ public final class HangarTab extends CampaignGuiTab {
     private UnitTableModel unitModel;
     private TableRowSorter<UnitTableModel> unitSorter;
 
-    private static final transient ResourceBundle resourceMap = ResourceBundle.getBundle("mekhq.resources.CampaignGUI",
+    private static final ResourceBundle resourceMap = ResourceBundle.getBundle("mekhq.resources.CampaignGUI",
             MekHQ.getMHQOptions().getLocale());
 
     // region Constructors
@@ -170,6 +162,7 @@ public void initTab() {
         unitSorter.setComparator(UnitTableModel.COL_STATUS, new UnitStatusSorter());
         unitSorter.setComparator(UnitTableModel.COL_PILOT, new PersonTitleStringSorter(getCampaign()));
         unitSorter.setComparator(UnitTableModel.COL_TECH_CRW, new PersonTitleStringSorter(getCampaign()));
+        unitSorter.setComparator(UnitTableModel.COL_MAINTAIN, new FormattedNumberSorter());
         unitTable.setRowSorter(unitSorter);
         List<SortKey> sortKeys = new ArrayList<>();
         sortKeys.add(new SortKey(UnitTableModel.COL_TYPE, SortOrder.DESCENDING));