Fixing MekHQ dialog names

MegaMek · Dec 13, 2020 · 57947db · 57947db
1 parent 03ffd7d
commit 57947db
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 10 deletions.
diff --git 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
@@ -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<String> choiceRanks;
+    private JComboBox<String> 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());