diff options
| author | Tomasz Zarna <Tomasz.Zarna@pl.ibm.com> | 2012-03-05 12:59:10 +0100 |
|---|---|---|
| committer | Tomasz Zarna <Tomasz.Zarna@pl.ibm.com> | 2012-03-05 12:59:10 +0100 |
| commit | eedd77a97b3eb5c404ac8464ea3a59498a121c72 (patch) | |
| tree | 8add079921b41aae8b58197fe5a10030cc92198f | |
| parent | c71fff4ce2dcd0667d5b1e470f9c34042f0a2cf4 (diff) | |
| download | jgit-eedd77a97b3eb5c404ac8464ea3a59498a121c72.tar.gz jgit-eedd77a97b3eb5c404ac8464ea3a59498a121c72.zip | |
RawText#getEOL() does the same thing as RawText#getLineDelimiter()
The duplication has been introduced when merging
I08e1369e142bb19f42a8d7bbb5a7d062cc8533fc and
I18adc63596f4657516ccc6d704a561924c79d445. The former should have been
manually rebased. It also missed a copyright update in ApplyCommandTest.
Change-Id: I18fe6108220f964524fb16b719604222aa7abee6
3 files changed, 2 insertions, 21 deletions
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 dceb0ec697..16c0a9b447 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 <Tomasz.Zarna@pl.ibm.com> + * 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 bd489a99aa..61ed412f4e 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<ApplyResult> { 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 ddb00d1a47..f0bf5c6305 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 <code>null</code> - */ - 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; - } - } |