Permalink
Browse files

LPS-10708

git-svn-id: svn://svn.liferay.com/repos/public/portal/trunk@56874 05bdf26c-840f-0410-9ced-eb539d925f36
  • Loading branch information...
Bijan Vakili
Bijan Vakili committed Jun 29, 2010
1 parent 771111f commit 34eba7b9b0be57a39357f5bb044b2bada73b137d
@@ -139,6 +139,15 @@ public void addFolderResources(
public void deleteFolder(BookmarksFolder folder)
throws PortalException, SystemException {
// Folders
List<BookmarksFolder> folders = bookmarksFolderPersistence.findByG_P(
folder.getGroupId(), folder.getFolderId());
for (BookmarksFolder curFolder : folders) {
deleteFolder(curFolder);
}
// Folder
bookmarksFolderPersistence.remove(folder);
@@ -154,15 +163,6 @@ public void deleteFolder(BookmarksFolder folder)
bookmarksEntryLocalService.deleteEntries(
folder.getGroupId(), folder.getFolderId());
// Folders
List<BookmarksFolder> folders = bookmarksFolderPersistence.findByG_P(
folder.getGroupId(), folder.getFolderId());
for (BookmarksFolder curFolder : folders) {
deleteFolder(curFolder);
}
// Expando
expandoValueLocalService.deleteValues(
@@ -203,6 +203,15 @@ public void addFolderResources(
public void deleteFolder(DLFolder folder)
throws PortalException, SystemException {
// Folders
List<DLFolder> folders = dlFolderPersistence.findByG_P(
folder.getGroupId(), folder.getFolderId());
for (DLFolder curFolder : folders) {
deleteFolder(curFolder);
}
// Folder
dlFolderPersistence.remove(folder);
@@ -223,15 +232,6 @@ public void deleteFolder(DLFolder folder)
dlFileEntryLocalService.deleteFileEntries(
folder.getGroupId(), folder.getFolderId());
// Folders
List<DLFolder> folders = dlFolderPersistence.findByG_P(
folder.getGroupId(), folder.getFolderId());
for (DLFolder curFolder : folders) {
deleteFolder(curFolder);
}
// Expando
expandoValueLocalService.deleteValues(
@@ -136,6 +136,15 @@ public void addFolderResources(
public void deleteFolder(IGFolder folder)
throws PortalException, SystemException {
// Folders
List<IGFolder> folders = igFolderPersistence.findByG_P(
folder.getGroupId(), folder.getFolderId());
for (IGFolder curFolder : folders) {
deleteFolder(curFolder);
}
// Folder
igFolderPersistence.remove(folder);
@@ -146,15 +155,6 @@ public void deleteFolder(IGFolder folder)
folder.getCompanyId(), IGFolder.class.getName(),
ResourceConstants.SCOPE_INDIVIDUAL, folder.getFolderId());
// Folders
List<IGFolder> folders = igFolderPersistence.findByG_P(
folder.getGroupId(), folder.getFolderId());
for (IGFolder curFolder : folders) {
deleteFolder(curFolder);
}
// Images
igImageLocalService.deleteImages(
@@ -158,16 +158,6 @@ public void deleteCategory(long categoryId)
public void deleteCategory(ShoppingCategory category)
throws PortalException, SystemException {
// Category
shoppingCategoryPersistence.remove(category);
// Resources
resourceLocalService.deleteResource(
category.getCompanyId(), ShoppingCategory.class.getName(),
ResourceConstants.SCOPE_INDIVIDUAL, category.getCategoryId());
// Categories
List<ShoppingCategory> categories =
@@ -178,6 +168,16 @@ public void deleteCategory(ShoppingCategory category)
deleteCategory(curCategory);
}
// Category
shoppingCategoryPersistence.remove(category);
// Resources
resourceLocalService.deleteResource(
category.getCompanyId(), ShoppingCategory.class.getName(),
ResourceConstants.SCOPE_INDIVIDUAL, category.getCategoryId());
// Items
shoppingItemLocalService.deleteItems(

0 comments on commit 34eba7b

Please sign in to comment.