You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2005/11/03 21:30:26 UTC
svn commit: r330624 - in /incubator/roller/trunk/src/org/roller/pojos:
BookmarkData.java FolderData.java PingCategoryRestrictionData.java
RefererData.java RoleData.java UserCookieData.java WeblogTemplate.java
Author: snoopdave
Date: Thu Nov 3 12:30:23 2005
New Revision: 330624
URL: http://svn.apache.org/viewcvs?rev=330624&view=rev
Log:
Using getters in the equals methods too
Modified:
incubator/roller/trunk/src/org/roller/pojos/BookmarkData.java
incubator/roller/trunk/src/org/roller/pojos/FolderData.java
incubator/roller/trunk/src/org/roller/pojos/PingCategoryRestrictionData.java
incubator/roller/trunk/src/org/roller/pojos/RefererData.java
incubator/roller/trunk/src/org/roller/pojos/RoleData.java
incubator/roller/trunk/src/org/roller/pojos/UserCookieData.java
incubator/roller/trunk/src/org/roller/pojos/WeblogTemplate.java
Modified: incubator/roller/trunk/src/org/roller/pojos/BookmarkData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/BookmarkData.java?rev=330624&r1=330623&r2=330624&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/BookmarkData.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/BookmarkData.java Thu Nov 3 12:30:23 2005
@@ -281,57 +281,57 @@
if (this.id == null)
{
- lEquals = lEquals && (lTest.id == null);
+ lEquals = lEquals && (lTest.getId() == null);
}
else
{
- lEquals = lEquals && this.id.equals(lTest.id);
+ lEquals = lEquals && this.id.equals(lTest.getId());
}
if (this.name == null)
{
- lEquals = lEquals && (lTest.name == null);
+ lEquals = lEquals && (lTest.getName() == null);
}
else
{
- lEquals = lEquals && this.name.equals(lTest.name);
+ lEquals = lEquals && this.name.equals(lTest.getName());
}
if (this.description == null)
{
- lEquals = lEquals && (lTest.description == null);
+ lEquals = lEquals && (lTest.getDescription() == null);
}
else
{
lEquals = lEquals &&
- this.description.equals(lTest.description);
+ this.description.equals(lTest.getDescription());
}
if (this.url == null)
{
- lEquals = lEquals && (lTest.url == null);
+ lEquals = lEquals && (lTest.getUrl() == null);
}
else
{
- lEquals = lEquals && this.url.equals(lTest.url);
+ lEquals = lEquals && this.url.equals(lTest.getUrl());
}
if (this.weight == null)
{
- lEquals = lEquals && (lTest.weight == null);
+ lEquals = lEquals && (lTest.getWeight() == null);
}
else
{
- lEquals = lEquals && this.weight.equals(lTest.weight);
+ lEquals = lEquals && this.weight.equals(lTest.getWeight());
}
if (this.priority == null)
{
- lEquals = lEquals && (lTest.priority == null);
+ lEquals = lEquals && (lTest.getPriority() == null);
}
else
{
- lEquals = lEquals && this.priority.equals(lTest.priority);
+ lEquals = lEquals && this.priority.equals(lTest.getPriority());
}
// if (this.mFolder == null)
@@ -345,20 +345,20 @@
//
if (this.image == null)
{
- lEquals = lEquals && (lTest.image == null);
+ lEquals = lEquals && (lTest.getImage() == null);
}
else
{
- lEquals = lEquals && this.image.equals(lTest.image);
+ lEquals = lEquals && this.image.equals(lTest.getImage());
}
if (this.feedUrl == null)
{
- lEquals = lEquals && (lTest.feedUrl == null);
+ lEquals = lEquals && (lTest.getFeedUrl() == null);
}
else
{
- lEquals = lEquals && this.feedUrl.equals(lTest.feedUrl);
+ lEquals = lEquals && this.feedUrl.equals(lTest.getFeedUrl());
}
return lEquals;
Modified: incubator/roller/trunk/src/org/roller/pojos/FolderData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/FolderData.java?rev=330624&r1=330623&r2=330624&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/FolderData.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/FolderData.java Thu Nov 3 12:30:23 2005
@@ -399,39 +399,39 @@
if (this.id == null)
{
- lEquals = lEquals && (lTest.id == null);
+ lEquals = lEquals && (lTest.getId() == null);
}
else
{
- lEquals = lEquals && this.id.equals(lTest.id);
+ lEquals = lEquals && this.id.equals(lTest.getId());
}
if (this.name == null)
{
- lEquals = lEquals && (lTest.name == null);
+ lEquals = lEquals && (lTest.getName() == null);
}
else
{
- lEquals = lEquals && this.name.equals(lTest.name);
+ lEquals = lEquals && this.name.equals(lTest.getName());
}
if (this.description == null)
{
- lEquals = lEquals && (lTest.description == null);
+ lEquals = lEquals && (lTest.getDescription() == null);
}
else
{
lEquals = lEquals &&
- this.description.equals(lTest.description);
+ this.description.equals(lTest.getDescription());
}
if (this.website == null)
{
- lEquals = lEquals && (lTest.website == null);
+ lEquals = lEquals && (lTest.getWebsite() == null);
}
else
{
- lEquals = lEquals && this.website.equals(lTest.website);
+ lEquals = lEquals && this.website.equals(lTest.getWebsite());
}
return lEquals;
Modified: incubator/roller/trunk/src/org/roller/pojos/PingCategoryRestrictionData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/PingCategoryRestrictionData.java?rev=330624&r1=330623&r2=330624&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/PingCategoryRestrictionData.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/PingCategoryRestrictionData.java Thu Nov 3 12:30:23 2005
@@ -140,9 +140,9 @@
final PingCategoryRestrictionData pingCategoryRestrictionData = (PingCategoryRestrictionData)o;
- if (id != null ? !id.equals(pingCategoryRestrictionData.id) : pingCategoryRestrictionData.id != null) return false;
- if (autoPing != null ? !autoPing.equals(pingCategoryRestrictionData.autoPing) : pingCategoryRestrictionData.autoPing != null) return false;
- if (weblogCategory != null ? !weblogCategory.equals(pingCategoryRestrictionData.weblogCategory) : pingCategoryRestrictionData.weblogCategory != null) return false;
+ if (id != null ? !id.equals(pingCategoryRestrictionData.getId()) : pingCategoryRestrictionData.getId() != null) return false;
+ if (autoPing != null ? !autoPing.equals(pingCategoryRestrictionData.getAutoping()) : pingCategoryRestrictionData.getAutoping() != null) return false;
+ if (weblogCategory != null ? !weblogCategory.equals(pingCategoryRestrictionData.getWeblogCategory()) : pingCategoryRestrictionData.getWeblogCategory() != null) return false;
return true;
}
Modified: incubator/roller/trunk/src/org/roller/pojos/RefererData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/RefererData.java?rev=330624&r1=330623&r2=330624&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/RefererData.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/RefererData.java Thu Nov 3 12:30:23 2005
@@ -392,124 +392,124 @@
if (this.id == null)
{
- lEquals = lEquals && (lTest.id == null);
+ lEquals = lEquals && (lTest.getId() == null);
}
else
{
- lEquals = lEquals && this.id.equals(lTest.id);
+ lEquals = lEquals && this.id.equals(lTest.getId());
}
if (this.website == null)
{
- lEquals = lEquals && (lTest.website == null);
+ lEquals = lEquals && (lTest.getWebsite() == null);
}
else
{
- lEquals = lEquals && this.website.equals(lTest.website);
+ lEquals = lEquals && this.website.equals(lTest.getWebsite());
}
if (this.weblogEntry == null)
{
- lEquals = lEquals && (lTest.weblogEntry == null);
+ lEquals = lEquals && (lTest.getWeblogEntry() == null);
}
else
{
lEquals = lEquals &&
- this.weblogEntry.equals(lTest.weblogEntry);
+ this.weblogEntry.equals(lTest.getWeblogEntry());
}
if (this.dateString == null)
{
- lEquals = lEquals && (lTest.dateString == null);
+ lEquals = lEquals && (lTest.getDateString() == null);
}
else
{
lEquals = lEquals &&
- this.dateString.equals(lTest.dateString);
+ this.dateString.equals(lTest.getDateString());
}
if (this.refererUrl == null)
{
- lEquals = lEquals && (lTest.refererUrl == null);
+ lEquals = lEquals && (lTest.getRefererUrl() == null);
}
else
{
lEquals = lEquals &&
- this.refererUrl.equals(lTest.refererUrl);
+ this.refererUrl.equals(lTest.getRefererUrl());
}
if (this.refererPermalink == null)
{
- lEquals = lEquals && (lTest.refererPermalink == null);
+ lEquals = lEquals && (lTest.getRefererPermalink() == null);
}
else
{
lEquals = lEquals &&
- this.refererPermalink.equals(lTest.refererPermalink);
+ this.refererPermalink.equals(lTest.getRefererPermalink());
}
if (this.requestUrl == null)
{
- lEquals = lEquals && (lTest.requestUrl == null);
+ lEquals = lEquals && (lTest.getRequestUrl() == null);
}
else
{
lEquals = lEquals &&
- this.requestUrl.equals(lTest.requestUrl);
+ this.requestUrl.equals(lTest.getRequestUrl());
}
if (this.title == null)
{
- lEquals = lEquals && (lTest.title == null);
+ lEquals = lEquals && (lTest.getTitle() == null);
}
else
{
- lEquals = lEquals && this.title.equals(lTest.title);
+ lEquals = lEquals && this.title.equals(lTest.getTitle());
}
if (this.excerpt == null)
{
- lEquals = lEquals && (lTest.excerpt == null);
+ lEquals = lEquals && (lTest.getExcerpt() == null);
}
else
{
- lEquals = lEquals && this.excerpt.equals(lTest.excerpt);
+ lEquals = lEquals && this.excerpt.equals(lTest.getExcerpt());
}
if (this.visible == null)
{
- lEquals = lEquals && (lTest.visible == null);
+ lEquals = lEquals && (lTest.getVisible() == null);
}
else
{
- lEquals = lEquals && this.visible.equals(lTest.visible);
+ lEquals = lEquals && this.visible.equals(lTest.getVisible());
}
if (this.duplicate == null)
{
- lEquals = lEquals && (lTest.duplicate == null);
+ lEquals = lEquals && (lTest.getDuplicate() == null);
}
else
{
- lEquals = lEquals && this.duplicate.equals(lTest.duplicate);
+ lEquals = lEquals && this.duplicate.equals(lTest.getDuplicate());
}
if (this.dayHits == null)
{
- lEquals = lEquals && (lTest.dayHits == null);
+ lEquals = lEquals && (lTest.getDayHits() == null);
}
else
{
- lEquals = lEquals && this.dayHits.equals(lTest.dayHits);
+ lEquals = lEquals && this.dayHits.equals(lTest.getDayHits());
}
if (this.totalHits == null)
{
- lEquals = lEquals && (lTest.totalHits == null);
+ lEquals = lEquals && (lTest.getTotalHits() == null);
}
else
{
- lEquals = lEquals && this.totalHits.equals(lTest.totalHits);
+ lEquals = lEquals && this.totalHits.equals(lTest.getTotalHits());
}
return lEquals;
Modified: incubator/roller/trunk/src/org/roller/pojos/RoleData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/RoleData.java?rev=330624&r1=330623&r2=330624&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/RoleData.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/RoleData.java Thu Nov 3 12:30:23 2005
@@ -115,35 +115,35 @@
if( this.id == null )
{
- lEquals = lEquals && ( lTest.id == null );
+ lEquals = lEquals && ( lTest.getId() == null );
}
else
{
- lEquals = lEquals && this.id.equals( lTest.id );
+ lEquals = lEquals && this.id.equals( lTest.getId() );
}
if( this.userName == null )
{
- lEquals = lEquals && ( lTest.userName == null );
+ lEquals = lEquals && ( lTest.getUserName() == null );
}
else
{
- lEquals = lEquals && this.userName.equals( lTest.userName );
+ lEquals = lEquals && this.userName.equals( lTest.getUserName() );
}
if( this.user == null )
{
- lEquals = lEquals && ( lTest.user == null );
+ lEquals = lEquals && ( lTest.getUser() == null );
}
else
{
- lEquals = lEquals && this.user.equals( lTest.user );
+ lEquals = lEquals && this.user.equals( lTest.getUser() );
}
if( this.role == null )
{
- lEquals = lEquals && ( lTest.role == null );
+ lEquals = lEquals && ( lTest.getRole() == null );
}
else
{
- lEquals = lEquals && this.role.equals( lTest.role );
+ lEquals = lEquals && this.role.equals( lTest.getRole() );
}
return lEquals;
Modified: incubator/roller/trunk/src/org/roller/pojos/UserCookieData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/UserCookieData.java?rev=330624&r1=330623&r2=330624&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/UserCookieData.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/UserCookieData.java Thu Nov 3 12:30:23 2005
@@ -153,19 +153,19 @@
}
final UserCookieData userCookieData = (UserCookieData)o;
- if (cookieId != null ? !cookieId.equals(userCookieData.cookieId) : userCookieData.cookieId != null)
+ if (cookieId != null ? !cookieId.equals(userCookieData.getCookieId()) : userCookieData.getCookieId() != null)
{
return false;
}
- if (dateCreated != null ? !dateCreated.equals(userCookieData.dateCreated) : userCookieData.dateCreated != null)
+ if (dateCreated != null ? !dateCreated.equals(userCookieData.getDateCreated()) : userCookieData.getDateCreated() != null)
{
return false;
}
- if (id != null ? !id.equals(userCookieData.id) : userCookieData.id != null)
+ if (id != null ? !id.equals(userCookieData.getId()) : userCookieData.getId() != null)
{
return false;
}
- if (username != null ? !username.equals(userCookieData.username) : userCookieData.username != null)
+ if (username != null ? !username.equals(userCookieData.getUsername()) : userCookieData.getUsername() != null)
{
return false;
}
Modified: incubator/roller/trunk/src/org/roller/pojos/WeblogTemplate.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/pojos/WeblogTemplate.java?rev=330624&r1=330623&r2=330624&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/pojos/WeblogTemplate.java (original)
+++ incubator/roller/trunk/src/org/roller/pojos/WeblogTemplate.java Thu Nov 3 12:30:23 2005
@@ -189,59 +189,59 @@
if( this.id == null )
{
- lEquals = lEquals && ( lTest.id == null );
+ lEquals = lEquals && ( lTest.getId() == null );
}
else
{
- lEquals = lEquals && this.id.equals( lTest.id );
+ lEquals = lEquals && this.id.equals( lTest.getId() );
}
if( this.mWebsite == null )
{
- lEquals = lEquals && ( lTest.mWebsite == null );
+ lEquals = lEquals && ( lTest.getWebsite() == null );
}
else
{
- lEquals = lEquals && this.mWebsite.equals( lTest.mWebsite );
+ lEquals = lEquals && this.mWebsite.equals( lTest.getWebsite() );
}
if( this.name == null )
{
- lEquals = lEquals && ( lTest.name == null );
+ lEquals = lEquals && ( lTest.getName() == null );
}
else
{
- lEquals = lEquals && this.name.equals( lTest.name );
+ lEquals = lEquals && this.name.equals( lTest.getName() );
}
if( this.description == null )
{
- lEquals = lEquals && ( lTest.description == null );
+ lEquals = lEquals && ( lTest.getDescription() == null );
}
else
{
- lEquals = lEquals && this.description.equals( lTest.description );
+ lEquals = lEquals && this.description.equals( lTest.getDescription() );
}
if( this.link == null )
{
- lEquals = lEquals && ( lTest.link == null );
+ lEquals = lEquals && ( lTest.getLink() == null );
}
else
{
- lEquals = lEquals && this.link.equals( lTest.link );
+ lEquals = lEquals && this.link.equals( lTest.getLink() );
}
if( this.contents == null )
{
- lEquals = lEquals && ( lTest.contents == null );
+ lEquals = lEquals && ( lTest.getContents() == null );
}
else
{
- lEquals = lEquals && this.contents.equals( lTest.contents );
+ lEquals = lEquals && this.contents.equals( lTest.getContents() );
}
if( this.lastModified == null )
{
- lEquals = lEquals && ( lTest.lastModified == null );
+ lEquals = lEquals && ( lTest.getLastModified() == null );
}
else
{
- lEquals = lEquals && this.lastModified.equals( lTest.lastModified );
+ lEquals = lEquals && this.lastModified.equals( lTest.getLastModified() );
}
return lEquals;