Fixes java-decompiler#17, Option for Line Endings

waifei · May 23, 2015 · 587ed2d · 587ed2d
1 parent c27f934
commit 587ed2d
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 2 deletions.
diff --git a/services/src/main/groovy/jd/gui/view/component/ClassFilePage.groovy b/services/src/main/groovy/jd/gui/view/component/ClassFilePage.groovy
@@ -17,6 +17,7 @@ import jd.gui.api.model.Indexes
 import jd.gui.util.decompiler.ClassFileSourcePrinter
 import jd.gui.util.decompiler.ContainerLoader
 import jd.gui.util.decompiler.GuiPreferences
+import jd.gui.util.io.NewlineOutputStream
 import org.fife.ui.rsyntaxtextarea.DocumentRange
 import org.fife.ui.rsyntaxtextarea.SyntaxConstants
 
@@ -156,7 +157,7 @@ class ClassFilePage
     }
 
     void save(API api, OutputStream os) {
-        os.withWriter('UTF-8') {
+        new NewlineOutputStream(os).withWriter('UTF-8') {
             it.write(textArea.text)
         }
     }

diff --git a/services/src/main/java/jd/gui/service/sourcesaver/ClassFileSourceSaverProvider.java b/services/src/main/java/jd/gui/service/sourcesaver/ClassFileSourceSaverProvider.java
@@ -15,6 +15,7 @@
 import jd.gui.util.decompiler.GuiPreferences;
 import jd.gui.spi.SourceSaver;
 import jd.gui.util.decompiler.PlainTextPrinter;
+import jd.gui.util.io.NewlineOutputStream;
 
 import java.io.*;
 import java.nio.charset.Charset;
@@ -111,7 +112,7 @@ public void save(API api, Controller controller, Listener listener, Path path, C
                 ps.print("\n */");
             }
 
-            try (OutputStream os = Files.newOutputStream(path)) {
+            try (OutputStream os = new NewlineOutputStream(Files.newOutputStream(path))) {
                 baos.writeTo(os);
             } catch (IOException ignore) {
             }

diff --git a/services/src/main/java/jd/gui/util/io/NewlineOutputStream.java b/services/src/main/java/jd/gui/util/io/NewlineOutputStream.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2008-2015 Emmanuel Dupuy
+ * This program is made available under the terms of the GPLv3 License.
+ */
+
+package jd.gui.util.io;
+
+import java.io.FilterOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.nio.charset.Charset;
+
+public class NewlineOutputStream extends FilterOutputStream {
+    private static byte[] lineSeparator;
+
+    public NewlineOutputStream(OutputStream os) {
+        super(os);
+
+        if (lineSeparator == null) {
+            String s = System.getProperty("line.separator");
+
+            if ((s == null) || (s.length() <= 0))
+                s = "\n";
+
+            lineSeparator = s.getBytes(Charset.forName("UTF-8"));
+        }
+    }
+
+    public void write(int b) throws IOException {
+        if (b == '\n') {
+            out.write(lineSeparator);
+        } else {
+            out.write(b);
+        }
+    }
+
+    public void write(byte b[]) throws IOException {
+        write(b, 0, b.length);
+    }
+
+    public void write(byte b[], int off, int len) throws IOException {
+        int i;
+
+        for (i=off; i<len; i++) {
+            if (b[i] == '\n') {
+                out.write(b, off, i-off);
+                out.write(lineSeparator);
+                off = i+1;
+            }
+        }
+
+        out.write(b, off, i-off);
+    }
+}