From 2e5680a9fea5a18438af0bca0bba88e0a48cef4d Mon Sep 17 00:00:00 2001 From: Juuxel Date: Thu, 24 Jan 2019 20:37:30 +0200 Subject: Standardize mapping line endings to LF (#100) --- .../translation/mapping/serde/EnigmaMappingsWriter.java | 5 +++-- .../translation/mapping/serde/SrgMappingsWriter.java | 3 ++- src/main/java/cuchaz/enigma/utils/LFPrintWriter.java | 16 ++++++++++++++++ 3 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 src/main/java/cuchaz/enigma/utils/LFPrintWriter.java diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/EnigmaMappingsWriter.java b/src/main/java/cuchaz/enigma/translation/mapping/serde/EnigmaMappingsWriter.java index 3eef7390..5acb1da2 100644 --- a/src/main/java/cuchaz/enigma/translation/mapping/serde/EnigmaMappingsWriter.java +++ b/src/main/java/cuchaz/enigma/translation/mapping/serde/EnigmaMappingsWriter.java @@ -21,6 +21,7 @@ import cuchaz.enigma.translation.mapping.VoidEntryResolver; import cuchaz.enigma.translation.mapping.tree.EntryTree; import cuchaz.enigma.translation.mapping.tree.EntryTreeNode; import cuchaz.enigma.translation.representation.entry.*; +import cuchaz.enigma.utils.LFPrintWriter; import java.io.IOException; import java.io.PrintWriter; @@ -45,7 +46,7 @@ public enum EnigmaMappingsWriter implements MappingsWriter { progress.init(classes.size(), "Writing classes"); int steps = 0; - try (PrintWriter writer = new PrintWriter(Files.newBufferedWriter(path))) { + try (PrintWriter writer = new LFPrintWriter(Files.newBufferedWriter(path))) { for (ClassEntry classEntry : classes) { progress.step(steps++, classEntry.getFullName()); writeRoot(writer, mappings, classEntry); @@ -78,7 +79,7 @@ public enum EnigmaMappingsWriter implements MappingsWriter { Files.deleteIfExists(classPath); Files.createDirectories(classPath.getParent()); - try (PrintWriter writer = new PrintWriter(Files.newBufferedWriter(classPath))) { + try (PrintWriter writer = new LFPrintWriter(Files.newBufferedWriter(classPath))) { writeRoot(writer, mappings, classEntry); } } catch (Throwable t) { diff --git a/src/main/java/cuchaz/enigma/translation/mapping/serde/SrgMappingsWriter.java b/src/main/java/cuchaz/enigma/translation/mapping/serde/SrgMappingsWriter.java index 15ba4d75..5ff91413 100644 --- a/src/main/java/cuchaz/enigma/translation/mapping/serde/SrgMappingsWriter.java +++ b/src/main/java/cuchaz/enigma/translation/mapping/serde/SrgMappingsWriter.java @@ -13,6 +13,7 @@ import cuchaz.enigma.translation.representation.entry.ClassEntry; import cuchaz.enigma.translation.representation.entry.Entry; import cuchaz.enigma.translation.representation.entry.FieldEntry; import cuchaz.enigma.translation.representation.entry.MethodEntry; +import cuchaz.enigma.utils.LFPrintWriter; import java.io.IOException; import java.io.PrintWriter; @@ -52,7 +53,7 @@ public enum SrgMappingsWriter implements MappingsWriter { } progress.init(3, "Writing mappings"); - try (PrintWriter writer = new PrintWriter(Files.newBufferedWriter(path))) { + try (PrintWriter writer = new LFPrintWriter(Files.newBufferedWriter(path))) { progress.step(0, "Classes"); classLines.forEach(writer::println); progress.step(1, "Fields"); diff --git a/src/main/java/cuchaz/enigma/utils/LFPrintWriter.java b/src/main/java/cuchaz/enigma/utils/LFPrintWriter.java new file mode 100644 index 00000000..c12e9134 --- /dev/null +++ b/src/main/java/cuchaz/enigma/utils/LFPrintWriter.java @@ -0,0 +1,16 @@ +package cuchaz.enigma.utils; + +import java.io.PrintWriter; +import java.io.Writer; + +public class LFPrintWriter extends PrintWriter { + public LFPrintWriter(Writer out) { + super(out); + } + + @Override + public void println() { + // https://stackoverflow.com/a/14749004 + write('\n'); + } +} -- cgit v1.2.3