Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter
In directory
james.mmbase.org:/tmp/cvs-serv26765/portlets-newsletter/src/java/com/finalist/portlets/newsletter
Modified Files:
NewsletterContentPortlet.java
Log Message:
CMSC-755 Navigation code refactored to use navigationitem
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-755
Index: NewsletterContentPortlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter/NewsletterContentPortlet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- NewsletterContentPortlet.java 16 Jan 2008 19:15:18 -0000 1.13
+++ NewsletterContentPortlet.java 28 Jan 2008 21:15:31 -0000 1.14
@@ -13,6 +13,7 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
+import com.finalist.cmsc.beans.om.NavigationItem;
import com.finalist.cmsc.beans.om.Page;
import com.finalist.cmsc.portalImpl.PortalConstants;
import com.finalist.cmsc.portlets.AbstractContentPortlet;
@@ -70,15 +71,15 @@
String duplicateHandling = preferences.getValue(DUPLICATE_HANDLING_TYPE,
null);
String currentPath = getUrlPath(request);
- Page result = SiteManagement.getPageFromPath(currentPath);
+ NavigationItem result =
SiteManagement.getNavigationItemFromPath(currentPath);
if (result != null) {
- int pageNumber = result.getId();
+ int itemNumber = result.getId();
- if (NewsletterUtil.isNewsletterOrPublication(pageNumber)) {
+ if (NewsletterUtil.isNewsletterOrPublication(itemNumber)) {
String displayType = determineDisplayType(request);
- int defaultTheme = NewsletterUtil.getDefaultTheme(pageNumber);
+ int defaultTheme = NewsletterUtil.getDefaultTheme(itemNumber);
List<Integer> defaultArticles =
NewsletterUtil.getArticlesForTheme(defaultTheme);
if (defaultArticles != null && defaultArticles.size() > 0) {
request.setAttribute(KEY_DEFAULTTHEME, defaultTheme);
@@ -86,12 +87,12 @@
}
List<Integer> additionalThemes = null;
- List<Integer> availableThemes =
NewsletterUtil.getAllThemes(pageNumber);
+ List<Integer> availableThemes =
NewsletterUtil.getAllThemes(itemNumber);
if (availableThemes != null && availableThemes.size() > 0) {
if (displayType.equals(DISPLAYTYPE_PERSONALIZED)) {
String userName = getUserName(session);
if (userName != null) {
- additionalThemes =
NewsletterSubscriptionUtil.compareToUserSubscribedThemes(availableThemes,
userName, pageNumber);
+ additionalThemes =
NewsletterSubscriptionUtil.compareToUserSubscribedThemes(availableThemes,
userName, itemNumber);
}
} else {
additionalThemes = availableThemes;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
