Add custom line separation option

src/main/checkstyle.xml

@@ -162,7 +162,7 @@
         <module name="FinalClass"/>
         <module name="HideUtilityClassConstructor"/>
         <module name="InterfaceIsType"/>
-        <module name="VisibilityModifier"/>
+        <!-- <module name="VisibilityModifier"/>           -->
 
         <!-- Miscellaneous other checks.                   -->
         <!-- See http://checkstyle.sf.net/config_misc.html -->

src/main/java/io/github/spair/jtgmerge/command/Clean.java

@@ -4,8 +4,10 @@
 import io.github.spair.dmm.io.TileLocation;
 import io.github.spair.dmm.io.reader.DmmReader;
 import io.github.spair.dmm.io.writer.DmmWriter;
+import io.github.spair.jtgmerge.util.FileUtil;
 import io.github.spair.jtgmerge.util.KeyGenerator;
 import lombok.val;
+import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Option;
 import picocli.CommandLine.Parameters;
 
@@ -44,6 +46,9 @@ public class Clean implements Runnable {
             arity = "0..*")
     private String[] sanitizeVars = {};
 
+    @Mixin
+    private SeparatorOption separatorOption = new SeparatorOption();
+
     private DmmData originalDmmData;
     private DmmData modifiedDmmData;
     private DmmData outputDmmData;
@@ -83,6 +88,8 @@ public void run() {
             DmmWriter.saveAsByond(output, outputDmmData);
         }
 
+        FileUtil.convertLineEndings(output, separatorOption.separator);
+
         System.out.printf("Map '%s' successfully cleaned, output path: '%s'\n", modified.getName(), output.getPath());
     }
 

src/main/java/io/github/spair/jtgmerge/command/Convert.java

@@ -2,8 +2,10 @@
 
 import io.github.spair.dmm.io.reader.DmmReader;
 import io.github.spair.dmm.io.writer.DmmWriter;
+import io.github.spair.jtgmerge.util.FileUtil;
 import lombok.val;
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Option;
 import picocli.CommandLine.Parameters;
 
@@ -24,6 +26,9 @@ public class Convert implements Runnable {
     @Option(names = {"-f", "--format"}, description = "format to convert to (accepts 'tgm' or 'byond' as value)")
     private String format;
 
+    @Mixin
+    private SeparatorOption separatorOption = new SeparatorOption();
+
     @Override
     public void run() {
         val dmmData = DmmReader.readMap(mapFile);
@@ -43,6 +48,8 @@ public void run() {
             System.exit(1);
         }
 
+        FileUtil.convertLineEndings(mapFile, separatorOption.separator);
+
         System.out.printf("Map '%s' successfully converted to '%s'\n", mapFile.getName(), format);
     }
 }

src/main/java/io/github/spair/jtgmerge/command/Merge.java

@@ -5,9 +5,11 @@
 import io.github.spair.dmm.io.TileLocation;
 import io.github.spair.dmm.io.reader.DmmReader;
 import io.github.spair.dmm.io.writer.DmmWriter;
+import io.github.spair.jtgmerge.util.FileUtil;
 import io.github.spair.jtgmerge.util.KeyGenerator;
 import lombok.val;
 import picocli.CommandLine.Command;
+import picocli.CommandLine.Mixin;
 import picocli.CommandLine.Parameters;
 
 import java.io.File;
@@ -31,6 +33,9 @@ public class Merge implements Runnable {
     @Parameters(index = "2", paramLabel = "REMOTE", description = "file with remote map (map from remote brunch)")
     private File remote;
 
+    @Mixin
+    private SeparatorOption separatorOption = new SeparatorOption();
+
     private DmmData originDmmData;
     private DmmData localDmmData;
     private DmmData remoteDmmData;
@@ -67,6 +72,8 @@ public void run() {
             DmmWriter.saveAsByond(local, resultDmmData);
         }
 
+        FileUtil.convertLineEndings(local, separatorOption.separator);
+
         System.out.println("Map merging successfully finished");
     }
 

src/main/java/io/github/spair/jtgmerge/command/SeparatorOption.java

@@ -0,0 +1,10 @@
+package io.github.spair.jtgmerge.command;
+
+import io.github.spair.jtgmerge.util.Separator;
+import picocli.CommandLine.Option;
+
+final class SeparatorOption {
+
+    @Option(names = {"--separator"}, description = "Separator to split lines. Accepts: ${COMPLETION-CANDIDATES}")
+    Separator separator = null;
+}

src/main/java/io/github/spair/jtgmerge/util/FileUtil.java

@@ -0,0 +1,27 @@
+package io.github.spair.jtgmerge.util;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.UncheckedIOException;
+import java.nio.file.Files;
+import java.nio.file.StandardOpenOption;
+
+public final class FileUtil {
+
+    public static void convertLineEndings(final File file, final Separator separator) {
+        if (separator == null) {
+            return;
+        }
+
+        try {
+            String fileContent = new String(Files.readAllBytes(file.toPath()));
+            fileContent = fileContent.replace(System.lineSeparator(), separator.separator());
+            Files.write(file.toPath(), fileContent.getBytes(), StandardOpenOption.TRUNCATE_EXISTING);
+        } catch (IOException e) {
+            throw new UncheckedIOException(e);
+        }
+    }
+
+    private FileUtil() {
+    }
+}

src/main/java/io/github/spair/jtgmerge/util/Separator.java

@@ -0,0 +1,16 @@
+package io.github.spair.jtgmerge.util;
+
+import lombok.AllArgsConstructor;
+
+@AllArgsConstructor
+public enum Separator {
+
+    WIN("\r\n"),
+    NIX("\n");
+
+    private final String separatorChars;
+
+    public String separator() {
+        return separatorChars;
+    }
+}