svn commit: r548499 - in /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering: model/PageModel.java pagers/WeblogEntriesLatestPager.java

[agilliland]

Author: agilliland
Date: Mon Jun 18 14:50:03 2007
New Revision: 548499

URL: http://svn.apache.org/viewvc?view=rev&rev=548499
Log:
code formatting.


Modified:
    
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java
    
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java

Modified: 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java?view=diff&rev=548499&r1=548498&r2=548499
==============================================================================
--- 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java
 (original)
+++ 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/PageModel.java
 Mon Jun 18 14:50:03 2007
@@ -176,6 +176,24 @@
     
     
     /**
+     * Returns the list of tags specified in the request /tags/foo+bar
+     */
+    public List getTags() {
+        return pageRequest.getTags();
+    }
+    
+    
+    /**
+     * A map of entries representing this page. The collection is grouped by 
+     * days of entries.  Each value is a list of entry objects keyed by the 
+     * date they were published.
+     */
+    public WeblogEntriesPager getWeblogEntriesPager() {
+        return getWeblogEntriesPager(null);
+    }
+    
+    
+    /**
      * A map of entries representing this page - with entries restricted by 
category.
      * The collection is grouped by days of entries.  
      * Each value is a list of entry objects keyed by the date they were 
published.
@@ -184,7 +202,8 @@
     public WeblogEntriesPager getWeblogEntriesPager(String catArgument) {
         return getWeblogEntriesPager(catArgument, null);
     }
-
+    
+    
     /**
      * A map of entries representing this page - with entries restricted by 
tag.
      * The collection is grouped by days of entries.  
@@ -195,6 +214,7 @@
         return getWeblogEntriesPager(null, tagArgument);
     }
     
+    
     private WeblogEntriesPager getWeblogEntriesPager(String catArgument, 
String tagArgument) {
         
         // category specified by argument wins over request parameter
@@ -255,16 +275,6 @@
                     pageRequest.getPageNum());
         }
     }
-    
-    
-    /**
-     * A map of entries representing this page. The collection is grouped by 
-     * days of entries.  Each value is a list of entry objects keyed by the 
-     * date they were published.
-     */
-    public WeblogEntriesPager getWeblogEntriesPager() {
-        return getWeblogEntriesPager(null);
-    }
         
     
     /**
@@ -291,11 +301,4 @@
         return null;
     }
     
-    /**
-     * Returns the list of tags specified in the request /tags/foo+bar
-     * @return
-     */
-    public List getTags() {
-        return pageRequest.getTags();
-    }    
 }

Modified: 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java
URL: 
http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java?view=diff&rev=548499&r1=548498&r2=548499
==============================================================================
--- 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java
 (original)
+++ 
roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/pagers/WeblogEntriesLatestPager.java
 Mon Jun 18 14:50:03 2007
@@ -38,7 +38,7 @@
 
 
 /**
- *
+ * A pager over a collection of recent weblog entries.
  */
 public class WeblogEntriesLatestPager extends AbstractWeblogEntriesPager {
     
@@ -76,12 +76,12 @@
                 Roller roller = RollerFactory.getRoller();
                 WeblogManager wmgr = roller.getWeblogManager();
                 Map mmap = 
RollerFactory.getRoller().getWeblogManager().getWeblogEntryObjectMap(
-                        
                         weblog,
                         null,
                         new Date(),
                         catPath,
-                        tags,WeblogEntry.PUBLISHED,
+                        tags,
+                        WeblogEntry.PUBLISHED,
                         locale,
                         offset,
                         length + 1);