[gnizr commit] r937 - in branches/gnizr-2.4/gnizr-db/src: main/java/com/gnizr/db/dao test/java/com/gnizr/db/dao

[codesite...@google.com]

Author: harry...@gmail.com
Date: Mon Jul 14 07:56:15 2008
New Revision: 937

Modified:
branches/gnizr-2.4/gnizr-db/src/main/java/com/gnizr/db/dao/Bookmark.java
branches/gnizr-2.4/gnizr-db/src/test/java/com/gnizr/db/dao/TestBookmark.java

Log:
modified the impl of the hashcode method to include bookmark's folder
in the hashcode calc.

Modified: branches/gnizr-2.4/gnizr-db/src/main/java/com/gnizr/db/dao/Bookmark.java
==============================================================================
---
branches/gnizr-2.4/gnizr-db/src/main/java/com/gnizr/db/dao/Bookmark.java (original)
+++
branches/gnizr-2.4/gnizr-db/src/main/java/com/gnizr/db/dao/Bookmark.java
Mon Jul 14 07:56:15 2008
@@ -306,18 +306,22 @@
this.user = user;
}

+
@Override
public int hashCode() {
- final int PRIME = 31;
- int result = super.hashCode();
- result = PRIME * result + ((createdOn == null) ? 0 : createdOn.hashCode());
- result = PRIME * result + id;
- result = PRIME * result + ((lastUpdated == null) ? 0 : lastUpdated.hashCode());
- result = PRIME * result + ((link == null) ? 0 : link.hashCode());
- result = PRIME * result + ((notes == null) ? 0 : notes.hashCode());
- result = PRIME * result + ((tags == null) ? 0 : tags.hashCode());
- result = PRIME * result + ((title == null) ? 0 : title.hashCode());
- result = PRIME * result + ((user == null) ? 0 : user.hashCode());
+ final int prime = 31;
+ int result = 1;
+ result = prime * result
+ + ((createdOn == null) ? 0 : createdOn.hashCode());
+ result = prime * result + ((folders == null) ? 0 : folders.hashCode());
+ result = prime * result + id;
+ result = prime * result
+ + ((lastUpdated == null) ? 0 : lastUpdated.hashCode());
+ result = prime * result + ((link == null) ? 0 : link.hashCode());
+ result = prime * result + ((notes == null) ? 0 : notes.hashCode());
+ result = prime * result + ((tags == null) ? 0 : tags.hashCode());
+ result = prime * result + ((title == null) ? 0 : title.hashCode());
+ result = prime * result + ((user == null) ? 0 : user.hashCode());
return result;
}

@@ -325,7 +329,7 @@
public boolean equals(Object obj) {
if (this == obj)
return true;
- if (!super.equals(obj))
+ if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
@@ -334,6 +338,11 @@
if (other.createdOn != null)
return false;
} else if (!createdOn.equals(other.createdOn))
+ return false;
+ if (folders == null) {
+ if (other.folders != null)
+ return false;
+ } else if (!folders.equals(other.folders))
return false;
if (id != other.id)
return false;

Modified: branches/gnizr-2.4/gnizr-db/src/test/java/com/gnizr/db/dao/TestBookmark.java
==============================================================================
---
branches/gnizr-2.4/gnizr-db/src/test/java/com/gnizr/db/dao/TestBookmark.java (original)
+++
branches/gnizr-2.4/gnizr-db/src/test/java/com/gnizr/db/dao/TestBookmark.java
Mon Jul 14 07:56:15 2008
@@ -51,7 +51,9 @@
assertEquals(b.getTags(),b2.getTags());
assertEquals(b.getTitle(),b2.getTitle());
assertEquals(b.getFolders(),b2.getFolders());
- assertEquals(b.getUser().getUsername(),b2.getUser().getUsername());

+ assertEquals(b.getUser().getUsername(),b2.getUser().getUsername());
+
+ assertEquals(b,b2);
}

public void testGetFilteredMachineTags() throws Exception{