Return-Path: Delivered-To: apmail-roller-commits-archive@www.apache.org Received: (qmail 50589 invoked from network); 26 Jul 2007 14:37:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Jul 2007 14:37:29 -0000 Received: (qmail 4763 invoked by uid 500); 26 Jul 2007 14:37:30 -0000 Delivered-To: apmail-roller-commits-archive@roller.apache.org Received: (qmail 4726 invoked by uid 500); 26 Jul 2007 14:37:30 -0000 Mailing-List: contact commits-help@roller.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@roller.apache.org Delivered-To: mailing list commits@roller.apache.org Received: (qmail 4715 invoked by uid 99); 26 Jul 2007 14:37:30 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jul 2007 07:37:30 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jul 2007 07:37:29 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 083571A981A; Thu, 26 Jul 2007 07:37:09 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r559835 - in /roller/trunk/apps/weblogger: src/java/org/apache/roller/weblogger/pojos/wrapper/WeblogBookmarkFolderWrapper.java web/WEB-INF/velocity/weblog.vm Date: Thu, 26 Jul 2007 14:37:08 -0000 To: commits@roller.apache.org From: snoopdave@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070726143709.083571A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: snoopdave Date: Thu Jul 26 07:37:07 2007 New Revision: 559835 URL: http://svn.apache.org/viewvc?view=rev&rev=559835 Log: Fix for ROL-548 - Bookmark display macro not obeying sort order 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=559835&r1=559834&r2=559835 ============================================================================== --- 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 07:37:07 2007 @@ -22,7 +22,9 @@ import java.util.Iterator; import java.util.List; import java.util.Set; +import java.util.TreeSet; import org.apache.roller.weblogger.WebloggerException; +import org.apache.roller.weblogger.pojos.BookmarkComparator; import org.apache.roller.weblogger.pojos.WeblogBookmark; import org.apache.roller.weblogger.pojos.WeblogBookmarkFolder; @@ -115,7 +117,24 @@ return wrappedCollection; } - + public List getBookmarksSorted() { + TreeSet initialCollection = new TreeSet(new BookmarkComparator()); + initialCollection.addAll(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 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=559835&r1=559834&r2=559835 ============================================================================== --- roller/trunk/apps/weblogger/web/WEB-INF/velocity/weblog.vm (original) +++ roller/trunk/apps/weblogger/web/WEB-INF/velocity/weblog.vm Thu Jul 26 07:37:07 2007 @@ -366,7 +366,7 @@ *# #macro(_showBookmarkLinksList $folderObject $subfolders $expanding ) #if ($expanding) #_showCommonJavascript() #end - #set($bookmarks = $folderObject.getBookmarks()) + #set($bookmarks = $folderObject.getBookmarksSorted()) #set($folders = $folderObject.getFolders()) #set($divId = $utils.replace($folderObject.name, " ", "_" )) #if ($folderObject.name != "root" && $expanding && $subfolders && ($folderObject.getBookmarks().size() > 0 || $folderObject.getFolders().size() > 0))