You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/04/10 01:50:18 UTC
svn commit: r392850 - in
/incubator/roller/branches/roller-newbackend/src/org/roller:
business/hibernate/HibernateWeblogManagerImpl.java model/WeblogManager.java
pojos/WeblogEntryData.java
Author: agilliland
Date: Sun Apr 9 16:50:16 2006
New Revision: 392850
URL: http://svn.apache.org/viewcvs?rev=392850&view=rev
Log:
removed unused removeEntryContents() method.
refactored removeWeblogEntry(id) to removeWeblogEntry(entry).
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateWeblogManagerImpl.java
incubator/roller/branches/roller-newbackend/src/org/roller/model/WeblogManager.java
incubator/roller/branches/roller-newbackend/src/org/roller/pojos/WeblogEntryData.java
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateWeblogManagerImpl.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateWeblogManagerImpl.java?rev=392850&r1=392849&r2=392850&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateWeblogManagerImpl.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateWeblogManagerImpl.java Sun Apr 9 16:50:16 2006
@@ -251,11 +251,7 @@
}
- public void removeWeblogEntry(String id) throws RollerException {
-
- if(id == null) {
- throw new RollerException("cannot remove null entry");
- }
+ public void removeWeblogEntry(WeblogEntryData entry) throws RollerException {
try {
Session session = ((HibernatePersistenceStrategy)this.strategy).getSession();
@@ -263,8 +259,6 @@
// begin transaction
this.strategy.getSession().beginTransaction();
- WeblogEntryData entry = retrieveWeblogEntry(id);
-
// remove referers
Criteria refererQuery = session.createCriteria(RefererData.class);
refererQuery.add(Expression.eq("weblogEntry", entry));
@@ -293,7 +287,7 @@
}
// remove entry
- this.strategy.remove(id, WeblogEntryData.class);
+ this.strategy.remove(entry);
// commit changes
this.strategy.getSession().getTransaction().commit();
@@ -312,7 +306,7 @@
}
- public void removeWeblogEntryContents(WeblogEntryData entry)
+ private void removeWeblogEntryContents(WeblogEntryData entry)
throws RollerException {
if(entry == null) {
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/model/WeblogManager.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/model/WeblogManager.java?rev=392850&r1=392849&r2=392850&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/model/WeblogManager.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/model/WeblogManager.java Sun Apr 9 16:50:16 2006
@@ -186,14 +186,11 @@
/**
* Get weblog entry by ID
*/
- public WeblogEntryData retrieveWeblogEntry(String id)
- throws RollerException;
-
- /**
- * Remove weblog entry by ID
- */
- public void removeWeblogEntry( String id )
- throws RollerException;
+ public WeblogEntryData retrieveWeblogEntry(String id) throws RollerException;
+
+
+ public void removeWeblogEntry(WeblogEntryData entry) throws RollerException;
+
//------------------------------------------------ WeblogEntryData Queries
@@ -364,13 +361,8 @@
*/
public Date getWeblogLastPublishTime(WebsiteData website, String catName )
throws RollerException;
-
- /**
- * Remove WeblogEntry contents.
- */
- public void removeWeblogEntryContents(WeblogEntryData data)
- throws RollerException;
-
+
+
/**
* Create unique anchor for weblog entry.
*/
Modified: incubator/roller/branches/roller-newbackend/src/org/roller/pojos/WeblogEntryData.java
URL: http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/pojos/WeblogEntryData.java?rev=392850&r1=392849&r2=392850&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/src/org/roller/pojos/WeblogEntryData.java (original)
+++ incubator/roller/branches/roller-newbackend/src/org/roller/pojos/WeblogEntryData.java Sun Apr 9 16:50:16 2006
@@ -1075,14 +1075,6 @@
{
}
- /**
- * @see org.roller.pojos.PersistentObject#remove()
- */
- public void remove() throws RollerException
- {
- RollerFactory.getRoller().getWeblogManager().removeWeblogEntryContents(this);
- super.remove();
- }
/**
* Convenience method to transform mPlugins to a List