Merge pull request #7214 from IllianiBird/newPersonnelMarketRememberLastSize

Improvement: New Personnel Market Dialog Will Now Remember Last Size

Author: HammerGS

MekHQ/src/mekhq/gui/dialog/markets/personnelMarket/PersonnelMarketDialog.java

@@ -46,6 +46,7 @@
 import static mekhq.utilities.ReportingUtilities.spanOpeningWithCustomColor;
 
 import java.awt.BorderLayout;
+import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
@@ -61,6 +62,9 @@
 import javax.swing.table.TableRowSorter;
 
 import megamek.client.ui.comboBoxes.MMComboBox;
+import megamek.client.ui.preferences.JWindowPreference;
+import megamek.client.ui.preferences.PreferencesNode;
+import megamek.logging.MMLogger;
 import mekhq.MekHQ;
 import mekhq.campaign.Campaign;
 import mekhq.campaign.CampaignOptions;
@@ -108,22 +112,23 @@
  * @since 0.50.06
  */
 public class PersonnelMarketDialog extends JDialog {
+    private static final MMLogger LOGGER = MMLogger.create(PersonnelMarketDialog.class);
     private static final String RESOURCE_BUNDLE = "mekhq.resources.PersonnelMarket";
 
     private static final int MAXIMUM_DAYS_IN_MONTH = 31;
     private static final int MAXIMUM_NUMBER_OF_SYSTEM_ROLLS = 4;
 
     private final int PADDING = scaleForGUI(5);
+    private final Dimension PERSON_VIEW_MINIMUM_SIZE = scaleForGUI(500, 500);
 
     private final NewPersonnelMarket market;
     private final JFrame parent;
     private final Campaign campaign;
     private final CampaignOptions campaignOptions;
 
-    private List<Person> currentApplicants;
+    private final List<Person> currentApplicants;
     private MMComboBox<PersonnelFilter> roleComboBox = new MMComboBox<>("roleFilter");
-    private JCheckBox goldenHelloCheckbox = new JCheckBox();
-    private Person selectedPerson;
+    private final JCheckBox goldenHelloCheckbox = new JCheckBox();
     private PersonnelTablePanel tablePanel;
     private PersonViewPanel personViewPanel;
 
@@ -191,7 +196,8 @@ public void windowClosing(WindowEvent e) {
         setModal(true);
         pack();
         setLocationRelativeTo(parent);
-        setVisible(true);
+        setPreferences(this); // Must be before setVisible
+        setVisible(true); // Should always be last
     }
 
     /**
@@ -233,7 +239,7 @@ private JPanel initializeHeader() {
 
         // Golden Hello Checkbox
         leftGbc.gridy = leftRow++;
-        leftGbc.insets = new Insets(0, 0, 8, 0);
+        leftGbc.insets = new Insets(0, 0, PADDING, 0);
         goldenHelloCheckbox.setText(getTextAt(RESOURCE_BUNDLE,
               "checkbox.personnelMarket.goldenHello"));
         goldenHelloCheckbox.setSelected(market.isOfferingGoldenHello());
@@ -259,7 +265,7 @@ private JPanel initializeHeader() {
 
         // Personnel Availability Label (Centered)
         rightGbc.gridy = rightRow++;
-        rightGbc.insets = new Insets(0, 0, 8, 0);
+        rightGbc.insets = new Insets(0, 0, PADDING, 0);
         JLabel availabilityLabel = new JLabel(getTextAt(RESOURCE_BUNDLE, "label.personnelMarket.availability"));
         availabilityLabel.setHorizontalAlignment(SwingConstants.CENTER);
         rightPanel.add(availabilityLabel, rightGbc);
@@ -465,7 +471,7 @@ public boolean include(Entry<? extends TableModel, ? extends Integer> entry) {
     private JSplitPane initializePersonView(AtomicReference<Person> selectedPerson, JPanel mainPanel) {
         personViewPanel = new PersonViewPanel(selectedPerson.get(), campaign, campaign.getApp().getCampaigngui());
         JScrollPane viewScrollPane = new JScrollPane(personViewPanel);
-        viewScrollPane.setPreferredSize(scaleForGUI(500, 750));
+        viewScrollPane.setMinimumSize(PERSON_VIEW_MINIMUM_SIZE);
         SwingUtilities.invokeLater(() -> viewScrollPane.getVerticalScrollBar().setValue(0));
 
         JPanel buttonPanel = initializeButtonPanel();
@@ -599,4 +605,17 @@ private String getAvailabilityModifierMessage() {
         }
         return noAvailabilityMessage;
     }
+
+    /**
+     * This override forces the preferences for this class to be tracked in MekHQ instead of MegaMek.
+     */
+    private void setPreferences(JDialog dialog) {
+        try {
+            PreferencesNode preferences = MekHQ.getMHQPreferences().forClass(PersonnelMarketDialog.class);
+            dialog.setName("PersonnelMarketDialog");
+            preferences.manage(new JWindowPreference(dialog));
+        } catch (Exception ex) {
+            LOGGER.error("Failed to set user preferences", ex);
+        }
+    }
 }