You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ag...@apache.org on 2006/07/14 01:32:38 UTC
svn commit: r421731 - in
/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model:
FeedModel.java PageModel.java
Author: agilliland
Date: Thu Jul 13 16:32:37 2006
New Revision: 421731
URL: http://svn.apache.org/viewvc?rev=421731&view=rev
Log:
updating models to better leverage functionality already provided in parsed request objects. this makes things a bit easier by eliminating duplication of effort.
Modified:
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedModel.java
incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/PageModel.java
Modified: incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedModel.java?rev=421731&r1=421730&r2=421731&view=diff
==============================================================================
--- incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedModel.java (original)
+++ incubator/roller/branches/roller_3.0/src/org/apache/roller/ui/rendering/model/FeedModel.java Thu Jul 13 16:32:37 2006
@@ -47,25 +47,19 @@
private static Log log = LogFactory.getLog(FeedModel.class);
+ private WeblogFeedRequest feedRequest = null;
private WebsiteData weblog = null;
- private String categoryPath = null;
- private String locale = null;
public void init(Map initData) throws RollerException {
// we expect the init data to contain a feedRequest object
- WeblogFeedRequest parsed = (WeblogFeedRequest) initData.get("feedRequest");
- if(parsed == null) {
+ this.feedRequest = (WeblogFeedRequest) initData.get("feedRequest");
+ if(this.feedRequest == null) {
throw new RollerException("expected feedRequest from init data");
}
- categoryPath = parsed.getWeblogCategoryName();
- locale = parsed.getLocale();
-
- Roller roller = RollerFactory.getRoller();
- UserManager umgr = roller.getUserManager();
- weblog = umgr.getWebsiteByHandle(parsed.getWeblogHandle(), Boolean.TRUE);
+ weblog = feedRequest.getWeblog();
}
@@ -87,7 +81,7 @@
* Get category path or name specified by request.
*/
public String getCategoryPath() {
- return categoryPath;
+ return feedRequest.getWeblogCategoryName();
}
/**
@@ -100,8 +94,15 @@
Roller roller = RollerFactory.getRoller();
WeblogManager wmgr = roller.getWeblogManager();
List entries = wmgr.getWeblogEntries(weblog,
- null, null, new Date(), categoryPath, WeblogEntryData.PUBLISHED,
- "pubTime", locale, 0, weblog.getEntryDisplayCount());
+ null,
+ null,
+ new Date(),
+ feedRequest.getWeblogCategoryName(),
+ WeblogEntryData.PUBLISHED,
+ "pubTime",
+ feedRequest.getLocale(),
+ 0,
+ weblog.getEntryDisplayCount());
for (Iterator it = entries.iterator(); it.hasNext();) {
WeblogEntryData entry = (WeblogEntryData) it.next();
results.add(WeblogEntryDataWrapper.wrap(entry));
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=421731&r1=421730&r2=421731&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 Thu Jul 13 16:32:37 2006
@@ -52,20 +52,11 @@
*/
public class PageModel implements Model {
- protected static Log log = LogFactory.getLog(PageModel.class);
- private HttpServletRequest request = null;
- private WebsiteData weblog = null;
- private WeblogEntryData entry = null;
- private String cat = null;
- private String entryAnchor = null;
- private String dateString = null;
- private String weblogPage = null;
- private String locale = null;
- private int page = 0;
- private WeblogEntryDataWrapper nextEntry = null;
- private WeblogEntryDataWrapper prevEntry = null;
- private WeblogEntryDataWrapper firstEntry = null;
- private WeblogEntryDataWrapper lastEntry = null;
+ private static Log log = LogFactory.getLog(PageModel.class);
+
+ private HttpServletRequest request = null;
+ private WeblogPageRequest pageRequest = null;
+ private WebsiteData weblog = null;
/**
@@ -92,26 +83,16 @@
this.request = request;
// we expect the init data to contain a pageRequest object
- WeblogPageRequest parsed = (WeblogPageRequest) initData.get("pageRequest");
- if(parsed == null) {
+ this.pageRequest = (WeblogPageRequest) initData.get("pageRequest");
+ if(this.pageRequest == null) {
throw new RollerException("expected pageRequest from init data");
}
- cat = parsed.getWeblogCategoryName();
- entryAnchor = parsed.getWeblogAnchor();
- dateString = parsed.getWeblogDate();
- weblogPage = parsed.getWeblogPageName();
- locale = parsed.getLocale();
- page = parsed.getPageNum();
-
- // lookup weblog object
- Roller roller = RollerFactory.getRoller();
- UserManager umgr = roller.getUserManager();
- weblog = umgr.getWebsiteByHandle(parsed.getWeblogHandle(), Boolean.TRUE);
-
-
+ // extract weblog object
+ weblog = pageRequest.getWeblog();
}
+
/**
* Get weblog being displayed.
*/
@@ -121,51 +102,44 @@
/**
+ * Is this page considered a permalink?
+ */
+ public boolean isPermalink() {
+ return (pageRequest.getWeblogAnchor() != null);
+ }
+
+
+ /**
* Get weblog entry being displayed or null if none specified by request.
*/
- public WeblogEntryDataWrapper getWeblogEntry() {
- WeblogEntryDataWrapper ret = null;
- if (entryAnchor != null) {
- Roller roller = RollerFactory.getRoller();
- try {
- WeblogManager wmgr = roller.getWeblogManager();
- WeblogEntryData entry = wmgr.getWeblogEntryByAnchor(weblog, entryAnchor);
- ret = WeblogEntryDataWrapper.wrap(entry);
- } catch (RollerException e) {
- log.error("ERROR: getting weblog entry");
- }
- }
- return ret;
+ public WeblogEntryDataWrapper getWeblogEntry() {
+ return WeblogEntryDataWrapper.wrap(pageRequest.getWeblogEntry());
}
/**
* Get weblog entry being displayed or null if none specified by request.
*/
- public TemplateWrapper getWeblogPage() {
- TemplateWrapper ret = null;
- try {
- if (weblogPage != null) {
- Roller roller = RollerFactory.getRoller();
- UserManager umgr = roller.getUserManager();
- WeblogTemplate template = umgr.getPageByName(weblog, weblogPage);
- ret = TemplateWrapper.wrap(template);
-
- } else {
- ret = TemplateWrapper.wrap(weblog.getDefaultPage());
- }
- } catch (RollerException e) {
- log.error("ERROR: getting page template");
+ public TemplateWrapper getWeblogPage() {
+ if(pageRequest.getWeblogPageName() != null) {
+ return TemplateWrapper.wrap(pageRequest.getWeblogPage());
+ } else {
+ try {
+ return TemplateWrapper.wrap(weblog.getDefaultPage());
+ } catch (RollerException ex) {
+ log.error("Error getting default page", ex);
+ }
}
- return ret;
+ return null;
}
/**
- * Is this page considered a permalink?
+ * Get weblog category specified by request, or null if the category path
+ * found in the request does not exist in the current weblog.
*/
- public boolean isPermalink() {
- return entryAnchor != null;
+ public WeblogCategoryDataWrapper getWeblogCategory() {
+ return WeblogCategoryDataWrapper.wrap(pageRequest.getWeblogCategory());
}
@@ -177,8 +151,13 @@
*/
public WeblogEntriesPager getWeblogEntriesPager(String catArgument) {
// category specified by argument wins over request parameter
- String chosenCat = (catArgument != null) ? catArgument : cat;
- return new WeblogEntriesPagerImpl(weblog, dateString, entryAnchor, chosenCat, locale, page);
+ String chosenCat = (catArgument != null) ? catArgument : pageRequest.getWeblogCategoryName();
+ return new WeblogEntriesPagerImpl(weblog,
+ pageRequest.getWeblogDate(),
+ pageRequest.getWeblogAnchor(),
+ chosenCat,
+ pageRequest.getLocale(),
+ pageRequest.getPageNum());
}
@@ -189,26 +168,6 @@
*/
public WeblogEntriesPager getWeblogEntriesPager() {
return getWeblogEntriesPager(null);
- }
-
-
- /**
- * Get weblog category specified by request, or null if the category path
- * found in the request does not exist in the current weblog.
- */
- public WeblogCategoryDataWrapper getWeblogCategory() {
- WeblogCategoryDataWrapper ret = null;
- try {
- Roller roller = RollerFactory.getRoller();
- WeblogManager wmgr = roller.getWeblogManager();
- WeblogCategoryData category = wmgr.getWeblogCategoryByPath(weblog, cat);
- if (category != null) {
- ret = WeblogCategoryDataWrapper.wrap(category);
- }
- } catch (Exception e) {
- log.error("ERROR: fetching category");
- }
- return ret;
}