diff --git a/src/magic/firemind/FiremindDuelRunner.java b/src/magic/firemind/FiremindDuelRunner.java index fe3cb6db9f..14ad5208c7 100644 --- a/src/magic/firemind/FiremindDuelRunner.java +++ b/src/magic/firemind/FiremindDuelRunner.java @@ -145,7 +145,7 @@ public class FiremindDuelRunner { private static String saveDeckFile(String name, String content) { try { - File deckFile = DeckUtils.getDecksFolder().resolve(name + ".dec").toFile(); + File deckFile = DeckUtils.getDecksFolder().resolve(name + DeckUtils.DECK_EXTENSION).toFile(); deckFile.createNewFile(); Writer fw = Files.newBufferedWriter(deckFile.getAbsoluteFile().toPath(), UTF_8); BufferedWriter bw = new BufferedWriter(fw); diff --git a/src/magic/firemind/FiremindJsonReader.java b/src/magic/firemind/FiremindJsonReader.java index 0aac1ac1b3..9a3b7e1b9e 100644 --- a/src/magic/firemind/FiremindJsonReader.java +++ b/src/magic/firemind/FiremindJsonReader.java @@ -92,7 +92,7 @@ public final class FiremindJsonReader { for (MagicDeck deck : decks) { String validFilename = deck.getFilename().replaceAll("[^A-Za-z0-9' \\.\\-]", "_"); - String decFilename = firemindDecksPath.resolve(validFilename + ".dec").toString(); + String decFilename = firemindDecksPath.resolve(validFilename + DeckUtils.DECK_EXTENSION).toString(); try { DeckUtils.saveDeck(decFilename, deck); } catch (Exception ex) { diff --git a/src/magic/ui/ImportWorker.java b/src/magic/ui/ImportWorker.java index a852ef2db1..3972c0318b 100644 --- a/src/magic/ui/ImportWorker.java +++ b/src/magic/ui/ImportWorker.java @@ -27,6 +27,7 @@ import magic.data.GeneralConfig; import magic.model.MagicLogger; import magic.model.player.PlayerProfiles; import magic.translate.MText; +import magic.utility.DeckUtils; import magic.utility.FileIO; import magic.utility.MagicFileSystem; @@ -285,7 +286,7 @@ public class ImportWorker extends SwingWorker { final Path sourcePath = importDataPath.resolve(directoryName); if (sourcePath.toFile().exists()) { final Path targetPath = MagicFileSystem.getDataPath().resolve(directoryName); - final IOFileFilter deckSuffixFilter = FileFilterUtils.suffixFileFilter(".dec"); + final IOFileFilter deckSuffixFilter = FileFilterUtils.suffixFileFilter(DeckUtils.DECK_EXTENSION); FileUtils.copyDirectory(sourcePath.toFile(), targetPath.toFile(), deckSuffixFilter); } setProgressNote(OK_STRING); diff --git a/src/magic/ui/widget/deck/DeckPicker.java b/src/magic/ui/widget/deck/DeckPicker.java index 8ea1be81f5..d542a0eb41 100644 --- a/src/magic/ui/widget/deck/DeckPicker.java +++ b/src/magic/ui/widget/deck/DeckPicker.java @@ -271,11 +271,11 @@ public class DeckPicker extends JPanel { private Path getDeckPath(final String deckName, final DeckType deckType) { switch (deckType) { case Preconstructed: - return DeckUtils.getPrebuiltDecksFolder().resolve(deckName + ".dec"); + return DeckUtils.getPrebuiltDecksFolder().resolve(deckName + DeckUtils.DECK_EXTENSION); case Custom: - return DeckUtils.getDecksFolder().resolve(deckName + ".dec"); + return DeckUtils.getDecksFolder().resolve(deckName + DeckUtils.DECK_EXTENSION); case Firemind: - return DeckUtils.getDecksFolder().resolve("firemind").resolve(deckName + ".dec"); + return DeckUtils.getDecksFolder().resolve("firemind").resolve(deckName + DeckUtils.DECK_EXTENSION); default: throw new RuntimeException("getDeckPath() not implemented for decktype: " + deckType); } diff --git a/src/magic/utility/DeckUtils.java b/src/magic/utility/DeckUtils.java index 53948b03b8..493da92964 100644 --- a/src/magic/utility/DeckUtils.java +++ b/src/magic/utility/DeckUtils.java @@ -156,7 +156,7 @@ public class DeckUtils { public static long getDeckFileChecksum(String name, DeckType deckType) { Path deckPath = DeckType.getDeckFolder(deckType); - Path deckFile = deckPath.resolve(name + ".dec"); + Path deckFile = deckPath.resolve(name + DECK_EXTENSION); return deckFile.toFile().exists() ? getDeckFileChecksum(deckFile) : -1; } @@ -207,7 +207,7 @@ public class DeckUtils { public static MagicDeck loadDeckFromFile(String name, DeckType deckType) { Path deckPath = DeckType.getDeckFolder(deckType); - return loadDeckFromFile(deckPath.resolve(name + ".dec")); + return loadDeckFromFile(deckPath.resolve(name + DECK_EXTENSION)); } public static void loadAndSetPlayerDeck(final String filename, final DuelPlayerConfig player) { @@ -360,7 +360,7 @@ public class DeckUtils { public static Path getDeckPath(MagicDeck deck) { Path deckPath = DeckType.getDeckFolder(deck.getDeckType()); - return deckPath.resolve(deck.getName() + ".dec"); + return deckPath.resolve(deck.getName() + DECK_EXTENSION); } static Path getPlayerDecksFolder() { @@ -377,7 +377,7 @@ public class DeckUtils { * Returns string as {@code filename}.dec */ public static String getNormalizedFilename(String filename) { - return filename.endsWith(".dec") ? filename : filename + ".dec"; + return filename.endsWith(DECK_EXTENSION) ? filename : filename + DECK_EXTENSION; } /**