From eca0ab1bbddcb4b9797d75a8d3d0a05b02336276 Mon Sep 17 00:00:00 2001 From: modmuss Date: Sat, 13 Sep 2025 09:18:47 +0100 Subject: Remove legacy mapping handling (#560) * Remove legacy mapping handling * Minor cleanup * More cleanup--- .../main/java/cuchaz/enigma/gui/GuiController.java | 13 ------ .../src/main/java/cuchaz/enigma/gui/Main.java | 3 -- .../java/cuchaz/enigma/gui/elements/MenuBar.java | 50 +++++----------------- 3 files changed, 10 insertions(+), 56 deletions(-) (limited to 'enigma-swing/src/main/java/cuchaz') diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java index 1853a9f..a2b3bd9 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/GuiController.java @@ -31,7 +31,6 @@ import javax.swing.JFrame; import javax.swing.JOptionPane; import javax.swing.SwingUtilities; -import org.jetbrains.annotations.ApiStatus; import org.jetbrains.annotations.Nullable; import cuchaz.enigma.Enigma; @@ -172,12 +171,6 @@ public class GuiController implements ClientPacketHandler, GuiView, DataInvalida this.gui.onCloseJar(); } - @ApiStatus.Internal - public CompletableFuture openMappings(MappingFormat format, Path path, boolean useMappingIo) { - System.getProperties().setProperty("enigma.use_mappingio", useMappingIo ? "true" : "false"); - return openMappings(format, path); - } - public CompletableFuture openMappings(MappingFormat format, Path path) { if (project == null) { return CompletableFuture.completedFuture(null); @@ -220,12 +213,6 @@ public class GuiController implements ClientPacketHandler, GuiView, DataInvalida return saveMappings(path, loadedMappingFormat); } - @ApiStatus.Internal - public CompletableFuture saveMappings(Path path, MappingFormat format, boolean useMappingIo) { - System.getProperties().setProperty("enigma.use_mappingio", useMappingIo ? "true" : "false"); - return saveMappings(path, format); - } - /** * Saves the mappings, with a dialog popping up, showing the progress. * diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/Main.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/Main.java index b9ad19e..0ed500e 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/Main.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/Main.java @@ -18,7 +18,6 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.EnumSet; import java.util.List; -import java.util.Locale; import java.util.Set; import joptsimple.OptionException; @@ -148,8 +147,6 @@ public class Main { if (Files.isDirectory(mappingsPath)) { controller.openMappings(MappingFormat.ENIGMA_DIRECTORY, mappingsPath); - } else if (mappingsPath.getFileName().toString().toLowerCase(Locale.ROOT).endsWith(".zip")) { - controller.openMappings(MappingFormat.ENIGMA_ZIP, mappingsPath); } else { controller.openMappings(MappingFormat.ENIGMA_FILE, mappingsPath); } diff --git a/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java index 02fa9e3..e891786 100644 --- a/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java +++ b/enigma-swing/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java @@ -405,28 +405,13 @@ public class MenuBar { } private static void prepareOpenMappingsMenu(JMenu openMappingsMenu, Gui gui) { - // Mapping-IO readers - for (MappingFormat format : MappingFormat.values()) { - if (format.getMappingIoCounterpart() != null) { - addOpenMappingsMenuEntry(I18n.translate("mapping_format." + format.name().toLowerCase(Locale.ROOT)), - format, true, openMappingsMenu, gui); - } - } - - openMappingsMenu.addSeparator(); - - // Enigma's own readers - String legacySuffix = " (" + I18n.translate("legacy") + ")"; - - for (MappingFormat format : MappingFormat.values()) { - if (format.getReader() != null) { - addOpenMappingsMenuEntry(I18n.translate("mapping_format." + format.name().toLowerCase(Locale.ROOT)) + legacySuffix, - format, false, openMappingsMenu, gui); - } + for (MappingFormat format : MappingFormat.getReadableFormats()) { + addOpenMappingsMenuEntry(I18n.translate("mapping_format." + format.name().toLowerCase(Locale.ROOT)), + format, openMappingsMenu, gui); } } - private static void addOpenMappingsMenuEntry(String text, MappingFormat format, boolean mappingIo, JMenu openMappingsMenu, Gui gui) { + private static void addOpenMappingsMenuEntry(String text, MappingFormat format, JMenu openMappingsMenu, Gui gui) { JMenuItem item = new JMenuItem(text); item.addActionListener(event -> { ExtensionFileFilter.setupFileChooser(gui.mappingsFileChooser, format); @@ -434,7 +419,7 @@ public class MenuBar { if (gui.mappingsFileChooser.showOpenDialog(gui.getFrame()) == JFileChooser.APPROVE_OPTION) { File selectedFile = gui.mappingsFileChooser.getSelectedFile(); - gui.getController().openMappings(format, selectedFile.toPath(), mappingIo); + gui.getController().openMappings(format, selectedFile.toPath()); UiConfig.setLastSelectedDir(gui.mappingsFileChooser.getCurrentDirectory().toString()); } }); @@ -442,28 +427,13 @@ public class MenuBar { } private static void prepareSaveMappingsAsMenu(JMenu saveMappingsAsMenu, JMenuItem saveMappingsItem, Gui gui) { - // Mapping-IO writers - for (MappingFormat format : MappingFormat.values()) { - if (format.hasMappingIoWriter()) { - addSaveMappingsAsMenuEntry(I18n.translate("mapping_format." + format.name().toLowerCase(Locale.ROOT)), - format, true, saveMappingsAsMenu, saveMappingsItem, gui); - } - } - - saveMappingsAsMenu.addSeparator(); - - // Enigma's own writers - String legacySuffix = " (" + I18n.translate("legacy") + ")"; - - for (MappingFormat format : MappingFormat.values()) { - if (format.getWriter() != null) { - addSaveMappingsAsMenuEntry(I18n.translate("mapping_format." + format.name().toLowerCase(Locale.ROOT)) + legacySuffix, - format, false, saveMappingsAsMenu, saveMappingsItem, gui); - } + for (MappingFormat format : MappingFormat.getWritableFormats()) { + addSaveMappingsAsMenuEntry(I18n.translate("mapping_format." + format.name().toLowerCase(Locale.ROOT)), + format, saveMappingsAsMenu, saveMappingsItem, gui); } } - private static void addSaveMappingsAsMenuEntry(String text, MappingFormat format, boolean mappingIo, JMenu saveMappingsAsMenu, JMenuItem saveMappingsItem, Gui gui) { + private static void addSaveMappingsAsMenuEntry(String text, MappingFormat format, JMenu saveMappingsAsMenu, JMenuItem saveMappingsItem, Gui gui) { JMenuItem item = new JMenuItem(text); item.addActionListener(event -> { JFileChooser fileChooser = gui.mappingsFileChooser; @@ -475,7 +445,7 @@ public class MenuBar { if (fileChooser.showSaveDialog(gui.getFrame()) == JFileChooser.APPROVE_OPTION) { Path savePath = ExtensionFileFilter.getSavePath(fileChooser); - gui.getController().saveMappings(savePath, format, mappingIo); + gui.getController().saveMappings(savePath, format); saveMappingsItem.setEnabled(true); UiConfig.setLastSelectedDir(fileChooser.getCurrentDirectory().toString()); } -- cgit v1.2.3