Attachment 30783 Details for Bug 115395 – Patch to IStreamMerger

[patch] Patch to IStreamMerger

org.eclipse.compare.patch115395.txt (text/plain), 1.61 KB, created by Michael Valenta

on 2005-11-29 12:10:24 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Valenta

Created: 2005-11-29 12:10:24 EST

Size: 1.61 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.compare
>Index: compare/org/eclipse/compare/internal/merge/TextStreamMerger.java
>===================================================================
>RCS file: /cvsroot/eclipse/org.eclipse.compare/compare/org/eclipse/compare/internal/merge/TextStreamMerger.java,v
>retrieving revision 1.5
>diff -u -r1.5 TextStreamMerger.java
>--- compare/org/eclipse/compare/internal/merge/TextStreamMerger.java	14 Apr 2005 13:53:03 -0000	1.5
>+++ compare/org/eclipse/compare/internal/merge/TextStreamMerger.java	29 Nov 2005 17:08:15 -0000
>@@ -53,7 +53,7 @@
>         }
> 
>         try {
>-            char lineSeparator= '\n';
>+            String lineSeparator= System.getProperty("line.separator");
>             
>             RangeDifference[] diffs = RangeDifferencer.findRanges(monitor, a, t, o);
> 
>@@ -66,7 +66,7 @@
>                     for (int j = rd.rightStart(); j < rd.rightEnd(); j++) {
>                         String s= o.getLine(j);
>                         output.write(s.getBytes(outputEncoding));
>-                        output.write(lineSeparator);
>+                        output.write(lineSeparator.getBytes(outputEncoding));
>                     }
>                     break;
> 
>@@ -74,7 +74,7 @@
>                     for (int j = rd.leftStart(); j < rd.leftEnd(); j++) {
>                         String s= t.getLine(j);
>                         output.write(s.getBytes(outputEncoding));
>-                        output.write(lineSeparator);
>+                        output.write(lineSeparator.getBytes(outputEncoding));
>                     }
>                     break;
>

Actions: View | Diff

Attachments on bug 115395: 30783