Author: agilliland
Date: Sun Apr 9 13:46:40 2006
New Revision: 392834
URL: http://svn.apache.org/viewcvs?rev=392834&view=rev
Log:
completing removal of PersistenceStrategy interface.
Removed:
incubator/roller/branches/roller-newbackend/src/org/roller/business/PersistenceStrategy.java
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/pojos/FolderData.java
incubator/roller/branches/roller-newbackend/src/org/roller/pojos/HierarchicalPersistentObject.java
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/pojos/FolderData.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/pojos/FolderData.java?rev=392834&r1=392833&r2=392834&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/src/org/roller/pojos/FolderData.java
(original)
+++
incubator/roller/branches/roller-newbackend/src/org/roller/pojos/FolderData.java
Sun Apr 9 13:46:40 2006
@@ -8,9 +8,7 @@
import java.util.TreeSet;
import org.roller.RollerException;
-import org.roller.business.PersistenceStrategy;
import org.roller.model.BookmarkManager;
-import org.roller.model.Roller;
import org.roller.model.RollerFactory;
/**
@@ -508,18 +506,6 @@
public List getAncestorAssocs() throws RollerException
{
return
RollerFactory.getRoller().getBookmarkManager().getFolderAncestorAssocs(this);
- }
-
- // TODO: this needs to be refactored to not use the PersistenceStrategy
- protected void removeDescendent(
- PersistenceStrategy pstrategy, PersistentObject po) throws
RollerException
- {
- /*FolderData folder = (FolderData)po;
- Iterator bookmarks = folder.getBookmarks().iterator();
- while (bookmarks.hasNext()) {
- bookmarks.remove();
- }*/
- pstrategy.remove(po);
}
}
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/pojos/HierarchicalPersistentObject.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/pojos/HierarchicalPersistentObject.java?rev=392834&r1=392833&r2=392834&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/src/org/roller/pojos/HierarchicalPersistentObject.java
(original)
+++
incubator/roller/branches/roller-newbackend/src/org/roller/pojos/HierarchicalPersistentObject.java
Sun Apr 9 13:46:40 2006
@@ -4,11 +4,6 @@
package org.roller.pojos;
import org.roller.RollerException;
-import org.roller.business.PersistenceStrategy;
-import org.roller.model.RollerFactory;
-
-import java.util.Iterator;
-import java.util.LinkedList;
import java.util.List;
/**
@@ -50,16 +45,6 @@
/** Returns true if this object is in use and should not be deleted */
public abstract boolean isInUse() throws RollerException;
-
- /**
- * Override this if you want to handle descendant removal yourself.
- */
- // TODO: this needs to be refactored to not use the PersistenceStrategy
- protected void removeDescendent(
- PersistenceStrategy pstrategy, PersistentObject po) throws
RollerException
- {
- pstrategy.remove(po);
- }
/** Should be needed only be manager objects */
public HierarchicalPersistentObject getNewParent()
