diff options
3 files changed, 5 insertions, 10 deletions
diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/LineReader.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/LineReader.java index b4e98370d..7cf392b75 100644 --- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/LineReader.java +++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/LineReader.java @@ -53,6 +53,7 @@ public class LineReader { public static List<String> readLines(BufferedReader reader) { List<String> lines; LineReader lr= new LineReader(reader); + lr.ignoreSingleCR(); // Don't treat single CRs as line feeds to be consistent with command line patch lines= lr.readLines(); return lines; } diff --git a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java index c56b99ff4..a9021afd4 100644 --- a/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java +++ b/bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java @@ -89,7 +89,7 @@ public class PatchReader { this.fIsGitPatch = false; LineReader lr= new LineReader(reader); - + lr.ignoreSingleCR(); // Don't treat single CRs as line feeds to be consistent with command line patch // Test for our format line= lr.readLine(); if (line != null && line.startsWith(PatchReader.MULTIPROJECTPATCH_HEADER)) { diff --git a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/LineReader.java b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/LineReader.java index 9784601e1..8d0432e46 100644 --- a/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/LineReader.java +++ b/bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/LineReader.java @@ -11,15 +11,8 @@ *******************************************************************************/ package org.eclipse.compare.internal.patch; -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.io.UnsupportedEncodingException; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +import java.io.*; +import java.util.*; import org.eclipse.compare.internal.CompareUIPlugin; import org.eclipse.core.resources.IFile; @@ -79,6 +72,7 @@ public class LineReader { public static List<String> readLines(BufferedReader reader) { List<String> lines; LineReader lr = new LineReader(reader); + lr.ignoreSingleCR(); // Don't treat single CRs as line feeds to be consistent with command line patch lines = lr.readLines(); return lines; } |