motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Backout RevObject's object-identity based equals implementation"

This commit is contained in:
Shawn Pearce 2010-08-18 15:00:33 -04:00 committed by Code Review
parent 11c5c9f73b 2d3a806271
commit 9fc2cdadd2
3 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
org.eclipse.jgit.test/tst/org/eclipse/jgit/revwalk/RevObjectTest.java
View File

@ -52,7 +52,7 @@ public void testId() throws Exception {
assertSame(a, a.getId()); assertSame(a, a.getId());
} }
public void testEqualsIsIdentity() throws Exception { public void testEquals() throws Exception {
final RevCommit a1 = commit(); final RevCommit a1 = commit();
final RevCommit b1 = commit(); final RevCommit b1 = commit();
@ -60,8 +60,8 @@ public void testEqualsIsIdentity() throws Exception {
assertTrue(a1.equals((Object) a1)); assertTrue(a1.equals((Object) a1));
assertFalse(a1.equals(b1)); assertFalse(a1.equals(b1));
assertFalse(a1.equals(a1.copy())); assertTrue(a1.equals(a1.copy()));
assertFalse(a1.equals((Object) a1.copy())); assertTrue(a1.equals((Object) a1.copy()));
assertFalse(a1.equals("")); assertFalse(a1.equals(""));
final RevWalk rw2 = new RevWalk(db); final RevWalk rw2 = new RevWalk(db);
@ -70,8 +70,8 @@ public void testEqualsIsIdentity() throws Exception {
assertNotSame(a1, a2); assertNotSame(a1, a2);
assertNotSame(b1, b2); assertNotSame(b1, b2);
assertFalse(a1.equals(a2)); assertTrue(a1.equals(a2));
assertFalse(b1.equals(b2)); assertTrue(b1.equals(b2));
assertEquals(a1.hashCode(), a2.hashCode()); assertEquals(a1.hashCode(), a2.hashCode());
assertEquals(b1.hashCode(), b2.hashCode()); assertEquals(b1.hashCode(), b2.hashCode());

4
org.eclipse.jgit/src/org/eclipse/jgit/lib/AnyObjectId.java
View File

@ -230,11 +230,11 @@ public int hashCode() {
* the other id to compare to. May be null. * the other id to compare to. May be null.
* @return true only if both ObjectIds have identical bits. * @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; return other != null ? equals(this, other) : false;
} }
public boolean equals(final Object o) { public final boolean equals(final Object o) {
if (o instanceof AnyObjectId) if (o instanceof AnyObjectId)
return equals((AnyObjectId) o); return equals((AnyObjectId) o);
else else

10
org.eclipse.jgit/src/org/eclipse/jgit/revwalk/RevObject.java
View File

@ -96,16 +96,6 @@ public final ObjectId getId() {
return this; 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. * Test to see if the flag has been set on this object.
* *