Merge pull request #6559 from psikomonkie/issue/6548/sort-by-age-2

Issue 6548: PersonnelTableModelColumn's cell value should be a date to allow proper sorting

Author: IllianiCBT

MekHQ/src/mekhq/gui/dialog/BatchXPDialog.java

@@ -39,6 +39,7 @@
 import java.util.ResourceBundle;
 import javax.swing.*;
 import javax.swing.RowSorter.SortKey;
+import javax.swing.table.TableCellRenderer;
 import javax.swing.table.TableColumn;
 import javax.swing.table.TableRowSorter;
 
@@ -58,7 +59,6 @@
 import mekhq.gui.enums.PersonnelTableModelColumn;
 import mekhq.gui.model.PersonnelTableModel;
 import mekhq.gui.utilities.JScrollPaneWithSpeed;
-import mekhq.gui.utilities.MekHqTableCellRenderer;
 
 public final class BatchXPDialog extends JDialog {
     private static final MMLogger logger = MMLogger.create(BatchXPDialog.class);
@@ -137,7 +137,7 @@ private JComponent getPersonnelTable() {
             }
 
             tableColumn.setPreferredWidth(column.getWidth());
-            tableColumn.setCellRenderer(new MekHqTableCellRenderer());
+            tableColumn.setCellRenderer(getRenderer());
             columnModel.setColumnVisible(tableColumn, true);
 
             personnelSorter.setComparator(column.ordinal(), column.getComparator(campaign));
@@ -156,6 +156,10 @@ private JComponent getPersonnelTable() {
         return pane;
     }
 
+    private TableCellRenderer getRenderer() {
+        return personnelModel.new Renderer();
+    }
+
     private JComponent getButtonPanel() {
         JPanel panel = new JPanel();
         panel.setLayout(new BoxLayout(panel, BoxLayout.Y_AXIS));

MekHQ/src/mekhq/gui/enums/PersonnelTableModelColumn.java

@@ -536,8 +536,7 @@ public String getCellValue(final Campaign campaign, final PersonnelMarket person
                 return person.getPostNominal();
             case CALLSIGN:
                 return person.getCallsign();
-            case AGE:
-                return String.valueOf(person.getAge(campaign.getLocalDate()));
+            case AGE: //Age's cell value must return birthday to allow sorting
             case BIRTHDAY:
                 return MekHQ.getMHQOptions().getDisplayFormattedDate(person.getDateOfBirth());
             case PERSONNEL_STATUS: