[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl NewsletterSubscriptionServicesImpl.java

[mguo]

Update of 
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
In directory 
james.mmbase.org:/tmp/cvs-serv22709/portlets-newsletter/src/java/com/finalist/newsletter/services/impl

Modified Files:
        NewsletterSubscriptionServicesImpl.java 
Log Message:
CMSC-825 create publication render.


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-825


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.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- NewsletterSubscriptionServicesImpl.java     15 May 2008 06:33:49 -0000      
1.16
+++ NewsletterSubscriptionServicesImpl.java     15 May 2008 08:46:54 -0000      
1.17
@@ -34,6 +34,7 @@
    public void setStatisticCAO(NewsLetterStatisticCAO statisticCAO) {
       this.statisticCAO = statisticCAO;
    }
+
    public void setNewsletterCAO(NewsletterCAO newsletterCAO) {
       this.newsletterCAO = newsletterCAO;
    }
@@ -53,9 +54,11 @@
    public List<Subscription> getSubscriptionList(String[] allowedLetters, int 
userId) {
 
       List<Subscription> subscriptionList = new ArrayList<Subscription>();
+      if (null != allowedLetters) {
       for (String allowedLetter : allowedLetters) {
          subscriptionList.add(getSubscription(allowedLetter, 
Integer.toString(userId)));
       }
+      }
       return subscriptionList;
    }
 
@@ -113,11 +116,11 @@
          subscription.setStatus(STATUS.ACTIVE);
       }
        subscriptionCAO.modifySubscriptionStauts(subscription);
-       if(STATUS.ACTIVE.equals(subscription.getStatus())){
-          statisticCAO.logPubliction(userId,newsletterId,HANDLE.ACTIVE);
+      if (STATUS.ACTIVE.equals(subscription.getStatus())) {
+         statisticCAO.logPubliction(userId, newsletterId, HANDLE.ACTIVE);
        }
        else {
-          statisticCAO.logPubliction(userId,newsletterId,HANDLE.INACTIVE);
+         statisticCAO.logPubliction(userId, newsletterId, HANDLE.INACTIVE);
        }
    }
 
@@ -221,7 +224,7 @@
       subscription.setMimeType("text/html");
       subscription.setStatus(STATUS.ACTIVE);
       subscriptionCAO.addSubscriptionRecord(subscription, userId);
-      statisticCAO.logPubliction(userId,newsletterId,HANDLE.ACTIVE);
+      statisticCAO.logPubliction(userId, newsletterId, HANDLE.ACTIVE);
    }
 
    public void resume(String subscriptionId) {
@@ -236,7 +239,7 @@
       subscriptionCAO.updateSubscription(subscription);
       int newsletterId = 
newsletterCAO.getNewsletterIdBySubscription(Integer.parseInt(subscriptionId));
       int userId = CommunityModuleAdapter.getCurrentUserId();
-      statisticCAO.logPubliction(userId,newsletterId,HANDLE.INACTIVE);
+      statisticCAO.logPubliction(userId, newsletterId, HANDLE.INACTIVE);
    }
 
    public Subscription getSubscription(String sId) {
@@ -271,7 +274,6 @@
    }
 
 
-
    public List<Subscription> getSubscriptionsByNewsletterId(String i) {
       log.debug("Get all subscriptions of newsletter " + i);
       return subscriptionCAO.getSubscription(Integer.parseInt(i));
@@ -283,7 +285,7 @@
       Set<Subscription> result = new HashSet<Subscription>();
 
       for (Subscription subscription : 
getSubscriptionsByNewsletterId(newsletterId)) {
-         if(personIds.contains(subscription.getSubscriberId())){
+         if (personIds.contains(subscription.getSubscriberId())) {
             result.add(subscription);
          }
       }
@@ -346,11 +348,11 @@
    }
 
    public List<Subscription> getSubscriptionBySubscriber(String newsletterid) {
-      return 
subscriptionCAO.getSubscriptionByUserIdAndStatus(Integer.parseInt(newsletterid),null);
+      return 
subscriptionCAO.getSubscriptionByUserIdAndStatus(Integer.parseInt(newsletterid),
 null);
    }
 
    public Subscription getSubscription(int userId, int newsletterId) {
-      return subscriptionCAO.getSubscription(newsletterId,userId);
+      return subscriptionCAO.getSubscription(newsletterId, userId);
    }
 
    public void unSubscribeAllInNewsletter(int newsletterId) {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs