From 57947db9596a0445b536b2af4e0436681a19aa2a Mon Sep 17 00:00:00 2001 From: Windchild292 Date: Sun, 13 Dec 2020 18:28:41 -0500 Subject: [PATCH] Fixing MekHQ dialog names --- .../mekhq/gui/adapter/PersonnelTableMouseAdapter.java | 6 +++--- MekHQ/src/mekhq/gui/dialog/NewRecruitDialog.java | 11 ++++------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java b/MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java index 4b7d52e797..aacdd632aa 100644 --- a/MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java +++ b/MekHQ/src/mekhq/gui/adapter/PersonnelTableMouseAdapter.java @@ -30,8 +30,8 @@ import javax.swing.*; import javax.swing.event.MouseInputAdapter; -import megamek.client.ui.swing.dialog.imageChooser.AbstractIconChooser; -import megamek.client.ui.swing.dialog.imageChooser.PortraitChooser; +import megamek.client.ui.swing.dialog.imageChooser.AbstractIconChooserDialog; +import megamek.client.ui.swing.dialog.imageChooser.PortraitChooserDialog; import megamek.client.ui.swing.util.MenuScroller; import megamek.common.*; import megamek.common.options.IOption; @@ -793,7 +793,7 @@ public void actionPerformed(ActionEvent action) { break; } case CMD_EDIT_PORTRAIT: { - AbstractIconChooser portraitDialog = new PortraitChooser(gui.getFrame(), + AbstractIconChooserDialog portraitDialog = new PortraitChooserDialog(gui.getFrame(), selectedPerson.getPortrait()); int result = portraitDialog.showDialog(); if ((result == JOptionPane.OK_OPTION) && (portraitDialog.getSelectedItem() != null)) { diff --git a/MekHQ/src/mekhq/gui/dialog/NewRecruitDialog.java b/MekHQ/src/mekhq/gui/dialog/NewRecruitDialog.java index 755568a3e6..461e72a167 100644 --- a/MekHQ/src/mekhq/gui/dialog/NewRecruitDialog.java +++ b/MekHQ/src/mekhq/gui/dialog/NewRecruitDialog.java @@ -23,11 +23,10 @@ import javax.swing.*; import megamek.client.generator.RandomNameGenerator; -import megamek.client.ui.swing.dialog.imageChooser.AbstractIconChooser; -import megamek.client.ui.swing.dialog.imageChooser.PortraitChooser; +import megamek.client.ui.swing.dialog.imageChooser.AbstractIconChooserDialog; +import megamek.client.ui.swing.dialog.imageChooser.PortraitChooserDialog; import megamek.common.enums.Gender; import megamek.common.util.EncodeControl; -import mekhq.MHQStaticDirectoryManager; import mekhq.MekHQ; import mekhq.campaign.personnel.Person; import mekhq.campaign.personnel.Ranks; @@ -37,17 +36,15 @@ import mekhq.preferences.PreferencesNode; public class NewRecruitDialog extends javax.swing.JDialog { - /** * This dialog is used to both hire new pilots and to edit existing ones - * */ private static final long serialVersionUID = -6265589976779860566L; private Person person; private CampaignGUI hqView; - private javax.swing.JComboBox choiceRanks; + private JComboBox choiceRanks; private JScrollPane scrollView; @@ -231,7 +228,7 @@ private void randomOrigin() { } private void choosePortrait() { - AbstractIconChooser portraitDialog = new PortraitChooser(hqView.getFrame(), person.getPortrait()); + AbstractIconChooserDialog portraitDialog = new PortraitChooserDialog(hqView.getFrame(), person.getPortrait()); int result = portraitDialog.showDialog(); if ((result == JOptionPane.OK_OPTION) && (portraitDialog.getSelectedItem() != null)) { person.setPortrait(portraitDialog.getSelectedItem());