Author: snoopdave
Date: Thu Jul 26 10:04:34 2007
New Revision: 559884
URL: http://svn.apache.org/viewvc?view=rev&rev=559884
Log:
Better fix for ROL-548 - Bookmark display macro not obeying sort order
This one does not introduce a new getBookmarks() method, instead the folder
wrapper's getBookmarks() method does the sorting.
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkFolderWrapper.java
roller/trunk/apps/weblogger/web/WEB-INF/velocity/weblog.vm
Modified:
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkFolderWrapper.java
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkFolderWrapper.java?view=diff&rev=559884&r1=559883&r2=559884
==============================================================================
---
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkFolderWrapper.java
(original)
+++
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkFolderWrapper.java
Thu Jul 26 10:04:34 2007
@@ -99,25 +99,8 @@
return wrappedCollection;
}
-
- public List getBookmarks() {
- Set initialCollection = this.pojo.getBookmarks();
- // iterate through and wrap
- // we force the use of an ArrayList because it should be good enough
to cover
- // for any Collection type we encounter.
- ArrayList wrappedCollection = new ArrayList(initialCollection.size());
- Iterator it = initialCollection.iterator();
- int i = 0;
- while(it.hasNext()) {
-
wrappedCollection.add(i,WeblogBookmarkWrapper.wrap((WeblogBookmark) it.next()));
- i++;
- }
-
- return wrappedCollection;
- }
-
- public List getBookmarksSorted() {
+ public List getBookmarks() {
TreeSet initialCollection = new TreeSet(new BookmarkComparator());
initialCollection.addAll(this.pojo.getBookmarks());
@@ -135,6 +118,7 @@
return wrappedCollection;
}
+
public List retrieveBookmarks(boolean subfolders)
throws WebloggerException {
Modified: roller/trunk/apps/weblogger/web/WEB-INF/velocity/weblog.vm
URL:
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/web/WEB-INF/velocity/weblog.vm?view=diff&rev=559884&r1=559883&r2=559884
==============================================================================
--- roller/trunk/apps/weblogger/web/WEB-INF/velocity/weblog.vm (original)
+++ roller/trunk/apps/weblogger/web/WEB-INF/velocity/weblog.vm Thu Jul 26
10:04:34 2007
@@ -366,7 +366,7 @@
*#
#macro(_showBookmarkLinksList $folderObject $subfolders $expanding )
#if ($expanding) #_showCommonJavascript() #end
- #set($bookmarks = $folderObject.getBookmarksSorted())
+ #set($bookmarks = $folderObject.getBookmarks())
#set($folders = $folderObject.getFolders())
#set($divId = $utils.replace($folderObject.name, " ", "_" ))
#if ($folderObject.name != "root" && $expanding && $subfolders &&
($folderObject.getBookmarks().size() > 0 || $folderObject.getFolders().size() >
0))
