Merge pull request #6402 from IllianiCBT/NoCommandNagDialogNew

Refactored No Commander Nag Dialog To Use Immersive Dialog Framework

Author: IllianiBird

MekHQ/resources/mekhq/resources/GUI.properties

@@ -303,12 +303,6 @@ ignoreFutureNags.checkbox=Don't show this again
 button.advanceDay=Advance Day
 button.cancel=Cancel
 ### Nag Messages
-NoCommanderNagDialog.text=Please be advised that no commanding officer is currently assigned\
-  \ to our unit. This could affect operational outcomes and mission planning. Confirm your intent\
-  \ to proceed, or assign a commander to maintain strategic efficiency.\
-  <br>\
-  <br><i>You can assign one of your personnel as the campaign commander by right-clicking on that\
-  \ character, navigating to Flags and selecting the Commander flag.</i>
 OutstandingScenariosNagDialog.text=%s, our forces are positioned for combat but await your commands to\
   \ proceed. Alternatively, you may order a tactical withdrawal by advancing the day. Do you wish\
   \ to proceed without addressing these engagements?\

MekHQ/resources/mekhq/resources/NagDialogs.properties

@@ -60,3 +60,10 @@ InvalidFactionNagDialog.ooc=You will need to select a new faction in the campaig
   \ to do this while using <a href=''GLOSSARY:STRATCON''>StratCon</a> will prevent contracts from\
   \ being generated.\
   <p>If you accidentally suppress this warning, you can re-enable it in MekHQ Options.</p>
+# No Commander
+NoCommanderNagDialog.ic=Please be advised that no commanding officer is currently assigned\
+  \ to our unit. This could affect operational outcomes and mission planning. Confirm your intent\
+  \ to proceed, or assign a commander to maintain strategic efficiency.
+NoCommanderNagDialog.ooc=You can assign one of your personnel as the campaign commander by\
+  \ right-clicking on that character, navigating to Flags and selecting the Commander flag.</i>\
+  <p>If you accidentally suppress this warning, you can re-enable it in MekHQ Options.</p>

MekHQ/src/mekhq/gui/dialog/nagDialogs/NagController.java

@@ -92,7 +92,7 @@ public static boolean triggerDailyNags(Campaign campaign) {
         // No Commander
         if (NoCommanderNagDialog.checkNag(campaign.getFlaggedCommander())) {
             NoCommanderNagDialog noCommanderNagDialog = new NoCommanderNagDialog(campaign);
-            if (noCommanderNagDialog.wasAdvanceDayCanceled()) {
+            if (noCommanderNagDialog.shouldCancelAdvanceDay()) {
                 return true;
             }
         }

MekHQ/src/mekhq/gui/dialog/nagDialogs/NoCommanderNagDialog.java

@@ -27,50 +27,37 @@
  */
 package mekhq.gui.dialog.nagDialogs;
 
+import static mekhq.MHQConstants.NAG_NO_COMMANDER;
+import static mekhq.campaign.Campaign.AdministratorSpecialization.HR;
+import static mekhq.gui.dialog.nagDialogs.nagLogic.NoCommanderNagLogic.hasNoCommander;
+
 import megamek.common.annotations.Nullable;
-import mekhq.MHQConstants;
 import mekhq.MekHQ;
 import mekhq.campaign.Campaign;
 import mekhq.campaign.personnel.Person;
-import mekhq.gui.baseComponents.AbstractMHQNagDialog;
-
-import static mekhq.gui.dialog.nagDialogs.nagLogic.NoCommanderNagLogic.hasNoCommander;
+import mekhq.gui.baseComponents.immersiveDialogs.ImmersiveDialogNag;
 
 /**
- * A dialog used to notify the user that their campaign lacks a designated commander.
+ * A dialog class used to notify players that a commander is missing in their campaign.
  *
- * <p>
- * This nag dialog is displayed when the campaign does not currently have a commander,
- * and checks whether the user has opted to ignore such notifications in the future.
- * If shown, the user has the option to dismiss the dialog or address the issue.
- * </p>
- *
- * <strong>Features:</strong>
- * <ul>
- *   <li>Handles the "No Commander" notification for campaigns.</li>
- *   <li>Localized message fetched using resource bundles.</li>
- *   <li>Extends the {@link AbstractMHQNagDialog} for reusable dialog behavior.</li>
- * </ul>
- *
- * @see AbstractMHQNagDialog
+ * <p>The {@code NoCommanderNagDialog} extends {@link ImmersiveDialogNag} and provides a specialized dialog
+ * designed to alert players when no commander is assigned or present in the campaign. It uses predefined values,
+ * including the {@code HR} speaker and the {@code NAG_NO_COMMANDER} constant, to configure dialog settings and
+ * content.</p>
  */
-public class NoCommanderNagDialog extends AbstractMHQNagDialog {
+public class NoCommanderNagDialog extends ImmersiveDialogNag {
     /**
-     * Constructs a {@code NoCommanderNagDialog} for a campaign.
+     * Constructs a new {@code NoCommanderNagDialog} instance to display the no commander nag dialog.
      *
-     * <p>
-     * This dialog uses the localization key {@code "NoCommanderNagDialog.text"}
-     * to display a message informing the user about the absence of a commander in their campaign.
-     * </p>
+     * <p>This constructor initializes the dialog with preconfigured parameters, such as the
+     * {@code NAG_NO_COMMANDER} constant for managing dialog suppression, the {@code "NoCommanderNagDialog"} message key
+     * for localization, and the {@code HR} speaker to deliver the dialog message.</p>
      *
-     * @param campaign The {@link Campaign} for which the nag dialog is being triggered.
+     * @param campaign The {@link Campaign} instance associated with this dialog. Provides access to campaign data and
+     *                 settings required for constructing the dialog.
      */
     public NoCommanderNagDialog(final Campaign campaign) {
-        super(campaign, MHQConstants.NAG_NO_COMMANDER);
-
-        final String DIALOG_BODY = "NoCommanderNagDialog.text";
-        setRightDescriptionMessage(resources.getString(DIALOG_BODY));
-        showDialog();
+        super(campaign, HR, NAG_NO_COMMANDER, "NoCommanderNagDialog");
     }
 
     /**
@@ -82,15 +69,15 @@ public NoCommanderNagDialog(final Campaign campaign) {
      *     <li>No flagged commander is assigned to the campaign.</li>
      * </ul>
      *
-     * @param flaggedCommander The {@link Person} designated as the flagged commander, or {@code null}
-     *                         if no commander is assigned.
-     * @return {@code true} if the nag dialog should be displayed due to the absence of a commander,
-     *         {@code false} otherwise.
+     * @param flaggedCommander The {@link Person} designated as the flagged commander, or {@code null} if no commander
+     *                         is assigned.
+     *
+     * @return {@code true} if the nag dialog should be displayed due to the absence of a commander, {@code false}
+     *       otherwise.
      */
     public static boolean checkNag(@Nullable Person flaggedCommander) {
-        final String NAG_KEY = MHQConstants.NAG_NO_COMMANDER;
+        final String NAG_KEY = NAG_NO_COMMANDER;
 
-        return !MekHQ.getMHQOptions().getNagDialogIgnore(NAG_KEY)
-              && hasNoCommander(flaggedCommander);
+        return !MekHQ.getMHQOptions().getNagDialogIgnore(NAG_KEY) && hasNoCommander(flaggedCommander);
     }
 }