Return-Path: Delivered-To: apmail-incubator-roller-commits-archive@www.apache.org Received: (qmail 34154 invoked from network); 2 Nov 2006 00:52:00 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Nov 2006 00:52:00 -0000 Received: (qmail 53229 invoked by uid 500); 2 Nov 2006 00:52:11 -0000 Delivered-To: apmail-incubator-roller-commits-archive@incubator.apache.org Received: (qmail 53198 invoked by uid 500); 2 Nov 2006 00:52:11 -0000 Mailing-List: contact roller-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: roller-dev@incubator.apache.org Delivered-To: mailing list roller-commits@incubator.apache.org Received: (qmail 53186 invoked by uid 99); 2 Nov 2006 00:52:11 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Nov 2006 16:52:11 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 Nov 2006 16:51:59 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 257091A9846; Wed, 1 Nov 2006 16:51:35 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r470150 - in /incubator/roller/trunk/src/org/apache/roller/pojos: WeblogEntryTagAggregateData.java WeblogEntryTagData.java Date: Thu, 02 Nov 2006 00:51:34 -0000 To: roller-commits@incubator.apache.org From: eliast@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20061102005135.257091A9846@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: eliast Date: Wed Nov 1 16:51:33 2006 New Revision: 470150 URL: http://svn.apache.org/viewvc?view=rev&rev=470150 Log: - Refactored getWebsite() methods to getWeblog() Modified: incubator/roller/trunk/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.java incubator/roller/trunk/src/org/apache/roller/pojos/WeblogEntryTagData.java Modified: incubator/roller/trunk/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.java?view=diff&rev=470150&r1=470149&r2=470150 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.java (original) +++ incubator/roller/trunk/src/org/apache/roller/pojos/WeblogEntryTagAggregateData.java Wed Nov 1 16:51:33 2006 @@ -84,7 +84,7 @@ * @ejb:persistent-field * @hibernate.many-to-one column="websiteid" cascade="none" not-null="false" */ - public WebsiteData getWebsite() { + public WebsiteData getWeblog() { return this.website; } @@ -159,7 +159,7 @@ boolean lEquals = true; lEquals = PojoUtil.equals(lEquals, this.id, lTest.getId()); - lEquals = PojoUtil.equals(lEquals, this.website, lTest.getWebsite()); + lEquals = PojoUtil.equals(lEquals, this.website, lTest.getWeblog()); lEquals = PojoUtil.equals(lEquals, this.name, lTest.getName()); lEquals = this.total == lTest.getTotal(); return lEquals; @@ -185,7 +185,7 @@ { WeblogEntryTagAggregateData data = (WeblogEntryTagAggregateData) otherData; this.id = data.getId(); - this.website = data.getWebsite(); + this.website = data.getWeblog(); this.name = data.getName(); this.total = data.getTotal(); this.lastUsed = data.getLastUsed(); Modified: incubator/roller/trunk/src/org/apache/roller/pojos/WeblogEntryTagData.java URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/pojos/WeblogEntryTagData.java?view=diff&rev=470150&r1=470149&r2=470150 ============================================================================== --- incubator/roller/trunk/src/org/apache/roller/pojos/WeblogEntryTagData.java (original) +++ incubator/roller/trunk/src/org/apache/roller/pojos/WeblogEntryTagData.java Wed Nov 1 16:51:33 2006 @@ -92,7 +92,7 @@ * @roller.wrapPojoMethod type="pojo" * @hibernate.many-to-one column="websiteid" cascade="none" not-null="true" */ - public org.apache.roller.pojos.WebsiteData getWebsite() + public org.apache.roller.pojos.WebsiteData getWeblog() { return this.website; } @@ -183,7 +183,7 @@ boolean lEquals = true; lEquals = PojoUtil.equals(lEquals, this.id, lTest.getId()); - lEquals = PojoUtil.equals(lEquals, this.website, lTest.getWebsite()); + lEquals = PojoUtil.equals(lEquals, this.website, lTest.getWeblog()); lEquals = PojoUtil.equals(lEquals, this.weblogEntry, lTest.getWeblogEntry()); lEquals = PojoUtil.equals(lEquals, this.user, lTest.getUser()); lEquals = PojoUtil.equals(lEquals, this.name, lTest.getName()); @@ -214,7 +214,7 @@ { WeblogEntryTagData data = (WeblogEntryTagData) otherData; this.id = data.getId(); - this.website = data.getWebsite(); + this.website = data.getWeblog(); this.weblogEntry = data.getWeblogEntry(); this.user = data.getUser(); this.name = data.getName();