svn commit: r620556 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java

[snoopdave]

Author: snoopdave
Date: Mon Feb 11 09:55:00 2008
New Revision: 620556

URL: http://svn.apache.org/viewvc?rev=620556&view=rev
Log:
Fix for ROL-1665: Site Model methods should accept WeblogWrapper args
http://opensource.atlassian.com/projects/roller/browse/ROL-1665

Modified:
    
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java

Modified: 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java?rev=620556&r1=620555&r2=620556&view=diff
==============================================================================
--- 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
 (original)
+++ 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
 Mon Feb 11 09:55:00 2008
@@ -144,7 +144,7 @@
      * @param sinceDays   Limit to past X days in past (or -1 for no limit)
      * @param length      Max number of results to return
      */   
-    public Pager getWeblogEntriesPager(Weblog queryWeblog, int sinceDays, int 
length) {
+    public Pager getWeblogEntriesPager(WeblogWrapper queryWeblog, int 
sinceDays, int length) {
         return getWeblogEntriesPager(queryWeblog, null, null, sinceDays, 
length);
     }
 
@@ -156,7 +156,7 @@
      * @param sinceDays   Limit to past X days in past (or -1 for no limit)
      * @param length      Max number of results to return
      */   
-    public Pager getWeblogEntriesPager(Weblog queryWeblog, User user, int 
sinceDays, int length) {
+    public Pager getWeblogEntriesPager(WeblogWrapper queryWeblog, User user, 
int sinceDays, int length) {
         return getWeblogEntriesPager(queryWeblog, user, null, sinceDays, 
length);
     }
 
@@ -169,7 +169,7 @@
      * @param sinceDays   Limit to past X days in past (or -1 for no limit)
      * @param length      Max number of results to return
      */   
-    public Pager getWeblogEntriesPager(Weblog queryWeblog, User user, String 
cat, int sinceDays, int length) {
+    public Pager getWeblogEntriesPager(WeblogWrapper queryWeblog, User user, 
String cat, int sinceDays, int length) {
         
         String pagerUrl = null;
         if (feedRequest != null) {
@@ -185,7 +185,7 @@
        
         return new WeblogEntriesListPager(
             urlStrategy,
-            pagerUrl, queryWeblog, user, cat,
+            pagerUrl, queryWeblog.getPojo(), user, cat,
             tags,
             weblogRequest.getLocale(),
             sinceDays,