From af6fea506a301bf16e8ee37d6b06c3d51fd8ba73 Mon Sep 17 00:00:00 2001 From: asvitkine Date: Sun, 9 Jul 2023 23:19:03 -0400 Subject: [PATCH 1/2] Use a better default folder for XML export. The user root folder should not give permission denied errors, unlike the user dir. --- .../java/games/strategy/triplea/ui/menubar/ExportMenu.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/game-app/game-headed/src/main/java/games/strategy/triplea/ui/menubar/ExportMenu.java b/game-app/game-headed/src/main/java/games/strategy/triplea/ui/menubar/ExportMenu.java index 2cbd28c7a55..df377c38a6a 100644 --- a/game-app/game-headed/src/main/java/games/strategy/triplea/ui/menubar/ExportMenu.java +++ b/game-app/game-headed/src/main/java/games/strategy/triplea/ui/menubar/ExportMenu.java @@ -1,6 +1,9 @@ package games.strategy.triplea.ui.menubar; +import static games.strategy.engine.ClientFileSystemHelper.getUserRootFolder; + import com.google.common.collect.Iterables; +import games.strategy.engine.ClientFileSystemHelper; import games.strategy.engine.data.GameData; import games.strategy.engine.data.GamePlayer; import games.strategy.engine.data.ProductionRule; @@ -92,7 +95,6 @@ private JMenuItem createExportXmlMenu() { private void exportXmlFile() { final JFileChooser chooser = new JFileChooser(); chooser.setFileSelectionMode(JFileChooser.FILES_ONLY); - final Path rootDir = Path.of(SystemProperties.getUserDir()); final int round = gameData.getCurrentRound(); final String defaultFileName = @@ -103,6 +105,7 @@ private void exportXmlFile() { gameData.getGameName(), round)) + ".xml"; + final Path rootDir = ClientFileSystemHelper.getUserRootFolder(); chooser.setSelectedFile(rootDir.resolve(defaultFileName).toFile()); if (chooser.showSaveDialog(frame) != JOptionPane.OK_OPTION) { return; From 6cf3732b9783babdaba5992abdcdcf49d0613cab Mon Sep 17 00:00:00 2001 From: asvitkine Date: Sun, 9 Jul 2023 23:30:09 -0400 Subject: [PATCH 2/2] Clean up import. --- .../main/java/games/strategy/triplea/ui/menubar/ExportMenu.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/game-app/game-headed/src/main/java/games/strategy/triplea/ui/menubar/ExportMenu.java b/game-app/game-headed/src/main/java/games/strategy/triplea/ui/menubar/ExportMenu.java index df377c38a6a..b530acb12df 100644 --- a/game-app/game-headed/src/main/java/games/strategy/triplea/ui/menubar/ExportMenu.java +++ b/game-app/game-headed/src/main/java/games/strategy/triplea/ui/menubar/ExportMenu.java @@ -1,7 +1,5 @@ package games.strategy.triplea.ui.menubar; -import static games.strategy.engine.ClientFileSystemHelper.getUserRootFolder; - import com.google.common.collect.Iterables; import games.strategy.engine.ClientFileSystemHelper; import games.strategy.engine.data.GameData;