Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory
james.mmbase.org:/tmp/cvs-serv20189/portlets-newsletter/src/java/com/finalist/newsletter/util
Modified Files:
BeanUtil.java
Log Message:
CMSC-632 Fixes to a lot of things
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
See also: http://www.mmbase.org/jira/browse/CMSC-632
Index: BeanUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/BeanUtil.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- BeanUtil.java 20 Jan 2008 22:48:35 -0000 1.2
+++ BeanUtil.java 21 Jan 2008 11:22:42 -0000 1.3
@@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.List;
+import com.finalist.newsletter.generator.NewsletterGeneratorFactory;
import com.finalist.newsletter.module.bean.GlobalOverviewBean;
import com.finalist.newsletter.module.bean.NewsletterOverviewBean;
import com.finalist.newsletter.module.bean.NewsletterSubscriberBean;
@@ -70,6 +71,23 @@
SubscriptionDetailBean bean = new SubscriptionDetailBean();
bean.setUserName(userName);
+ List<String> availableMimeTypes =
NewsletterGeneratorFactory.getMimeTypes();
+ bean.setAvailableMimeTypes(availableMimeTypes);
+ List<String> availableStatusOptions =
NewsletterSubscriptionUtil.getStatusOptions();
+ bean.setAvailableStatusOptions(availableStatusOptions);
+
+ List<Integer> subscribedThemes =
NewsletterSubscriptionUtil.getUserSubscribedThemes(userName);
+ List<Integer> subscribedNewsletters =
NewsletterSubscriptionUtil.getUserSubscribedNewsletters(userName);
+
+ if (subscribedNewsletters != null && subscribedNewsletters.size() > 0) {
+ bean.setSubscribedNewsletters(subscribedNewsletters);
+ }
+
+ if (subscribedThemes != null && subscribedThemes.size() > 0) {
+ bean.setSubscribedThemes(subscribedThemes);
+ }
+
+ if ((subscribedThemes != null && subscribedThemes.size() > 0) ||
(subscribedNewsletters != null && subscribedNewsletters.size() > 0)) {
String status =
NewsletterSubscriptionUtil.getSubscriptionStatus(userName);
bean.setStatus(status);
@@ -81,6 +99,9 @@
return (bean);
}
+ return (null);
+
+ }
public static SubscriptionOverviewBean
createSubscriptionOverviewBean(String userName) {
SubscriptionOverviewBean bean = new SubscriptionOverviewBean();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
