Merge pull request #4757 from SJuliez/#4750

Loading units during deployment (#4750): dialog call correction
MegaMek · Sep 8, 2023 · 0b0fd12 · 0b0fd12
2 parents c6d55b0 + ee24ec1
commit 0b0fd12
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/megamek/src/megamek/client/ui/swing/DeploymentDisplay.java b/megamek/src/megamek/client/ui/swing/DeploymentDisplay.java
@@ -689,8 +689,8 @@ public void actionPerformed(ActionEvent evt) {
             if (!choices.isEmpty()) {
                 // If we have multiple choices, display a selection dialog.
                 Entity other = EntityChoiceDialog.showSingleChoiceDialog(clientgui.getFrame(),
+                        "DeploymentDisplay.loadUnitDialog.title",
                         Messages.getString("DeploymentDisplay.loadUnitDialog.message", ce().getShortName(), ce().getUnusedString()),
-                        Messages.getString("DeploymentDisplay.loadUnitDialog.title"),
                         choices);
 
                 if (!(other instanceof Infantry)) {
@@ -765,8 +765,8 @@ public void actionPerformed(ActionEvent evt) {
             if (!choices.isEmpty()) {
 
                 Entity loaded = EntityChoiceDialog.showSingleChoiceDialog(clientgui.getFrame(),
+                        "DeploymentDisplay.unloadUnitDialog.title",
                         Messages.getString("DeploymentDisplay.unloadUnitDialog.message", ce().getShortName(), ce().getUnusedString()),
-                        Messages.getString("DeploymentDisplay.unloadUnitDialog.title"),
                         choices);
 
                 if (loaded != null) {

diff --git a/megamek/src/megamek/client/ui/swing/boardview/BoardView.java b/megamek/src/megamek/client/ui/swing/boardview/BoardView.java
@@ -5407,8 +5407,8 @@ private Entity chooseEntity(Coords pos) {
         } else if (entities.size() > 1) {
             // If we have multiple choices, display a selection dialog.
             choice = EntityChoiceDialog.showSingleChoiceDialog(clientgui.getFrame(),
+                    "BoardView1.ChooseEntityDialog.title",
                     Messages.getString("BoardView1.ChooseEntityDialog.message", pos.getBoardNum()),
-                    Messages.getString("BoardView1.ChooseEntityDialog.title"),
                     entities);
         }