From 734e951d9cac1c49a4b09d4a3e70fda64d58fdc8 Mon Sep 17 00:00:00 2001
From: modmuss50
Date: Sun, 8 Sep 2019 13:58:46 +0100
Subject: Add a default TinyWriter, formatting/misc fixes

---
 src/main/java/cuchaz/enigma/gui/elements/MenuBar.java             | 8 ++++----
 .../cuchaz/enigma/translation/mapping/serde/MappingFormat.java    | 2 +-
 .../enigma/translation/mapping/serde/TinyMappingsWriter.java      | 3 +++
 src/main/java/cuchaz/enigma/utils/Utils.java                      | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

(limited to 'src/main')

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 {
 			menu.add(openMenu);
 			{
 				openMappingsMenus = new ArrayList<>();
-				for(MappingFormat format : MappingFormat.values()){
-					if(format.getReader() != null){
+				for (MappingFormat format : MappingFormat.values()) {
+					if (format.getReader() != null) {
 						JMenuItem item = new JMenuItem(Utils.caplisiseCamelCase(format.name()));
 						openMenu.add(item);
 						item.addActionListener(event -> {
@@ -89,8 +89,8 @@ public class MenuBar extends JMenuBar {
 			menu.add(saveMenu);
 			{
 				saveMappingsMenus = new ArrayList<>();
-				for(MappingFormat format : MappingFormat.values()){
-					if(format.getWriter() != null){
+				for (MappingFormat format : MappingFormat.values()) {
+					if (format.getWriter() != null) {
 						JMenuItem item = new JMenuItem(Utils.caplisiseCamelCase(format.name()));
 						saveMenu.add(item);
 						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;
 public enum MappingFormat {
 	ENIGMA_FILE(EnigmaMappingsWriter.FILE, EnigmaMappingsReader.FILE),
 	ENIGMA_DIRECTORY(EnigmaMappingsWriter.DIRECTORY, EnigmaMappingsReader.DIRECTORY),
-	TINY_FILE(null, TinyMappingsReader.INSTANCE),
+	TINY_FILE(TinyMappingsWriter.INSTANCE, TinyMappingsReader.INSTANCE),
 	SRG_FILE(SrgMappingsWriter.INSTANCE, null);
 
 	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 {
     private static final String VERSION_CONSTANT = "v1";
     private static final Joiner TAB_JOINER = Joiner.on('\t');
 
+    //Possibly add a gui or a way to select the namespaces when exporting from the gui
+    public static final TinyMappingsWriter INSTANCE = new TinyMappingsWriter("intermediary", "named");
+
     // HACK: as of enigma 0.13.1, some fields seem to appear duplicated?
     private final Set<String> writtenLines = new HashSet<>();
     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 {
 	public static String caplisiseCamelCase(String input){
 		StringJoiner stringJoiner = new StringJoiner(" ");
 		for(String word : input.toLowerCase(Locale.ROOT).split("_")){
-			stringJoiner.add(word.substring(0, 1).toUpperCase() + word.substring(1));
+			stringJoiner.add(word.substring(0, 1).toUpperCase(Locale.ROOT) + word.substring(1));
 		}
 		return stringJoiner.toString();
 	}
-- 
cgit v1.2.3