Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
In directory
james.mmbase.org:/tmp/cvs-serv9993/java/com/finalist/newsletter/services/impl
Modified Files:
NewsletterPublicationServiceImpl.java
NewsletterServiceImpl.java
NewsletterSubscriptionHibernateService.java
Log Message:
CMSC-990 change all part using ui tag
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-990
Index: NewsletterPublicationServiceImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterPublicationServiceImpl.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- NewsletterPublicationServiceImpl.java 24 Jul 2008 09:04:16 -0000
1.20
+++ NewsletterPublicationServiceImpl.java 28 Jul 2008 14:46:13 -0000
1.21
@@ -1,14 +1,24 @@
package com.finalist.newsletter.services.impl;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
import com.finalist.cmsc.services.community.person.Person;
import com.finalist.newsletter.NewsletterSendFailException;
-import com.finalist.newsletter.cao.*;
-import com.finalist.newsletter.domain.*;
+import com.finalist.newsletter.cao.NewsLetterStatisticCAO;
+import com.finalist.newsletter.cao.NewsletterPublicationCAO;
+import com.finalist.newsletter.cao.NewsletterSubscriptionCAO;
+import com.finalist.newsletter.domain.Publication;
+import com.finalist.newsletter.domain.Subscription;
+import com.finalist.newsletter.domain.Term;
import com.finalist.newsletter.domain.Publication.STATUS;
import com.finalist.newsletter.publisher.NewsletterPublisher;
import com.finalist.newsletter.services.CommunityModuleAdapter;
@@ -133,24 +143,9 @@
return result;
}
- public List<Publication> searchPublication(int id, String title, String
subject, Date startDate, Date endDate, int pagesize, int offset,
- String order, String direction) {
+ public List<Publication> searchPublication(int newsletterId, String
title, String subject, Date startTime, Date endTime, boolean paging) {
List<Publication> result = new ArrayList<Publication>();
- result =
publicationCAO.getPublicationsByNewsletterAndPeriod(id, title, subject,
startDate, endDate, pagesize, offset, order, direction);
-
- return result;
- }
-
- public int searchPublicationCountForEdit(int id, String title, String
subject, Date startDate, Date endDate) {
- int tmpResultCount =
publicationCAO.getPublicationCountForEdit(id, title, subject, startDate,
endDate);
- return tmpResultCount;
- }
-
- public List<Publication> searchPublicationStatistics(int newsletterId,
String title, String subject, Date startTime, Date endTime, int pagesize,
- int offset, String order, String direction) {
- List<Publication> result = new ArrayList<Publication>();
- result =
publicationCAO.getPublicationsByNewsletterAndPeriod(newsletterId, title,
subject, startTime, endTime, pagesize, offset, order,
- direction);
+ result =
publicationCAO.getPublicationsByNewsletterAndPeriod(newsletterId, title,
subject, startTime, endTime, paging);
return result;
}
Index: NewsletterServiceImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterServiceImpl.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- NewsletterServiceImpl.java 24 Jul 2008 11:45:43 -0000 1.9
+++ NewsletterServiceImpl.java 28 Jul 2008 14:46:13 -0000 1.10
@@ -1,5 +1,12 @@
package com.finalist.newsletter.services.impl;
+import java.util.List;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.mmbase.bridge.Node;
+
import com.finalist.newsletter.cao.NewsLetterStatisticCAO;
import com.finalist.newsletter.cao.NewsletterCAO;
import com.finalist.newsletter.cao.NewsletterPublicationCAO;
@@ -8,13 +15,6 @@
import com.finalist.newsletter.domain.StatisticResult;
import com.finalist.newsletter.domain.Term;
import com.finalist.newsletter.services.NewsletterService;
-import org.apache.commons.lang.StringUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.mmbase.bridge.Node;
-
-import java.util.List;
-import java.util.Set;
public class NewsletterServiceImpl implements NewsletterService {
@@ -96,20 +96,20 @@
}
}
- public void processBouncesOfPublication(String publicationId,String userId)
{
- //todo test.
+ public void processBouncesOfPublication(String publicationId, String
userId) {
+ // todo test.
int pId = Integer.parseInt(publicationId);
int uId = Integer.parseInt(userId);
int newsletterId = publicationCAO.getNewsletterId(pId);
Node newsletterNode = newsletterCAO.getNewsletterNodeById(newsletterId);
- Node subscriptionNode =
subscriptionCAO.getSubscriptionNode(newsletterId,uId);
+ Node subscriptionNode =
subscriptionCAO.getSubscriptionNode(newsletterId, uId);
int bouncesCount = subscriptionNode.getIntValue("count_bounces");
int maxAllowedBonce = newsletterNode.getIntValue("max_bounces");
- if(bouncesCount > maxAllowedBonce){
+ if (bouncesCount > maxAllowedBonce) {
subscriptionCAO.pause(subscriptionNode.getNumber());
}
- statisticCAO.logPubliction(uId,newsletterId,
StatisticResult.HANDLE.BOUNCE);
+ statisticCAO.logPubliction(uId, newsletterId,
StatisticResult.HANDLE.BOUNCE);
subscriptionCAO.updateLastBounce(subscriptionNode.getNumber());
}
@@ -121,24 +121,12 @@
return null;
}
- public List<Term> getNewsletterTermsByName(int newsletterId, String
name, int pagesize, int offset, String order, String direction) {
- List<Term> terms =
newsletterCAO.getNewsletterTermsByName(newsletterId, name, pagesize, offset,
order, direction);
+ public List<Term> getNewsletterTermsByName(int newsletterId, String
name, boolean paging) {
+ List<Term> terms =
newsletterCAO.getNewsletterTermsByName(newsletterId, name, paging);
return terms;
}
- public int getNewsletterTermsCountByName(int newsletterId, String
tmpName) {
- int resultCount =
newsletterCAO.getNewsletterTermsCountByName(newsletterId, tmpName);
- return resultCount;
- }
-
- public Set<Term> getNewsletterTermsByName(int newsletterId, String name,
- int pagesize, int offset) {
- // TODO Auto-generated method stub
- return null;
- }
-
- public void processBouncesOfPublication(String publicationId, String userId,
- String bounceContent) {
+ public void processBouncesOfPublication(String publicationId, String
userId, String bounceContent) {
newsletterCAO.processBouncesOfPublication(publicationId, userId,
bounceContent);
}
Index: NewsletterSubscriptionHibernateService.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterSubscriptionHibernateService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- NewsletterSubscriptionHibernateService.java 27 Jul 2008 07:38:09 -0000
1.2
+++ NewsletterSubscriptionHibernateService.java 28 Jul 2008 14:46:13 -0000
1.3
@@ -16,8 +16,6 @@
@Transactional
public List<Object[]> getSubscribersRelatedInfo(Set<Long>
authenticationIds, String fullName, String userName, String email, boolean
paging) {
- // TODO merge with the following function
-
PagingStatusHolder pagingHolder = PagingUtils.getStatusHolder();
StringBuffer strb = new StringBuffer(
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
