Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
In directory
james.mmbase.org:/tmp/cvs-serv6817/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
Modified Files:
NewsletterSubscriptionServicesImpl.java
Log Message:
CMSC-708 Convert from old to new Community services
Removed NewsletterCommunication service
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
See also: http://www.mmbase.org/jira/browse/CMSC-708
Index: NewsletterSubscriptionServicesImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterSubscriptionServicesImpl.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- NewsletterSubscriptionServicesImpl.java 7 Jul 2008 04:03:43 -0000
1.19
+++ NewsletterSubscriptionServicesImpl.java 21 Jul 2008 09:48:02 -0000
1.20
@@ -2,25 +2,20 @@
import java.util.*;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.commons.lang.StringUtils;
import org.mmbase.bridge.Node;
-import com.finalist.newsletter.services.CommunityModuleAdapter;
-import com.finalist.newsletter.cao.NewsletterCAO;
-import com.finalist.newsletter.cao.NewsletterSubscriptionCAO;
-import com.finalist.newsletter.cao.NewsLetterStatisticCAO;
-import com.finalist.newsletter.domain.Newsletter;
-import com.finalist.newsletter.domain.Subscription;
-import com.finalist.newsletter.domain.Term;
-import com.finalist.newsletter.domain.Subscription.STATUS;
+
+import com.finalist.cmsc.services.community.person.Person;
+import com.finalist.cmsc.services.community.person.PersonService;
+import com.finalist.newsletter.cao.*;
+import com.finalist.newsletter.domain.*;
import com.finalist.newsletter.domain.StatisticResult.HANDLE;
-import com.finalist.newsletter.services.NewsletterSubscriptionServices;
-import com.finalist.newsletter.services.NewsletterService;
+import com.finalist.newsletter.domain.Subscription.STATUS;
+import com.finalist.newsletter.services.*;
import com.finalist.newsletter.util.DateUtil;
import com.finalist.newsletter.util.NewsletterSubscriptionUtil;
-import com.finalist.cmsc.services.community.person.PersonService;
-import com.finalist.cmsc.services.community.person.Person;
public class NewsletterSubscriptionServicesImpl implements
NewsletterSubscriptionServices {
@@ -93,12 +88,11 @@
public List<Subscription> getNewSubscription(String[] allowedLetters) {
List<Subscription> list = new ArrayList<Subscription>();
int nodenumber;
- for (int i = 0; i < allowedLetters.length; i++) {
- nodenumber = Integer.parseInt(allowedLetters[i]);
+ for (String allowedLetter : allowedLetters) {
+ nodenumber = Integer.parseInt(allowedLetter);
Newsletter newsletter = newsletterCAO.getNewsletterById(nodenumber);
Subscription subscription = new Subscription();
subscription.setNewsletter(newsletter);
- Newsletter test = subscription.getNewsletter();
subscription.setTerms(newsletter.getTerms());
list.add(subscription);
}
@@ -166,9 +160,9 @@
log.debug("Add term " + termId + " to user" + userId + "'s newsletter:"
+ newsletterId);
Subscription subscription =
subscriptionCAO.getSubscription(newsletterId, userId);
Set<Term> termList = subscription.getTerms();
- Iterator it = termList.iterator();
+ Iterator<Term> it = termList.iterator();
for (int i = 0; i < termList.size(); i++) {
- Term term = (Term) it.next();
+ Term term = it.next();
if (termId == term.getId()) {
term.setSubscription(true);
}
@@ -181,9 +175,9 @@
log.debug("Remove term " + termId + " to user " + userId + "'s
newsletter:" + newsletterId);
Subscription subscription =
subscriptionCAO.getSubscription(newsletterId, userId);
Set<Term> termList = subscription.getTerms();
- Iterator it = termList.iterator();
+ Iterator<Term> it = termList.iterator();
for (int i = 0; i < termList.size(); i++) {
- Term term = (Term) it.next();
+ Term term = it.next();
if (termId == term.getId()) {
term.setSubscription(false);
}
@@ -323,7 +317,7 @@
private void removeNoneSubscribers(List<Person> persons) {
for (int i = 0; i < persons.size(); i++) {
Person person = persons.get(i);
- List subscrioptions =
subscriptionCAO.getSubscriptionByUserIdAndStatus(person.getId().intValue(),
null);
+ List<Subscription> subscrioptions =
subscriptionCAO.getSubscriptionByUserIdAndStatus(person.getId().intValue(),
null);
if (subscrioptions.size() < 1) {
persons.remove(i);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
