From 3f3b6bfdb37f4f9aac0dbe0c6f3b1513e7ba8e81 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Wed, 13 Oct 2010 20:47:08 -0700 Subject: [PATCH] Remove dead RawText(RawTextComparator) constructor Since the introduction of HashedSequence we no longer need to supply the RawTextComparator at the time of constructing a RawText. Drop the definition from the constructor, because it doesn't make sense as part of our public API. Change-Id: Iaab34611d60eee4a2036830142b089b2dae81842 Signed-off-by: Shawn O. Pearce --- .../jgit/diff/RawTextIgnoreAllWhitespaceTest.java | 8 ++++---- .../diff/RawTextIgnoreLeadingWhitespaceTest.java | 8 ++++---- .../diff/RawTextIgnoreTrailingWhitespaceTest.java | 8 ++++---- .../diff/RawTextIgnoreWhitespaceChangeTest.java | 8 ++++---- .../src/org/eclipse/jgit/diff/RawText.java | 15 --------------- 5 files changed, 16 insertions(+), 31 deletions(-) diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RawTextIgnoreAllWhitespaceTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RawTextIgnoreAllWhitespaceTest.java index c59f3780b1..f97763f5c3 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RawTextIgnoreAllWhitespaceTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RawTextIgnoreAllWhitespaceTest.java @@ -52,9 +52,9 @@ public class RawTextIgnoreAllWhitespaceTest extends TestCase { private final RawTextComparator cmp = RawTextComparator.WS_IGNORE_ALL; public void testEqualsWithoutWhitespace() { - final RawText a = new RawText(cmp, Constants + final RawText a = new RawText(Constants .encodeASCII("foo-a\nfoo-b\nfoo\n")); - final RawText b = new RawText(cmp, Constants + final RawText b = new RawText(Constants .encodeASCII("foo-b\nfoo-c\nf\n")); assertEquals(3, a.size()); @@ -74,9 +74,9 @@ public class RawTextIgnoreAllWhitespaceTest extends TestCase { } public void testEqualsWithWhitespace() { - final RawText a = new RawText(cmp, Constants + final RawText a = new RawText(Constants .encodeASCII("foo-a\n \n a b c\na \n")); - final RawText b = new RawText(cmp, Constants + final RawText b = new RawText(Constants .encodeASCII("foo-a b\n\nab c\na\n")); // "foo-a" != "foo-a b" diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RawTextIgnoreLeadingWhitespaceTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RawTextIgnoreLeadingWhitespaceTest.java index 647fa30d2e..e510bddc62 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RawTextIgnoreLeadingWhitespaceTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RawTextIgnoreLeadingWhitespaceTest.java @@ -52,9 +52,9 @@ public class RawTextIgnoreLeadingWhitespaceTest extends TestCase { private final RawTextComparator cmp = RawTextComparator.WS_IGNORE_LEADING; public void testEqualsWithoutWhitespace() { - final RawText a = new RawText(cmp, Constants + final RawText a = new RawText(Constants .encodeASCII("foo-a\nfoo-b\nfoo\n")); - final RawText b = new RawText(cmp, Constants + final RawText b = new RawText(Constants .encodeASCII("foo-b\nfoo-c\nf\n")); assertEquals(3, a.size()); @@ -74,9 +74,9 @@ public class RawTextIgnoreLeadingWhitespaceTest extends TestCase { } public void testEqualsWithWhitespace() { - final RawText a = new RawText(cmp, Constants + final RawText a = new RawText(Constants .encodeASCII("foo-a\n \n a b c\n a\nb \n")); - final RawText b = new RawText(cmp, Constants + final RawText b = new RawText(Constants .encodeASCII("foo-a b\n\nab c\na\nb\n")); // "foo-a" != "foo-a b" diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RawTextIgnoreTrailingWhitespaceTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RawTextIgnoreTrailingWhitespaceTest.java index b6999cd031..de7e5bf4d1 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RawTextIgnoreTrailingWhitespaceTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RawTextIgnoreTrailingWhitespaceTest.java @@ -52,9 +52,9 @@ public class RawTextIgnoreTrailingWhitespaceTest extends TestCase { private final RawTextComparator cmp = RawTextComparator.WS_IGNORE_TRAILING; public void testEqualsWithoutWhitespace() { - final RawText a = new RawText(cmp, Constants + final RawText a = new RawText(Constants .encodeASCII("foo-a\nfoo-b\nfoo\n")); - final RawText b = new RawText(cmp, Constants + final RawText b = new RawText(Constants .encodeASCII("foo-b\nfoo-c\nf\n")); assertEquals(3, a.size()); @@ -74,9 +74,9 @@ public class RawTextIgnoreTrailingWhitespaceTest extends TestCase { } public void testEqualsWithWhitespace() { - final RawText a = new RawText(cmp, Constants + final RawText a = new RawText(Constants .encodeASCII("foo-a\n \n a b c\na \n b\n")); - final RawText b = new RawText(cmp, Constants + final RawText b = new RawText(Constants .encodeASCII("foo-a b\n\nab c\na\nb\n")); // "foo-a" != "foo-a b" diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RawTextIgnoreWhitespaceChangeTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RawTextIgnoreWhitespaceChangeTest.java index 62a079f395..c601130be7 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RawTextIgnoreWhitespaceChangeTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/diff/RawTextIgnoreWhitespaceChangeTest.java @@ -52,9 +52,9 @@ public class RawTextIgnoreWhitespaceChangeTest extends TestCase { private final RawTextComparator cmp = RawTextComparator.WS_IGNORE_CHANGE; public void testEqualsWithoutWhitespace() { - final RawText a = new RawText(cmp, Constants + final RawText a = new RawText(Constants .encodeASCII("foo-a\nfoo-b\nfoo\n")); - final RawText b = new RawText(cmp, Constants + final RawText b = new RawText(Constants .encodeASCII("foo-b\nfoo-c\nf\n")); assertEquals(3, a.size()); @@ -74,9 +74,9 @@ public class RawTextIgnoreWhitespaceChangeTest extends TestCase { } public void testEqualsWithWhitespace() { - final RawText a = new RawText(cmp, Constants + final RawText a = new RawText(Constants .encodeASCII("foo-a\n \n a b c\na \n foo\na b c\n")); - final RawText b = new RawText(cmp, Constants + final RawText b = new RawText(Constants .encodeASCII("foo-a b\n\nab c\na\nfoo\na b c \n")); // "foo-a" != "foo-a b" 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 7d09874501..428183c943 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java @@ -85,21 +85,6 @@ public class RawText extends Sequence { * through cached arrays is safe. */ public RawText(final byte[] input) { - this(RawTextComparator.DEFAULT, input); - } - - /** - * Create a new sequence from an existing content byte array. - * - * The entire array (indexes 0 through length-1) is used as the content. - * - * @param cmp - * comparator that will later be used to compare texts. - * @param input - * the content array. The array is never modified, so passing - * through cached arrays is safe. - */ - public RawText(RawTextComparator cmp, byte[] input) { content = input; lines = RawParseUtils.lineMap(content, 0, content.length); } -- 2.39.5