Author: agilliland
Date: Wed Apr 19 13:03:21 2006
New Revision: 395377
URL: http://svn.apache.org/viewcvs?rev=395377&view=rev
Log:
manager method name refactorings for BookmarkManager.
storeXXX() -> saveXXX()
retrieveXXX() -> getXXX()
createXXX() -> addXXX() (or is removed)
plus:
removed method removeBookmark(id)
added method removeBookmark(bookmark)
Modified:
incubator/roller/branches/roller-newbackend/contrib/plugins/src/org/roller/presentation/velocity/plugins/topictag/TopicTagPlugin.java
incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateBookmarkManagerImpl.java
incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateUserManagerImpl.java
incubator/roller/branches/roller-newbackend/src/org/roller/model/BookmarkManager.java
incubator/roller/branches/roller-newbackend/src/org/roller/pojos/FolderData.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/RollerRequest.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/BookmarkEditAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/BookmarkSaveAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/FolderEditAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/FolderSaveAction.java
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java
incubator/roller/branches/roller-newbackend/tests/org/roller/business/BookmarkManagerTest.java
Modified:
incubator/roller/branches/roller-newbackend/contrib/plugins/src/org/roller/presentation/velocity/plugins/topictag/TopicTagPlugin.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/contrib/plugins/src/org/roller/presentation/velocity/plugins/topictag/TopicTagPlugin.java?rev=395377&r1=395376&r2=395377&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/contrib/plugins/src/org/roller/presentation/velocity/plugins/topictag/TopicTagPlugin.java
(original)
+++
incubator/roller/branches/roller-newbackend/contrib/plugins/src/org/roller/presentation/velocity/plugins/topictag/TopicTagPlugin.java
Wed Apr 19 13:03:21 2006
@@ -323,7 +323,7 @@
else
{
BookmarkManager bMgr =
RollerFactory.getRoller().getBookmarkManager();
- List bookmarks =
bMgr.retrieveBookmarks(bMgr.getRootFolder(website), true);
+ List bookmarks = bMgr.getBookmarks(bMgr.getRootFolder(website),
true);
for (Iterator i = bookmarks.iterator(); i.hasNext();)
{
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateBookmarkManagerImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateBookmarkManagerImpl.java?rev=395377&r1=395376&r2=395377&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateBookmarkManagerImpl.java
(original)
+++
incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateBookmarkManagerImpl.java
Wed Apr 19 13:03:21 2006
@@ -51,32 +51,12 @@
}
- public BookmarkData createBookmark() {
- BookmarkData bd = new BookmarkData();
- return bd;
- }
-
- public BookmarkData createBookmark(
- FolderData parent,
- String name,
- String desc,
- String url,
- String feedUrl,
- Integer weight,
- Integer priority,
- String image) {
- BookmarkData bd = new BookmarkData(
- parent, name, desc, url, feedUrl, weight, priority, image);
- return bd;
- }
-
-
- public void storeBookmark(BookmarkData bookmark) throws RollerException {
+ public void saveBookmark(BookmarkData bookmark) throws RollerException {
this.strategy.store(bookmark);
}
- public BookmarkData retrieveBookmark(String id) throws RollerException {
+ public BookmarkData getBookmark(String id) throws RollerException {
BookmarkData bd = (BookmarkData)
strategy.load(id, BookmarkData.class);
// TODO: huh? why do we do this?
@@ -84,39 +64,15 @@
return bd;
}
-// public void storeBookmark(BookmarkData data) throws RollerException
-// {
-// strategy.store(data);
-// }
- public void removeBookmark(String id) throws RollerException {
- strategy.remove(id, BookmarkData.class);
+ public void removeBookmark(BookmarkData bookmark) throws RollerException {
+ this.strategy.remove(bookmark);
}
//------------------------------------------------------------ Folder CRUD
- /**
- * @see org.roller.model.BookmarkManager#createFolder()
- */
- public FolderData createFolder() {
- FolderData fd = new FolderData();
- return fd;
- }
-
- /**
- * @see org.roller.model.BookmarkManager#createFolder()
- */
- public FolderData createFolder(
- FolderData parent,
- String name,
- String desc,
- WebsiteData website) {
- FolderData fd = new FolderData(parent, name, desc, website);
- return fd;
- }
-
- public void storeFolder(FolderData folder) throws RollerException {
+ public void saveFolder(FolderData folder) throws RollerException {
if(isDuplicateFolderName(folder)) {
throw new RollerException("Duplicate folder name");
@@ -135,7 +91,7 @@
/**
* Retrieve folder and lazy-load it's sub-folders and bookmarks.
*/
- public FolderData retrieveFolder(String id) throws RollerException {
+ public FolderData getFolder(String id) throws RollerException {
return (FolderData)strategy.load(id, FolderData.class);
}
@@ -153,7 +109,7 @@
FolderData newFolder = getFolder(website, folderName);
if (newFolder == null) {
- newFolder = createFolder(
+ newFolder = new FolderData(
getRootFolder(website), folderName, folderName,
website);
this.strategy.store(newFolder);
}
@@ -196,7 +152,7 @@
// which could result in a db exception.
// TODO: Consider providing error feedback instead of silently
skipping the invalid bookmarks here.
if (null != title && null != url) {
- BookmarkData bd = createBookmark(parent,
+ BookmarkData bd = new BookmarkData(parent,
title,
desc,
url,
@@ -210,7 +166,7 @@
}
} else {
// Store a folder
- FolderData fd = createFolder(
+ FolderData fd = new FolderData(
parent,
title,
desc,
@@ -266,7 +222,7 @@
}
//----------------------------------------------------------------
- public void deleteFolderContents(FolderData src) throws RollerException {
+ public void removeFolderContents(FolderData src) throws RollerException {
// just go through the folder and remove each bookmark
Iterator srcBookmarks = src.getBookmarks().iterator();
@@ -332,16 +288,6 @@
//----------------------------------------------- FolderAssoc CRUD
- public Assoc createFolderAssoc() {
- return new FolderAssoc();
- }
-
- public Assoc createFolderAssoc(
- FolderData folder,
- FolderData ancestor,
- String relation) throws RollerException {
- return new FolderAssoc(null, folder, ancestor, relation);
- }
public FolderAssoc retrieveFolderAssoc(String id) throws RollerException {
return (FolderAssoc)strategy.load(id, FolderAssoc.class);
@@ -353,7 +299,7 @@
* @see org.roller.model.BookmarkManager#retrieveBookmarks(
* org.roller.pojos.FolderData, boolean)
*/
- public List retrieveBookmarks(FolderData folder, boolean subfolders)
+ public List getBookmarks(FolderData folder, boolean subfolders)
throws RollerException {
try {
Session session = ((HibernatePersistenceStrategy)
strategy).getSession();
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateUserManagerImpl.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateUserManagerImpl.java?rev=395377&r1=395376&r2=395377&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateUserManagerImpl.java
(original)
+++
incubator/roller/branches/roller-newbackend/src/org/roller/business/hibernate/HibernateUserManagerImpl.java
Wed Apr 19 13:03:21 2006
@@ -158,7 +158,7 @@
Iterator allFolders = bmgr.getAllFolders(website).iterator();
while (allFolders.hasNext()) {
FolderData aFolder = (FolderData)allFolders.next();
- bmgr.deleteFolderContents(aFolder);
+ bmgr.removeFolderContents(aFolder);
this.strategy.remove(aFolder);
}
}
@@ -284,8 +284,7 @@
this.strategy.store(newWeblog);
// add default bookmarks
- BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
- FolderData root = bmgr.createFolder(
+ FolderData root = new FolderData(
null, "root", "root", newWeblog);
this.strategy.store(root);
@@ -296,7 +295,7 @@
for (int i=0; i<splitroll.length; i++) {
String[] rollitems = splitroll[i].split("\\|");
if (rollitems != null && rollitems.length > 1) {
- BookmarkData b = bmgr.createBookmark(
+ BookmarkData b = new BookmarkData(
root, // parent
rollitems[0], // name
"", // description
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/model/BookmarkManager.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/model/BookmarkManager.java?rev=395377&r1=395376&r2=395377&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/src/org/roller/model/BookmarkManager.java
(original)
+++
incubator/roller/branches/roller-newbackend/src/org/roller/model/BookmarkManager.java
Wed Apr 19 13:03:21 2006
@@ -1,7 +1,6 @@
package org.roller.model;
-import java.io.Serializable;
import java.util.List;
import org.roller.RollerException;
import org.roller.pojos.Assoc;
@@ -14,33 +13,21 @@
* Interface to Bookmark Management. Provides methods for retrieving, storing,
* moving, removing and querying for folders and bookmarks.
*/
-public interface BookmarkManager extends Serializable {
+public interface BookmarkManager {
- /** Create new bookmark, NOT a persistent instance. */
- public BookmarkData createBookmark();
+ public void saveBookmark(BookmarkData bookmark) throws RollerException;
- /** Create new bookmark, NOT a persistent instance. */
- public BookmarkData createBookmark(
- FolderData parent,
- String name,
- String desc,
- String url,
- String feedUrl,
- Integer weight,
- Integer priority,
- String image) throws RollerException;
-
-
- public void storeBookmark(BookmarkData bookmark) throws RollerException;
-
-
- /** Delete bookmark by ID. */
- public void removeBookmark(String id) throws RollerException;
+ /**
+ * Delete bookmark.
+ */
+ public void removeBookmark(BookmarkData bookmark) throws RollerException;
- /** Retrieve bookmark by ID, a persistent instance. */
- public BookmarkData retrieveBookmark(String id) throws RollerException;
+ /**
+ * Retrieve bookmark by ID, a persistent instance.
+ */
+ public BookmarkData getBookmark(String id) throws RollerException;
/**
@@ -48,33 +35,11 @@
* @param subfolders
* @return
*/
- public List retrieveBookmarks(FolderData data, boolean subfolders)
+ public List getBookmarks(FolderData data, boolean subfolders)
throws RollerException;
- /** Create new folder, NOT a persistent instance. */
- public FolderData createFolder();
-
- /** Create new folder, NOT a persistent instance. */
- public FolderData createFolder(
- FolderData parent,
- String name,
- String desc,
- WebsiteData website) throws RollerException;
-
-
- /**
- * @param folder
- * @param ancestor
- * @param relation
- * @return
- */
- public Assoc createFolderAssoc(
- FolderData folder, FolderData ancestor, String relation)
- throws RollerException;
-
-
- public void storeFolder(FolderData folder) throws RollerException;
+ public void saveFolder(FolderData folder) throws RollerException;
public void removeFolder(FolderData folder) throws RollerException;
@@ -83,7 +48,7 @@
/**
* Retrieve folder by ID, a persistent instance.
*/
- public FolderData retrieveFolder(String id) throws RollerException;
+ public FolderData getFolder(String id) throws RollerException;
/**
@@ -192,10 +157,11 @@
public void moveFolderContents(FolderData src, FolderData dest)
throws RollerException;
+
/**
* Delete contents of specified folder.
*/
- public void deleteFolderContents(FolderData src) throws RollerException;
+ public void removeFolderContents(FolderData src) throws RollerException;
/**
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=395377&r1=395376&r2=395377&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
Wed Apr 19 13:03:21 2006
@@ -318,7 +318,7 @@
public List retrieveBookmarks(boolean subfolders) throws RollerException
{
BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
- return bmgr.retrieveBookmarks(this, subfolders);
+ return bmgr.getBookmarks(this, subfolders);
}
/**
@@ -351,8 +351,8 @@
HierarchicalPersistentObject associatedObject,
String relation) throws RollerException
{
- BookmarkManager bmgr = RollerFactory.getRoller().getBookmarkManager();
- return bmgr.createFolderAssoc(
+ return new FolderAssoc(
+ null,
(FolderData)object,
(FolderData)associatedObject,
relation);
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/RollerRequest.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/RollerRequest.java?rev=395377&r1=395376&r2=395377&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/RollerRequest.java
(original)
+++
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/RollerRequest.java
Wed Apr 19 13:03:21 2006
@@ -610,7 +610,7 @@
try
{
mBookmark = RollerFactory.getRoller()
- .getBookmarkManager().retrieveBookmark(id);
+ .getBookmarkManager().getBookmark(id);
}
catch (RollerException e)
{
@@ -678,7 +678,7 @@
try
{
folder = RollerFactory.getRoller()
- .getBookmarkManager().retrieveFolder(id);
+ .getBookmarkManager().getFolder(id);
}
catch (RollerException e)
{
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/BookmarkEditAction.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/BookmarkEditAction.java?rev=395377&r1=395376&r2=395377&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/BookmarkEditAction.java
(original)
+++
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/BookmarkEditAction.java
Wed Apr 19 13:03:21 2006
@@ -63,7 +63,7 @@
request.setAttribute("state","correcting");
// Folder is specified by request param, pass it on as attribute.
- parentFolder = bmgr.retrieveFolder(rreq.getFolder().getId());
+ parentFolder = bmgr.getFolder(rreq.getFolder().getId());
request.setAttribute("model", new BasePageModel(
"bookmarkForm.correct.title", request, response, mapping));
@@ -74,7 +74,7 @@
request.setAttribute("state","add");
// Folder is specified by request param, pass it on as attribute.
- parentFolder = bmgr.retrieveFolder(rreq.getFolder().getId());
+ parentFolder = bmgr.getFolder(rreq.getFolder().getId());
request.setAttribute("model", new BasePageModel(
"bookmarkForm.add.title", request, response, mapping));
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/BookmarkSaveAction.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/BookmarkSaveAction.java?rev=395377&r1=395376&r2=395377&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/BookmarkSaveAction.java
(original)
+++
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/BookmarkSaveAction.java
Wed Apr 19 13:03:21 2006
@@ -46,12 +46,12 @@
BookmarkData bd = null;
if (null != form.getId() && !form.getId().trim().equals(""))
{
- bd = bmgr.retrieveBookmark(form.getId());
+ bd = bmgr.getBookmark(form.getId());
}
else
{
- bd = bmgr.createBookmark();
- FolderData fd = bmgr.retrieveFolder(
+ bd = new BookmarkData();
+ FolderData fd = bmgr.getFolder(
request.getParameter(RollerRequest.FOLDERID_KEY));
bd.setFolder(fd);
}
@@ -60,7 +60,7 @@
rses.getAuthenticatedUser(), PermissionsData.AUTHOR))
{
form.copyTo(bd, request.getLocale());
- bmgr.storeBookmark(bd);
+ bmgr.saveBookmark(bd);
RollerFactory.getRoller().flush();
CacheManager.invalidate(bd);
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java?rev=395377&r1=395376&r2=395377&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java
(original)
+++
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/BookmarksAction.java
Wed Apr 19 13:03:21 2006
@@ -112,17 +112,19 @@
{
for (int i = 0; i < folders.length; i++)
{
- FolderData fd = bmgr.retrieveFolder(folders[i]);
+ FolderData fd = bmgr.getFolder(folders[i]);
bmgr.removeFolder(fd); // removes child folders and
bookmarks too
}
}
-
+
+ BookmarkData bookmark = null;
String bookmarks[] = form.getSelectedBookmarks();
if (null != bookmarks)
{
for (int j = 0; j < bookmarks.length; j++)
{
- bmgr.removeBookmark(bookmarks[j]);
+ bookmark = bmgr.getBookmark(bookmarks[j]);
+ bmgr.removeBookmark(bookmark);
}
}
RollerFactory.getRoller().flush();
@@ -177,19 +179,19 @@
// Move subfolders to new folder.
String folders[] = form.getSelectedFolders();
- FolderData parent =
bmgr.retrieveFolder(form.getMoveToFolderId());
+ FolderData parent = bmgr.getFolder(form.getMoveToFolderId());
if (null != folders)
{
for (int i = 0; i < folders.length; i++)
{
- FolderData fd = bmgr.retrieveFolder(folders[i]);
+ FolderData fd = bmgr.getFolder(folders[i]);
// Don't move folder into itself.
if ( !fd.getId().equals(parent.getId())
&& !parent.descendentOf(fd))
{
fd.setParent(parent);
- bmgr.storeFolder(fd);
+ bmgr.saveFolder(fd);
}
else
{
@@ -206,9 +208,9 @@
for (int j = 0; j < bookmarks.length; j++)
{
// maybe we should be using folder.addBookmark()?
- BookmarkData bd = bmgr.retrieveBookmark(bookmarks[j]);
+ BookmarkData bd = bmgr.getBookmark(bookmarks[j]);
bd.setFolder(parent);
- bmgr.storeBookmark(bd);
+ bmgr.saveBookmark(bd);
}
}
RollerFactory.getRoller().flush();
@@ -294,7 +296,7 @@
}
else
{
- folder = bmgr.retrieveFolder(folderId);
+ folder = bmgr.getFolder(folderId);
website = folder.getWebsite();
}
form.setFolderId(folder.getId());
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/FolderEditAction.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/FolderEditAction.java?rev=395377&r1=395376&r2=395377&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/FolderEditAction.java
(original)
+++
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/FolderEditAction.java
Wed Apr 19 13:03:21 2006
@@ -58,7 +58,7 @@
request.setAttribute("state","correcting");
String parentId = request.getParameter(RollerRequest.PARENTID_KEY);
- parentFolder = bmgr.retrieveFolder(parentId);
+ parentFolder = bmgr.getFolder(parentId);
BasePageModel pageModel = new BasePageModel(
"folderForm.correct.title", request, response, mapping);
@@ -71,7 +71,7 @@
request.setAttribute("state","add");
String parentId = request.getParameter(RollerRequest.PARENTID_KEY);
- parentFolder = bmgr.retrieveFolder(parentId);
+ parentFolder = bmgr.getFolder(parentId);
BasePageModel pageModel = new BasePageModel(
"folderForm.add.title", request, response, mapping);
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/FolderSaveAction.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/FolderSaveAction.java?rev=395377&r1=395376&r2=395377&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/FolderSaveAction.java
(original)
+++
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/FolderSaveAction.java
Wed Apr 19 13:03:21 2006
@@ -48,14 +48,14 @@
FolderData fd = null;
if (null != form.getId() && !form.getId().trim().equals(""))
{
- fd = bmgr.retrieveFolder(form.getId());
+ fd = bmgr.getFolder(form.getId());
website = fd.getWebsite();
}
else
{
- fd = bmgr.createFolder();
+ fd = new FolderData();
String parentId = request.getParameter(RollerRequest.PARENTID_KEY);
- FolderData parent = bmgr.retrieveFolder(parentId);
+ FolderData parent = bmgr.getFolder(parentId);
website = parent.getWebsite();
fd.setParent(parent);
fd.setWebsite(website);
@@ -66,7 +66,7 @@
{
// Copy form values to object
form.copyTo(fd, request.getLocale());
- bmgr.storeFolder(fd);
+ bmgr.saveFolder(fd);
RollerFactory.getRoller().flush();
CacheManager.invalidate(fd);
Modified:
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java?rev=395377&r1=395376&r2=395377&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java
(original)
+++
incubator/roller/branches/roller-newbackend/src/org/roller/presentation/bookmarks/actions/ImportBookmarksFormAction.java
Wed Apr 19 13:03:21 2006
@@ -164,7 +164,7 @@
String folderid = request.getParameter(RollerRequest.FOLDERID_KEY);
if (website == null && folderid != null) {
BookmarkManager bm =
RollerFactory.getRoller().getBookmarkManager();
- FolderData folder = bm.retrieveFolder(folderid);
+ FolderData folder = bm.getFolder(folderid);
website = folder.getWebsite();
}
if (website != null) {
Modified:
incubator/roller/branches/roller-newbackend/tests/org/roller/business/BookmarkManagerTest.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/BookmarkManagerTest.java?rev=395377&r1=395376&r2=395377&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/tests/org/roller/business/BookmarkManagerTest.java
(original)
+++
incubator/roller/branches/roller-newbackend/tests/org/roller/business/BookmarkManagerTest.java
Wed Apr 19 13:03:21 2006
@@ -82,15 +82,15 @@
FolderData root = bmgr.getRootFolder(testWeblog);
- folder = bmgr.createFolder();
+ folder = new FolderData();
folder.setName("TestFolder1");
folder.setDescription("created by testAddBookmarkToFolder()");
folder.setWebsite(testWeblog);
folder.setParent(root);
- bmgr.storeFolder(folder);
+ bmgr.saveFolder(folder);
// Add bookmark by adding to folder
- bookmark1 = bmgr.createBookmark(
+ bookmark1 = new BookmarkData(
folder,
"TestBookmark1",
"created by testAddBookmarkToFolder()",
@@ -102,7 +102,7 @@
folder.addBookmark(bookmark1);
// Add another bookmark
- bookmark2 = bmgr.createBookmark(
+ bookmark2 = new BookmarkData(
folder,
"TestBookmark2",
"created by testAddBookmarkToFolder()",
@@ -119,28 +119,28 @@
BookmarkData bookmarkb = null, bookmarka = null;
// See that two bookmarks were stored
- testFolder = bmgr.retrieveFolder(folder.getId());
+ testFolder = bmgr.getFolder(folder.getId());
assertEquals(2, testFolder.getBookmarks().size());
bookmarka = (BookmarkData)testFolder.getBookmarks().iterator().next();
bookmarkb = (BookmarkData)testFolder.getBookmarks().iterator().next();
// Remove one bookmark
testFolder.removeBookmark(bookmarka);
- bmgr.removeBookmark(bookmarka.getId());
+ bmgr.removeBookmark(bookmarka);
TestUtils.endSession(true);
// Folder should now contain one bookmark
- testFolder = bmgr.retrieveFolder(folder.getId());
+ testFolder = bmgr.getFolder(folder.getId());
assertEquals(1, testFolder.getBookmarks().size());
TestUtils.endSession(true);
// Remove folder
- testFolder = bmgr.retrieveFolder(folder.getId());
+ testFolder = bmgr.getFolder(folder.getId());
bmgr.removeFolder(testFolder);
TestUtils.endSession(true);
// Folder and one remaining bookmark should be gone
- assertNull( bmgr.retrieveBookmark(bookmarkb.getId()) );
- assertNull( bmgr.retrieveFolder(folder.getId()) );
+ assertNull( bmgr.getBookmark(bookmarkb.getId()) );
+ assertNull( bmgr.getFolder(folder.getId()) );
}
@@ -191,49 +191,49 @@
FolderData root = bmgr.getRootFolder(testWeblog);
- FolderData dest = bmgr.createFolder();
+ FolderData dest = new FolderData();
dest.setName("dest");
dest.setParent(root);
dest.setWebsite(testWeblog);
- bmgr.storeFolder(dest);
+ bmgr.saveFolder(dest);
// create source folder f1
- FolderData f1 = bmgr.createFolder();
+ FolderData f1 = new FolderData();
f1.setName("f1");
f1.setParent(root);
f1.setWebsite(testWeblog);
- bmgr.storeFolder(f1);
+ bmgr.saveFolder(f1);
// create bookmark b1 inside source folder f1
- BookmarkData b1 = bmgr.createBookmark(
+ BookmarkData b1 = new BookmarkData(
f1, "b1", "testbookmark",
"http://example.com";, "http://example.com/rss";,
new Integer(1), new Integer(1), "image.gif");
f1.addBookmark(b1);
// create folder f2 inside f1
- FolderData f2 = bmgr.createFolder();
+ FolderData f2 = new FolderData();
f2.setName("f2");
f2.setParent(f1);
f2.setWebsite(testWeblog);
- bmgr.storeFolder(f2);
+ bmgr.saveFolder(f2);
// create bookmark b2 inside folder f2
- BookmarkData b2 = bmgr.createBookmark(
+ BookmarkData b2 = new BookmarkData(
f2, "b2", "testbookmark",
"http://example.com";, "http://example.com/rss";,
new Integer(1), new Integer(1), "image.gif");
f2.addBookmark(b2);
// create folder f3 inside folder f2
- FolderData f3 = bmgr.createFolder();
+ FolderData f3 = new FolderData();
f3.setName("f3");
f3.setParent(f2);
f3.setWebsite(testWeblog);
- bmgr.storeFolder(f3);
+ bmgr.saveFolder(f3);
// crete bookmark b3 inside folder f3
- BookmarkData b3 = bmgr.createBookmark(
+ BookmarkData b3 = new BookmarkData(
f3, "b3", "testbookmark",
"http://example.com";, "http://example.com/rss";,
new Integer(1), new Integer(1), "image.gif");
@@ -246,8 +246,8 @@
try {
// Move folder into one of it's children
- f1 = bmgr.retrieveFolder(f1.getId());
- f3 = bmgr.retrieveFolder(f3.getId());
+ f1 = bmgr.getFolder(f1.getId());
+ f3 = bmgr.getFolder(f3.getId());
bmgr.moveFolderContents(f1, f3);
//f3.save();
//f1.save();
@@ -258,8 +258,8 @@
assertTrue(safe);
// verify number of entries in each folder
- dest = bmgr.retrieveFolder(dest.getId());
- f1 = bmgr.retrieveFolder(f1.getId());
+ dest = bmgr.getFolder(dest.getId());
+ f1 = bmgr.getFolder(f1.getId());
assertEquals(0, dest.retrieveBookmarks(true).size());
assertEquals(0, dest.retrieveBookmarks(false).size());
assertEquals(1, f1.retrieveBookmarks(false).size());
@@ -269,13 +269,13 @@
// move contents of source category c1 to destination catetory dest
f1.moveContents(dest);
- bmgr.storeFolder(f1);
- bmgr.storeFolder(dest);
+ bmgr.saveFolder(f1);
+ bmgr.saveFolder(dest);
TestUtils.endSession(true);
// after move, verify number of entries in eacch folder
- dest = bmgr.retrieveFolder(dest.getId());
- f1 = bmgr.retrieveFolder(f1.getId());
+ dest = bmgr.getFolder(dest.getId());
+ f1 = bmgr.getFolder(f1.getId());
assertEquals(3, dest.retrieveBookmarks(true).size());
assertEquals(3, dest.retrieveBookmarks(false).size());
assertEquals(0, f1.retrieveBookmarks(true).size());
@@ -291,23 +291,23 @@
try {
FolderData root = bmgr.getRootFolder(testWeblog);
- FolderData f1 = bmgr.createFolder();
+ FolderData f1 = new FolderData();
f1.setName("f1");
f1.setParent(root);
f1.setWebsite(testWeblog);
- bmgr.storeFolder(f1);
+ bmgr.saveFolder(f1);
- FolderData f2 = bmgr.createFolder();
+ FolderData f2 = new FolderData();
f2.setName("f2");
f2.setParent(f1);
f2.setWebsite(testWeblog);
- bmgr.storeFolder(f2);
+ bmgr.saveFolder(f2);
- FolderData f3 = bmgr.createFolder();
+ FolderData f3 = new FolderData();
f3.setName("f3");
f3.setParent(f2);
f3.setWebsite(testWeblog);
- bmgr.storeFolder(f3);
+ bmgr.saveFolder(f3);
TestUtils.endSession(true);
} catch (RollerException e) {
@@ -344,27 +344,27 @@
try {
FolderData root = bmgr.getRootFolder(testWeblog);
- FolderData f1 = bmgr.createFolder();
+ FolderData f1 = new FolderData();
f1.setName("f1");
f1.setParent(root);
f1.setWebsite(testWeblog);
- bmgr.storeFolder(f1);
+ bmgr.saveFolder(f1);
// first child folder
- FolderData f2 = bmgr.createFolder();
+ FolderData f2 = new FolderData();
f2.setName("f2");
f2.setParent(f1);
f2.setWebsite(testWeblog);
- bmgr.storeFolder(f2);
+ bmgr.saveFolder(f2);
TestUtils.endSession(true);
// child folder with same name as first
- f3 = bmgr.createFolder();
+ f3 = new FolderData();
f3.setName("f2");
f3.setParent(f1);
f3.setWebsite(testWeblog);
- bmgr.storeFolder(f3);
+ bmgr.saveFolder(f3);
TestUtils.endSession(true);
} catch (RollerException e) {
