diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevObjectTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevObjectTest.java index d4f289a16..2b24aa49a 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevObjectTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevObjectTest.java @@ -52,7 +52,7 @@ public void testId() throws Exception { assertSame(a, a.getId()); } - public void testEqualsIsIdentity() throws Exception { + public void testEquals() throws Exception { final RevCommit a1 = commit(); final RevCommit b1 = commit(); @@ -60,8 +60,8 @@ public void testEqualsIsIdentity() throws Exception { assertTrue(a1.equals((Object) a1)); assertFalse(a1.equals(b1)); - assertFalse(a1.equals(a1.copy())); - assertFalse(a1.equals((Object) a1.copy())); + assertTrue(a1.equals(a1.copy())); + assertTrue(a1.equals((Object) a1.copy())); assertFalse(a1.equals("")); final RevWalk rw2 = new RevWalk(db); @@ -70,8 +70,8 @@ public void testEqualsIsIdentity() throws Exception { assertNotSame(a1, a2); assertNotSame(b1, b2); - assertFalse(a1.equals(a2)); - assertFalse(b1.equals(b2)); + assertTrue(a1.equals(a2)); + assertTrue(b1.equals(b2)); assertEquals(a1.hashCode(), a2.hashCode()); assertEquals(b1.hashCode(), b2.hashCode()); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/lib/AnyObjectId.java b/org.eclipse.jgit/src/org/eclipse/jgit/lib/AnyObjectId.java index ecaa82b75..aeb0812c4 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/lib/AnyObjectId.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/lib/AnyObjectId.java @@ -230,11 +230,11 @@ public int hashCode() { * the other id to compare to. May be null. * @return true only if both ObjectIds have identical bits. */ - public boolean equals(final AnyObjectId other) { + public final boolean equals(final AnyObjectId other) { return other != null ? equals(this, other) : false; } - public boolean equals(final Object o) { + public final boolean equals(final Object o) { if (o instanceof AnyObjectId) return equals((AnyObjectId) o); else diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObject.java b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObject.java index a19f4d83e..85191224d 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObject.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObject.java @@ -96,16 +96,6 @@ public final ObjectId getId() { return this; } - @Override - public final boolean equals(final AnyObjectId o) { - return this == o; - } - - @Override - public final boolean equals(final Object o) { - return this == o; - } - /** * Test to see if the flag has been set on this object. *