Refactored CampaignOptionsDialog usage to remove "_new" class.

Replaced references to CampaignOptionsDialog_new with CampaignOptionsDialog to streamline dialog handling. Adjusted constructor calls to include necessary parameters and updated visibility settings accordingly. Commented out obsolete code for improved clarity and maintainability.
MegaMek · Jan 12, 2025 · f5f8372 · f5f8372
1 parent 2cef151
commit f5f8372
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/MekHQ/src/mekhq/gui/CampaignGUI.java b/MekHQ/src/mekhq/gui/CampaignGUI.java
@@ -72,7 +72,6 @@
 import mekhq.campaign.universe.NewsItem;
 import mekhq.gui.dialog.*;
 import mekhq.gui.dialog.CampaignExportWizard.CampaignExportWizardState;
-import mekhq.gui.dialog.campaignOptions.CampaignOptionsDialog_new;
 import mekhq.gui.dialog.reportDialogs.*;
 import mekhq.gui.enums.MHQTabType;
 import mekhq.gui.model.PartsTableModel;
@@ -1465,7 +1464,7 @@ private void menuOptionsActionPerformed(final ActionEvent evt) {
         final RandomMarriageMethod randomMarriageMethod = oldOptions.getRandomMarriageMethod();
         final RandomProcreationMethod randomProcreationMethod = oldOptions.getRandomProcreationMethod();
 
-        new CampaignOptionsDialog_new(getFrame(), getCampaign());
+        new CampaignOptionsDialog(getFrame(), getCampaign(), true);
 
         final CampaignOptions newOptions = getCampaign().getCampaignOptions();
 

diff --git a/MekHQ/src/mekhq/gui/dialog/DataLoadingDialog.java b/MekHQ/src/mekhq/gui/dialog/DataLoadingDialog.java
@@ -52,7 +52,6 @@
 import mekhq.campaign.universe.Systems;
 import mekhq.campaign.universe.eras.Eras;
 import mekhq.gui.baseComponents.AbstractMHQDialogBasic;
-import mekhq.gui.dialog.campaignOptions.CampaignOptionsDialog_new;
 import mekhq.gui.dialog.campaignOptions.SelectPresetDialog;
 
 import javax.swing.*;
@@ -349,13 +348,14 @@ public Campaign doInBackground() throws Exception {
                     campaign.getGameOptions().getOption(OptionsConstants.ALLOWED_YEAR).setValue(campaign.getGameYear());
                     campaign.setStartingSystem((preset == null) ? null : preset.getPlanet());
 
-                    CampaignOptionsDialog_new optionsDialog =
-                        new CampaignOptionsDialog_new(getFrame(), campaign);
+                    CampaignOptionsDialog optionsDialog =
+                        new CampaignOptionsDialog(getFrame(), campaign, true);
+                    optionsDialog.setVisible(true);
 //                    optionsDialog.setLocationRelativeTo(null);
 //                    optionsDialog.applyPreset(preset);
-                    if (optionsDialog.wasCanceled()) {
-                        return null;
-                    }
+//                    if (optionsDialog.wasCanceled()) {
+//                        return null;
+//                    }
                 }
 
                 // initialize reputation