summaryrefslogtreecommitdiff
path: root/src/main/java/cuchaz/enigma/gui/GuiController.java
diff options
context:
space:
mode:
authorGravatar gegy10002019-06-28 23:13:43 +0200
committerGravatar gegy10002019-06-28 23:13:43 +0200
commite1b780ae6d60bd6a9635f6f1197dc26d2b31e3a8 (patch)
treeaf8afb3822c06d50a9d42fb2500b0ff378c0f973 /src/main/java/cuchaz/enigma/gui/GuiController.java
parentfix inner class handling in TinyMappingsReader (diff)
downloadenigma-fork-e1b780ae6d60bd6a9635f6f1197dc26d2b31e3a8.tar.gz
enigma-fork-e1b780ae6d60bd6a9635f6f1197dc26d2b31e3a8.tar.xz
enigma-fork-e1b780ae6d60bd6a9635f6f1197dc26d2b31e3a8.zip
Profile option for mappings to be saved by-obf instead of by-deobf
Diffstat (limited to 'src/main/java/cuchaz/enigma/gui/GuiController.java')
-rw-r--r--src/main/java/cuchaz/enigma/gui/GuiController.java9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/cuchaz/enigma/gui/GuiController.java b/src/main/java/cuchaz/enigma/gui/GuiController.java
index 092a07e..89fbd10 100644
--- a/src/main/java/cuchaz/enigma/gui/GuiController.java
+++ b/src/main/java/cuchaz/enigma/gui/GuiController.java
@@ -109,7 +109,9 @@ public class GuiController {
109 109
110 return ProgressDialog.runOffThread(gui.getFrame(), progress -> { 110 return ProgressDialog.runOffThread(gui.getFrame(), progress -> {
111 try { 111 try {
112 EntryTree<EntryMapping> mappings = format.read(path, progress); 112 MappingSaveParameters saveParameters = enigma.getProfile().getMappingSaveParameters();
113
114 EntryTree<EntryMapping> mappings = format.read(path, progress, saveParameters);
113 project.setMappings(mappings); 115 project.setMappings(mappings);
114 116
115 loadedMappingFormat = format; 117 loadedMappingFormat = format;
@@ -132,6 +134,7 @@ public class GuiController {
132 134
133 return ProgressDialog.runOffThread(this.gui.getFrame(), progress -> { 135 return ProgressDialog.runOffThread(this.gui.getFrame(), progress -> {
134 EntryRemapper mapper = project.getMapper(); 136 EntryRemapper mapper = project.getMapper();
137 MappingSaveParameters saveParameters = enigma.getProfile().getMappingSaveParameters();
135 138
136 MappingDelta<EntryMapping> delta = mapper.takeMappingDelta(); 139 MappingDelta<EntryMapping> delta = mapper.takeMappingDelta();
137 boolean saveAll = !path.equals(loadedMappingPath); 140 boolean saveAll = !path.equals(loadedMappingPath);
@@ -140,9 +143,9 @@ public class GuiController {
140 loadedMappingPath = path; 143 loadedMappingPath = path;
141 144
142 if (saveAll) { 145 if (saveAll) {
143 format.write(mapper.getObfToDeobf(), path, progress); 146 format.write(mapper.getObfToDeobf(), path, progress, saveParameters);
144 } else { 147 } else {
145 format.write(mapper.getObfToDeobf(), delta, path, progress); 148 format.write(mapper.getObfToDeobf(), delta, path, progress, saveParameters);
146 } 149 }
147 }); 150 });
148 } 151 }