Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter
In directory
james.mmbase.org:/tmp/cvs-serv5652/portlets-newsletter/src/java/com/finalist/portlets/newsletter
Modified Files:
NewsletterSubscriptionPortlet.java
Log Message:
CMSC-818 modify portlet.
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-818
Index: NewsletterSubscriptionPortlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter/NewsletterSubscriptionPortlet.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- NewsletterSubscriptionPortlet.java 18 Apr 2008 08:30:52 -0000 1.20
+++ NewsletterSubscriptionPortlet.java 22 Apr 2008 03:00:05 -0000 1.21
@@ -4,6 +4,7 @@
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import java.util.Set;
import javax.portlet.ActionRequest;
import javax.portlet.ActionResponse;
@@ -17,6 +18,7 @@
import com.finalist.cmsc.portalImpl.PortalConstants;
import com.finalist.cmsc.portlets.JspPortlet;
import com.finalist.newsletter.domain.Newsletter;
+import com.finalist.newsletter.domain.Subscription;
import com.finalist.newsletter.domain.Tag;
import com.finalist.newsletter.services.NewsletterSubscriptionServices;
import
com.finalist.newsletter.services.impl.NewsletterSubscriptionServicesImpl;
@@ -56,7 +58,7 @@
String userName = "username";
int userId = 12345;
-
+/*
List<Integer> availableStatusOptions =
NewsletterSubscriptionUtil.getStatusOptions();
request.setAttribute(NewsletterSubscriptionUtil.STATUS_OPTIONS,
availableStatusOptions);
@@ -77,7 +79,7 @@
request.setAttribute(NewsletterSubscriptionUtil.SUBSCRIPTION_STATUS_KEY,
status);
String preferredMimeType =
NewsletterSubscriptionUtil.getPreferredMimeType(userName);
request.setAttribute(NewsletterSubscriptionUtil.PREFERRED_MIMETYPE,
preferredMimeType);
- }
+ }*/
if(null==newsletters)
{
doInclude("view", "/fragment/null.jsp", request, response);
@@ -85,14 +87,23 @@
else
{
if(services.hasSubscription(userId)){
- List<Newsletter> newsletterList =
services.getNewsletterList(newsletters, userId);
- request.setAttribute("newsletterList", newsletterList);
- request.setAttribute("aaa","bbb");
+ List<Subscription> subscriptionList =
services.getSubscriptionList(newsletters, userId);
+ request.setAttribute("subscriptionList",
subscriptionList);
doInclude("view", "/fragment/list.jsp", request, response);
}
else {
- List<Newsletter> newsletterList =
services.getAllowedNewsletterList(newsletters);
- request.setAttribute("newsletterList", newsletterList);
+ List<Subscription> subscriptionList =
services.getNewSubscription(newsletters);
+ Iterator it = subscriptionList.iterator();
+ for(int i=0;i<subscriptionList.size();i++)
+ {
+ Subscription subscription = (Subscription) it.next();
+ Newsletter newsletter = subscription.getNewsletter();
+ String title = newsletter.getTitle();
+ Set<Tag> tags = subscription.getTags();
+ int newsletterId =
subscription.getNewsletter().getId();
+
System.out.println("----title="+title+";newsletterId="+newsletterId);
+ }
+ request.setAttribute("subscriptionList",
subscriptionList);
doInclude("view", "/fragment/welcome.jsp", request,
response);
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
