Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory
james.mmbase.org:/tmp/cvs-serv4460/portlets-newsletter/src/java/com/finalist/newsletter/util
Modified Files:
NewsletterUtil.java 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: NewsletterUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterUtil.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- NewsletterUtil.java 21 Dec 2007 21:28:47 -0000 1.12
+++ NewsletterUtil.java 20 Jan 2008 22:48:35 -0000 1.13
@@ -112,7 +112,7 @@
} else {
managerName = "newsletterpublication";
}
- Node newsletterNode = SearchUtil.findRelatedNode(themeNode, managerName,
null);
+ Node newsletterNode = SearchUtil.findRelatedNode(themeNode, managerName,
"newslettertheme");
if (newsletterNode != null) {
return (newsletterNode.getNumber());
}
Index: BeanUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/BeanUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- BeanUtil.java 8 Jan 2008 10:45:00 -0000 1.1
+++ BeanUtil.java 20 Jan 2008 22:48:35 -0000 1.2
@@ -4,7 +4,6 @@
import java.util.List;
import com.finalist.newsletter.module.bean.GlobalOverviewBean;
-import com.finalist.newsletter.module.bean.NewsletterDetailBean;
import com.finalist.newsletter.module.bean.NewsletterOverviewBean;
import com.finalist.newsletter.module.bean.NewsletterSubscriberBean;
import com.finalist.newsletter.module.bean.SubscriptionDetailBean;
@@ -30,13 +29,7 @@
return (bean);
}
- public static NewsletterDetailBean createNewsletterDetailBean(int
newsletterNumber) {
- NewsletterDetailBean bean = new NewsletterDetailBean();
- bean.setNumber(newsletterNumber);
-
- String title = NewsletterUtil.getTitle(newsletterNumber);
- bean.setTitle(title);
-
+ public static List<NewsletterSubscriberBean> getSubscriberBeans(int
newsletterNumber) {
List<NewsletterSubscriberBean> subscribers = new
ArrayList<NewsletterSubscriberBean>();
List<String> subscribersList =
NewsletterSubscriptionUtil.getSubscribersForNewsletter(newsletterNumber);
if (subscribersList != null) {
@@ -46,14 +39,12 @@
subscriberBean.setUserName(userName);
int numberOfThemes =
NewsletterSubscriptionUtil.getNumberOfSubscribedThemes(userName,
newsletterNumber);
- bean.setNumber(numberOfThemes);
+ subscriberBean.setNumberOfThemes(numberOfThemes);
subscribers.add(subscriberBean);
}
}
- bean.setSubscribers(subscribers);
-
- return (bean);
+ return (subscribers);
}
public static NewsletterOverviewBean createNewsletterOverviewBean(int
newsletterNumber) {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
