Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Vogel2018-06-29 06:36:34 -0400
committerLars Vogel2018-07-02 06:46:00 -0400
commit6064ae7701b0205377806a5a04d357c51c1d063b (patch)
tree70c4a48c665377630ccfff57c0e3dfc3cf9b987c
parentb43bdd20e2065dd2c9a1989e4dc442d9627181ab (diff)
downloadeclipse.platform.team-6064ae7701b0205377806a5a04d357c51c1d063b.tar.gz
eclipse.platform.team-6064ae7701b0205377806a5a04d357c51c1d063b.tar.xz
eclipse.platform.team-6064ae7701b0205377806a5a04d357c51c1d063b.zip
Removes support for dead Platform.WS_CARBON
Change-Id: If17db1d03335611f6438b7b6e5d3c57a976ae478 Signed-off-by: Lars Vogel <Lars.Vogel@vogella.com>
-rw-r--r--bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/LineReader.java2
-rw-r--r--bundles/org.eclipse.compare.core/src/org/eclipse/compare/internal/core/patch/PatchReader.java2
-rw-r--r--bundles/org.eclipse.compare/compare/org/eclipse/compare/internal/patch/LineReader.java4
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;
}

Back to the top