diff options
3 files changed, 0 insertions, 8 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 35f32c666..2b8cb1dce 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 @@ -56,8 +56,6 @@ public class LineReader { public static List<String> readLines(BufferedReader reader) { List<String> lines; LineReader lr= new LineReader(reader); - if (!Platform.WS_CARBON.equals(Platform.getWS())) - 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 05a617aef..c95ea7448 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 @@ -98,8 +98,6 @@ public class PatchReader { this.fIsGitPatch = false; LineReader lr= new LineReader(reader); - if (!Platform.WS_CARBON.equals(Platform.getWS())) - lr.ignoreSingleCR(); // Don't treat single CRs as line feeds to be consistent with command line patch // Test for our format line= lr.readLine(); 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 1e1348894..9784601e1 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 @@ -26,7 +26,6 @@ import org.eclipse.core.resources.IFile; import org.eclipse.core.resources.IStorage; import org.eclipse.core.runtime.Assert; import org.eclipse.core.runtime.CoreException; -import org.eclipse.core.runtime.Platform; public class LineReader { /** @@ -80,9 +79,6 @@ public class LineReader { public static List<String> readLines(BufferedReader reader) { List<String> lines; LineReader lr = new LineReader(reader); - if (!Platform.WS_CARBON.equals(Platform.getWS())) - // Don't treat single CRs as line feeds to be consistent with command line patch - lr.ignoreSingleCR(); lines = lr.readLines(); return lines; } |