You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/07/31 21:05:08 UTC
svn commit: r427213 -
/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/
Author: snoopdave
Date: Mon Jul 31 12:05:07 2006
New Revision: 427213
URL: http://svn.apache.org/viewvc?rev=427213&view=rev
Log:
Let weblog entry pager keep its original name
Added:
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesListPager.java
- copied, changed from r427199, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPager.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPagerImpl.java
- copied, changed from r427199, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesMapPagerImpl.java
Removed:
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesMapPager.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesMapPagerImpl.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPager.java
Modified:
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageModel.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsModel.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsPager.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SiteModel.java
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageModel.java?rev=427213&r1=427212&r2=427213&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageModel.java Mon Jul 31 12:05:07 2006
@@ -156,7 +156,7 @@
* date they were published.
* @param catArgument Category restriction (null or "nil" for no restriction)
*/
- public WeblogEntriesMapPager getWeblogEntriesPager(String catArgument) {
+ public WeblogEntriesPager getWeblogEntriesPager(String catArgument) {
// category specified by argument wins over request parameter
WeblogCategoryData chosenCat = null;
if (catArgument != null) {
@@ -168,7 +168,7 @@
log.debug("Ignoring unknown category restriction");
}
}
- return new WeblogEntriesMapPagerImpl(
+ return new WeblogEntriesPagerImpl(
weblog,
pageRequest.getWeblogPage(),
pageRequest.getWeblogEntry(),
@@ -184,7 +184,7 @@
* days of entries. Each value is a list of entry objects keyed by the
* date they were published.
*/
- public WeblogEntriesMapPager getWeblogEntriesPager() {
+ public WeblogEntriesPager getWeblogEntriesPager() {
return getWeblogEntriesPager(null);
}
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsModel.java?rev=427213&r1=427212&r2=427213&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsModel.java Mon Jul 31 12:05:07 2006
@@ -120,12 +120,12 @@
}
// override page model and return search results pager
- public WeblogEntriesMapPager getWeblogEntriesPager() {
+ public WeblogEntriesPager getWeblogEntriesPager() {
return pager;
}
// override page model and return search results pager
- public WeblogEntriesMapPager getWeblogEntriesPager(String category) {
+ public WeblogEntriesPager getWeblogEntriesPager(String category) {
return pager;
}
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsPager.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsPager.java?rev=427213&r1=427212&r2=427213&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsPager.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SearchResultsPager.java Mon Jul 31 12:05:07 2006
@@ -28,7 +28,7 @@
/**
* Pager for navigating through search results.
*/
-public class SearchResultsPager implements WeblogEntriesMapPager {
+public class SearchResultsPager implements WeblogEntriesPager {
private Map entries = null;
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SiteModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SiteModel.java?rev=427213&r1=427212&r2=427213&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SiteModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/SiteModel.java Mon Jul 31 12:05:07 2006
@@ -73,7 +73,7 @@
* @param length Max number of results to return
*/
public Pager getWeblogEntriesPager(int sinceDays, int length) {
- return new WeblogEntriesPager(
+ return new WeblogEntriesListPager(
weblog, null, null, null,
pageRequest.getWeblogPage(),
pageRequest.getLocale(),
@@ -93,7 +93,7 @@
* @param length Max number of results to return
*/
public Pager getWeblogEntriesPager(WebsiteData queryWeblog, UserData user, String cat, int sinceDays, int length) {
- return new WeblogEntriesPager(
+ return new WeblogEntriesListPager(
weblog, queryWeblog, user, cat,
pageRequest.getWeblogPage(),
pageRequest.getLocale(),
Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesListPager.java (from r427199, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPager.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesListPager.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesListPager.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPager.java&r1=427199&r2=427213&rev=427213&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPager.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesListPager.java Mon Jul 31 12:05:07 2006
@@ -38,7 +38,7 @@
/**
* Simple pager for list of weblog entries.
*/
-public class WeblogEntriesPager extends AbstractPager {
+public class WeblogEntriesListPager extends AbstractPager {
private WebsiteData queryWeblog;
private UserData queryUser;
private String queryCat;
@@ -46,7 +46,7 @@
protected static Log log =
LogFactory.getFactory().getInstance(PlanetEntriesPager.class);
- public WeblogEntriesPager(
+ public WeblogEntriesListPager(
WebsiteData weblog,
WebsiteData queryWeblog,
UserData queryUser,
Copied: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPagerImpl.java (from r427199, incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesMapPagerImpl.java)
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPagerImpl.java?p2=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPagerImpl.java&p1=incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesMapPagerImpl.java&r1=427199&r2=427213&rev=427213&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesMapPagerImpl.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/WeblogEntriesPagerImpl.java Mon Jul 31 12:05:07 2006
@@ -53,13 +53,13 @@
* Collection returned is a list of lists of entries, where each list of
* entries represents one day.
*/
-public class WeblogEntriesMapPagerImpl implements WeblogEntriesMapPager {
+public class WeblogEntriesPagerImpl implements WeblogEntriesPager {
/**
* Behavior of the pager is detemined by the mode, which is itself a pager.
* The mode may be LatestMode, SingleEntryMode, DayMode or MonthMode.
*/
- protected WeblogEntriesMapPager mode = null;
+ protected WeblogEntriesPager mode = null;
protected Map entries = null;
protected WebsiteData weblog = null;
protected WeblogTemplate weblogPage = null;
@@ -73,7 +73,7 @@
protected int length = 0;
protected static Log log =
- LogFactory.getFactory().getInstance(WeblogEntriesMapPagerImpl.class);
+ LogFactory.getFactory().getInstance(WeblogEntriesPagerImpl.class);
private static ResourceBundle bundle =
ResourceBundle.getBundle("ApplicationResources");
@@ -83,7 +83,7 @@
private SimpleDateFormat monthFormat = new SimpleDateFormat(
bundle.getString("weblogEntriesPager.month.dateFormat"));
- public WeblogEntriesMapPagerImpl(
+ public WeblogEntriesPagerImpl(
WebsiteData weblog,
WeblogTemplate weblogPage,
WeblogEntryData entry,
@@ -168,7 +168,7 @@
* We're paging through the latest entries in the blog.
* In this mode there's no prev/next collection.
*/
- class LatestMode implements WeblogEntriesMapPager {
+ class LatestMode implements WeblogEntriesPager {
public LatestMode() {
LatestMode.this.getEntries();
@@ -238,7 +238,7 @@
* Next/prev return permalinks of next and previous weblog entries.
* In this mode there's no prev/next collection.
*/
- class SingleEntryMode implements WeblogEntriesMapPager {
+ class SingleEntryMode implements WeblogEntriesPager {
String nextLink = null;
WeblogEntryData nextEntry = null;
WeblogEntryData prevEntry = null;
@@ -364,7 +364,7 @@
* Next/prev methods return links to offsets within day's entries.
* Next/prev collection methods return links to next and previous days.
*/
- class DayMode implements WeblogEntriesMapPager {
+ class DayMode implements WeblogEntriesPager {
private Date day;
private Date nextDay;
private Date prevDay;
@@ -481,7 +481,7 @@
* Next/prev methods return links to offsets within month's entries.
* Next/prev collection methods return links to next and previous months.
*/
- class MonthMode implements WeblogEntriesMapPager {
+ class MonthMode implements WeblogEntriesPager {
private Date month;
private Date nextMonth;
private Date prevMonth;