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 2006/10/12 19:09:32 UTC
svn commit: r463326 - in /incubator/roller/trunk:
src/org/apache/roller/business/hibernate/ src/org/apache/roller/model/
src/org/apache/roller/ui/authoring/struts/actions/
tests/org/apache/roller/business/
Author: snoopdave
Date: Thu Oct 12 10:09:32 2006
New Revision: 463326
URL: http://svn.apache.org/viewvc?view=rev&rev=463326
Log:
Follow naming conventions, i.e. remove rather than delete
Modified:
incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java
incubator/roller/trunk/src/org/apache/roller/model/WeblogManager.java
incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java
incubator/roller/trunk/tests/org/apache/roller/business/CommentTest.java
Modified: incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java?view=diff&rev=463326&r1=463325&r2=463326
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/business/hibernate/HibernateWeblogManagerImpl.java Thu Oct 12 10:09:32 2006
@@ -871,7 +871,7 @@
}
}
- public int deleteMatchingComments(
+ public int removeMatchingComments(
WebsiteData website,
WeblogEntryData entry,
String searchString,
Modified: incubator/roller/trunk/src/org/apache/roller/model/WeblogManager.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/model/WeblogManager.java?view=diff&rev=463326&r1=463325&r2=463326
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/model/WeblogManager.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/model/WeblogManager.java Thu Oct 12 10:09:32 2006
@@ -358,7 +358,7 @@
* @param pending Approved flag value or null for no restriction
* @return Number of comments deleted
*/
- public int deleteMatchingComments(
+ public int removeMatchingComments(
WebsiteData website,
WeblogEntryData entry,
String searchString,
Modified: incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java?view=diff&rev=463326&r1=463325&r2=463326
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/authoring/struts/actions/CommentManagementAction.java Thu Oct 12 10:09:32 2006
@@ -129,7 +129,7 @@
|| rses.isGlobalAdminUser()) {
WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
CommentManagementForm queryForm = (CommentManagementForm)actionForm;
- wmgr.deleteMatchingComments(
+ wmgr.removeMatchingComments(
rreq.getWebsite(),
rreq.getWeblogEntry(),
queryForm.getSearchString(),
Modified: incubator/roller/trunk/tests/org/apache/roller/business/CommentTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/tests/org/apache/roller/business/CommentTest.java?view=diff&rev=463326&r1=463325&r2=463326
==============================================================================
--- incubator/roller/trunk/tests/org/apache/roller/business/CommentTest.java (original)
+++ incubator/roller/trunk/tests/org/apache/roller/business/CommentTest.java Thu Oct 12 10:09:32 2006
@@ -245,7 +245,7 @@
assertNotNull(comments);
assertEquals(3, comments.size());
- int countDeleted = mgr.deleteMatchingComments(
+ int countDeleted = mgr.removeMatchingComments(
null, // website
null, // entry
"deleteme", // searchString
@@ -272,7 +272,7 @@
assertEquals(3, comments.size());
// remove test comments
- countDeleted = mgr.deleteMatchingComments(
+ countDeleted = mgr.removeMatchingComments(
null, // website
null, // entry
"saveme", // searchString