Merge pull request #6224 from IllianiCBT/systemPlanetPicker

Fixed Origin System-Planet Selection to Ensure No Null Values in Campaign Options IIC

Author: IllianiBird

MekHQ/src/mekhq/gui/campaignOptions/contents/BiographyTab.java

@@ -573,18 +573,15 @@ private JPanel createRandomOriginOptionsPanel() {
         chkRandomizeOrigin = new CampaignOptionsCheckBox("RandomizeOrigin");
         chkRandomizeDependentsOrigin = new CampaignOptionsCheckBox("RandomizeDependentsOrigin");
         chkRandomizeAroundSpecifiedPlanet = new CampaignOptionsCheckBox("RandomizeAroundSpecifiedPlanet");
+        chkSpecifiedSystemFactionSpecific.addActionListener(evt -> refreshSystemsAndPlanets());
 
         chkSpecifiedSystemFactionSpecific = new CampaignOptionsCheckBox("SpecifiedSystemFactionSpecific");
-        chkSpecifiedSystemFactionSpecific.addActionListener(evt -> {
-            final PlanetarySystem planetarySystem = comboSpecifiedSystem.getSelectedItem();
-            if ((planetarySystem == null)
-                || !planetarySystem.getFactionSet(campaign.getLocalDate()).contains(campaign.getFaction())) {
-                restoreComboSpecifiedSystem();
-            }
-        });
+        chkSpecifiedSystemFactionSpecific.addActionListener(evt -> refreshSystemsAndPlanets());
 
 
         lblSpecifiedSystem = new CampaignOptionsLabel("SpecifiedSystem");
+        comboSpecifiedSystem.setModel(new DefaultComboBoxModel<>(getPlanetarySystems(
+              chkSpecifiedSystemFactionSpecific.isSelected() ? campaign.getFaction() : null)));
         comboSpecifiedSystem.setRenderer(new DefaultListCellRenderer() {
             @Override
             public Component getListCellRendererComponent(final JList<?> list, final Object value,
@@ -607,6 +604,10 @@ public Component getListCellRendererComponent(final JList<?> list, final Object
         });
 
         lblSpecifiedPlanet = new CampaignOptionsLabel("SpecifiedPlanet");
+        final PlanetarySystem planetarySystem = comboSpecifiedSystem.getSelectedItem();
+        if (planetarySystem != null) {
+            comboSpecifiedPlanet.setModel(new DefaultComboBoxModel<>(planetarySystem.getPlanets().toArray(new Planet[] { })));
+        }
         comboSpecifiedPlanet.setRenderer(new DefaultListCellRenderer() {
             @Override
             public Component getListCellRendererComponent(final JList<?> list, final Object value,
@@ -688,6 +689,30 @@ public Component getListCellRendererComponent(final JList<?> list, final Object
         return panel;
     }
 
+    /**
+     * Refreshes the planetary systems and planets displayed in the associated combo boxes.
+     *
+     * <p>This method first stores the currently selected planetary system and planet. It then
+     * restores the list of available planetary systems by repopulating the `comboSpecifiedSystem`.
+     * Finally, it reselects the previously selected planetary system and planet in their respective
+     * combo boxes.</p>
+     *
+     * <p>The method ensures that the user selection persists even after the combo boxes are refreshed.
+     * Any exceptions during the selection process are caught and ignored. As if we can't restore
+     * the selection, that's fine, we just use the fallback index of 0.</p>
+     */
+    private void refreshSystemsAndPlanets() {
+        final PlanetarySystem planetarySystem = comboSpecifiedSystem.getSelectedItem();
+        final Planet planet = comboSpecifiedPlanet.getSelectedItem();
+
+        restoreComboSpecifiedSystem();
+
+        try {
+            comboSpecifiedSystem.setSelectedItem(planetarySystem);
+            comboSpecifiedPlanet.setSelectedItem(planet);
+        } catch (Exception ignored) {}
+    }
+
     /**
      * Resets the planet combo box to show only the planets matching the currently selected planetary system.
      */
@@ -1304,6 +1329,7 @@ public void loadValuesFromCampaignOptions(@Nullable CampaignOptions presetCampai
         chkRandomizeOrigin.setSelected(originOptions.isRandomizeOrigin());
         chkRandomizeDependentsOrigin.setSelected(originOptions.isRandomizeDependentOrigin());
         chkRandomizeAroundSpecifiedPlanet.setSelected(originOptions.isRandomizeAroundSpecifiedPlanet());
+        comboSpecifiedSystem.setSelectedItem(originOptions.getSpecifiedPlanet().getParentSystem());
         comboSpecifiedPlanet.setSelectedItem(originOptions.getSpecifiedPlanet());
         spnOriginSearchRadius.setValue(originOptions.getOriginSearchRadius());
         spnOriginDistanceScale.setValue(originOptions.getOriginDistanceScale());
@@ -1395,9 +1421,6 @@ public void applyCampaignOptionsToCampaign(@Nullable CampaignOptions presetCampa
         originOptions.setRandomizeAroundSpecifiedPlanet(chkRandomizeAroundSpecifiedPlanet.isSelected());
 
         Planet selectedPlanet = comboSpecifiedPlanet.getSelectedItem();
-        if (selectedPlanet == null && comboSpecifiedPlanet.getItemCount() > 0) {
-            selectedPlanet = comboSpecifiedPlanet.getItemAt(0);
-        }
         originOptions.setSpecifiedPlanet(selectedPlanet);
 
         originOptions.setOriginSearchRadius((int) spnOriginSearchRadius.getValue());