roller/src/org/roller/business/prevayler/commands/folders MoveFolderCommand.java,1.1,1.2 MoveFolderContentsCommand.java,1.1,1.2

Update of 
/cvsroot/roller/roller/src/org/roller/business/prevayler/commands/folders
In directory 
sc8-pr-cvs1:/tmp/cvs-serv17107/src/org/roller/business/prevayler/commands/folders

Modified Files:
        MoveFolderCommand.java MoveFolderContentsCommand.java 
Log Message:
Fix up the Prevayler classes to work with Dave's refactoring.

Index: MoveFolderCommand.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/business/prevayler/commands/folders/MoveFolderCommand.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MoveFolderCommand.java      12 Mar 2003 19:25:54 -0000      1.1
--- MoveFolderCommand.java      25 Mar 2003 16:23:43 -0000      1.2
***************
*** 44,52 ****
          HashMap folders = mgr.getFolders();
          BookmarkData bookmark = (BookmarkData)bookmarks.get(bookmarkId);
!         FolderData oldFolder = 
(FolderData)folders.get(bookmark.getFolderId());
          FolderData newFolder = (FolderData)folders.get(folderId);
          if (bookmark != null && oldFolder != null && newFolder != null)
          {
!             bookmark.setFolderId(folderId);
              oldFolder.getBookmarks().remove(bookmark);
              newFolder.getBookmarks().add(bookmark);
--- 44,52 ----
          HashMap folders = mgr.getFolders();
          BookmarkData bookmark = (BookmarkData)bookmarks.get(bookmarkId);
!         FolderData oldFolder = 
(FolderData)folders.get(bookmark.getFolder().getId());
          FolderData newFolder = (FolderData)folders.get(folderId);
          if (bookmark != null && oldFolder != null && newFolder != null)
          {
!             bookmark.setFolder(newFolder);
              oldFolder.getBookmarks().remove(bookmark);
              newFolder.getBookmarks().add(bookmark);

Index: MoveFolderContentsCommand.java
===================================================================
RCS file: 
/cvsroot/roller/roller/src/org/roller/business/prevayler/commands/folders/MoveFolderContentsCommand.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MoveFolderContentsCommand.java      12 Mar 2003 19:25:54 -0000      1.1
--- MoveFolderContentsCommand.java      25 Mar 2003 16:23:43 -0000      1.2
***************
*** 59,63 ****
                  if (bookmark != null)
                  {
!                     bookmark.setFolderId(newFolderId);
                      oldFolder.getBookmarks().remove(bookmark);
                      newFolder.getBookmarks().add(bookmark);
--- 59,63 ----
                  if (bookmark != null)
                  {
!                     bookmark.setFolder(newFolder);
                      oldFolder.getBookmarks().remove(bookmark);
                      newFolder.getBookmarks().add(bookmark);




-------------------------------------------------------
This SF.net email is sponsored by:
The Definitive IT and Networking Event. Be There!
NetWorld+Interop Las Vegas 2003 -- Register today!
http://ads.sourceforge.net/cgi-bin/redirect.pl?keyn0001en