Refactor saveUnitList() to not make a new ClientGUI

MegaMek · Aug 22, 2024 · 93ccf31 · 93ccf31
1 parent 91bb560
commit 93ccf31
Showing 1 changed file with 32 additions and 3 deletions.
diff --git a/megameklab/src/megameklab/ui/dialog/PrintQueueDialog.java b/megameklab/src/megameklab/ui/dialog/PrintQueueDialog.java
@@ -20,6 +20,7 @@
 
 import megamek.client.Client;
 import megamek.client.generator.RandomNameGenerator;
+import megamek.client.ui.Messages;
 import megamek.client.ui.baseComponents.MMButton;
 import megamek.client.ui.swing.ClientGUI;
 import megamek.client.ui.swing.UnitLoadingDialog;
@@ -28,7 +29,9 @@
 import megameklab.printing.PageBreak;
 import megameklab.util.UnitPrintManager;
 import org.apache.commons.io.FilenameUtils;
+import org.apache.fop.afp.util.StringUtils;
 import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.util.Strings;
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
@@ -40,13 +43,15 @@
 import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 import java.io.File;
+import java.io.IOException;
 import java.net.MalformedURLException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.stream.IntStream;
 
 import static java.util.stream.Collectors.toList;
+import static megamek.client.ui.swing.ClientGUI.CG_FILEPATHMUL;
 
 /**
  * Allows selecting multiple units and printing their record sheets.
@@ -265,10 +270,34 @@ protected void okButtonActionPerformed(ActionEvent evt) {
     }
 
     private void saveUnitList() {
-        // todo: Refactor saveListFile to be a static method of some util class
-        // --Pavel
+        var entities = getEntities();
+        if (entities.isEmpty()) {
+            return;
+        }
+
         linkForce();
-        new ClientGUI(new Client("", "", 0), null).saveListFile(getEntities(), "Units");
+
+        var fileChooser = new JFileChooser(".");
+        fileChooser.setDialogTitle(Messages.getString("ClientGUI.saveUnitListFileDialog.title"));
+        var filter = new FileNameExtensionFilter(
+                Messages.getString("ClientGUI.descriptionMULFiles"), CG_FILEPATHMUL);
+        fileChooser.setFileFilter(filter);
+        fileChooser.setSelectedFile(new File(Strings.isNotBlank(mulFileName) ? mulFileName : entities.get(0).getShortName() + " etc." + CG_FILEPATHMUL));
+
+        if (!(fileChooser.showSaveDialog(parent) == JFileChooser.APPROVE_OPTION) || fileChooser.getSelectedFile() == null) {
+            return;
+        }
+
+        File file = fileChooser.getSelectedFile();
+        if (!FilenameUtils.getExtension(file.getName()).equalsIgnoreCase(CG_FILEPATHMUL)) {
+            file = new File(file + "." + CG_FILEPATHMUL);
+        }
+
+        try {
+            EntityListFile.saveTo(file, entities);
+        } catch (IOException e) {
+            JOptionPane.showMessageDialog(getFrame(), "Error: " + e.getMessage());
+        }
     }
 
     private void pageBreak() {