diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ApplyCommandTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ApplyCommandTest.java index dceb0ec69..16c0a9b44 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ApplyCommandTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/api/ApplyCommandTest.java @@ -1,5 +1,5 @@ /* - * Copyright (C) 2011, 2012, Tomasz Zarna + * Copyright (C) 2011, 2012, IBM Corporation and others. * and other copyright owners as documented in the project's IP log. * * This program and the accompanying materials are made available diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/ApplyCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/ApplyCommand.java index bd489a99a..61ed412f4 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/ApplyCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/ApplyCommand.java @@ -228,7 +228,7 @@ public class ApplyCommand extends GitCommand { StringBuilder sb = new StringBuilder(); final String eol = rt.size() == 0 || (rt.size() == 1 && rt.isMissingNewlineAtEnd()) ? "\n" : rt - .getEOL(); + .getLineDelimiter(); for (String l : newLines) { sb.append(l); if (eol != null) diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java b/org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java index ddb00d1a4..f0bf5c630 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java @@ -294,23 +294,4 @@ public class RawText extends Sequence { else return "\n"; } - - /** - * Get the EOL chars for the first line. - * - * @since 2.0 - * @return the EOL chars or null - */ - public String getEOL() { - int e = getEnd(0); - if (content.length > 1 && content[e - 2] == '\r' - && content[e - 1] == '\n') - return "\r\n"; - if (content.length > 0 && content[e - 1] == '\n') - return "\n"; - if (content.length > 0 && content[e - 1] == '\r') - return "\r"; - return null; - } - }