summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar modmuss502019-09-08 13:58:46 +0100
committerGravatar modmuss502019-09-08 13:58:46 +0100
commit734e951d9cac1c49a4b09d4a3e70fda64d58fdc8 (patch)
tree554b55305c0833279ece40cf748231a755a929bd
parentCleanup the mappings menu items to use the mappings format enum, will be usef... (diff)
downloadenigma-734e951d9cac1c49a4b09d4a3e70fda64d58fdc8.tar.gz
enigma-734e951d9cac1c49a4b09d4a3e70fda64d58fdc8.tar.xz
enigma-734e951d9cac1c49a4b09d4a3e70fda64d58fdc8.zip
Add a default TinyWriter, formatting/misc fixes
-rw-r--r--src/main/java/cuchaz/enigma/gui/elements/MenuBar.java8
-rw-r--r--src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java2
-rw-r--r--src/main/java/cuchaz/enigma/translation/mapping/serde/TinyMappingsWriter.java3
-rw-r--r--src/main/java/cuchaz/enigma/utils/Utils.java2
4 files changed, 9 insertions, 6 deletions
diff --git a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
index 45daaca6..2e10bfb5 100644
--- a/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
+++ b/src/main/java/cuchaz/enigma/gui/elements/MenuBar.java
@@ -62,8 +62,8 @@ public class MenuBar extends JMenuBar {
62 menu.add(openMenu); 62 menu.add(openMenu);
63 { 63 {
64 openMappingsMenus = new ArrayList<>(); 64 openMappingsMenus = new ArrayList<>();
65 for(MappingFormat format : MappingFormat.values()){ 65 for (MappingFormat format : MappingFormat.values()) {
66 if(format.getReader() != null){ 66 if (format.getReader() != null) {
67 JMenuItem item = new JMenuItem(Utils.caplisiseCamelCase(format.name())); 67 JMenuItem item = new JMenuItem(Utils.caplisiseCamelCase(format.name()));
68 openMenu.add(item); 68 openMenu.add(item);
69 item.addActionListener(event -> { 69 item.addActionListener(event -> {
@@ -89,8 +89,8 @@ public class MenuBar extends JMenuBar {
89 menu.add(saveMenu); 89 menu.add(saveMenu);
90 { 90 {
91 saveMappingsMenus = new ArrayList<>(); 91 saveMappingsMenus = new ArrayList<>();
92 for(MappingFormat format : MappingFormat.values()){ 92 for (MappingFormat format : MappingFormat.values()) {
93 if(format.getWriter() != null){ 93 if (format.getWriter() != null) {
94 JMenuItem item = new JMenuItem(Utils.caplisiseCamelCase(format.name())); 94 JMenuItem item = new JMenuItem(Utils.caplisiseCamelCase(format.name()));
95 saveMenu.add(item); 95 saveMenu.add(item);
96 item.addActionListener(event -> { 96 item.addActionListener(event -> {
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java b/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java
index 4799589e..30688931 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java
+++ b/src/main/java/cuchaz/enigma/translation/mapping/serde/MappingFormat.java
@@ -14,7 +14,7 @@ import java.nio.file.Path;
14public enum MappingFormat { 14public enum MappingFormat {
15 ENIGMA_FILE(EnigmaMappingsWriter.FILE, EnigmaMappingsReader.FILE), 15 ENIGMA_FILE(EnigmaMappingsWriter.FILE, EnigmaMappingsReader.FILE),
16 ENIGMA_DIRECTORY(EnigmaMappingsWriter.DIRECTORY, EnigmaMappingsReader.DIRECTORY), 16 ENIGMA_DIRECTORY(EnigmaMappingsWriter.DIRECTORY, EnigmaMappingsReader.DIRECTORY),
17 TINY_FILE(null, TinyMappingsReader.INSTANCE), 17 TINY_FILE(TinyMappingsWriter.INSTANCE, TinyMappingsReader.INSTANCE),
18 SRG_FILE(SrgMappingsWriter.INSTANCE, null); 18 SRG_FILE(SrgMappingsWriter.INSTANCE, null);
19 19
20 private final MappingsWriter writer; 20 private final MappingsWriter writer;
diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/TinyMappingsWriter.java b/src/main/java/cuchaz/enigma/translation/mapping/serde/TinyMappingsWriter.java
index ee656908..c82f2623 100644
--- a/src/main/java/cuchaz/enigma/translation/mapping/serde/TinyMappingsWriter.java
+++ b/src/main/java/cuchaz/enigma/translation/mapping/serde/TinyMappingsWriter.java
@@ -30,6 +30,9 @@ public class TinyMappingsWriter implements MappingsWriter {
30 private static final String VERSION_CONSTANT = "v1"; 30 private static final String VERSION_CONSTANT = "v1";
31 private static final Joiner TAB_JOINER = Joiner.on('\t'); 31 private static final Joiner TAB_JOINER = Joiner.on('\t');
32 32
33 //Possibly add a gui or a way to select the namespaces when exporting from the gui
34 public static final TinyMappingsWriter INSTANCE = new TinyMappingsWriter("intermediary", "named");
35
33 // HACK: as of enigma 0.13.1, some fields seem to appear duplicated? 36 // HACK: as of enigma 0.13.1, some fields seem to appear duplicated?
34 private final Set<String> writtenLines = new HashSet<>(); 37 private final Set<String> writtenLines = new HashSet<>();
35 private final String nameObf; 38 private final String nameObf;
diff --git a/src/main/java/cuchaz/enigma/utils/Utils.java b/src/main/java/cuchaz/enigma/utils/Utils.java
index 1134c2a8..343c8276 100644
--- a/src/main/java/cuchaz/enigma/utils/Utils.java
+++ b/src/main/java/cuchaz/enigma/utils/Utils.java
@@ -111,7 +111,7 @@ public class Utils {
111 public static String caplisiseCamelCase(String input){ 111 public static String caplisiseCamelCase(String input){
112 StringJoiner stringJoiner = new StringJoiner(" "); 112 StringJoiner stringJoiner = new StringJoiner(" ");
113 for(String word : input.toLowerCase(Locale.ROOT).split("_")){ 113 for(String word : input.toLowerCase(Locale.ROOT).split("_")){
114 stringJoiner.add(word.substring(0, 1).toUpperCase() + word.substring(1)); 114 stringJoiner.add(word.substring(0, 1).toUpperCase(Locale.ROOT) + word.substring(1));
115 } 115 }
116 return stringJoiner.toString(); 116 return stringJoiner.toString();
117 } 117 }