Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
In directory
james.mmbase.org:/tmp/cvs-serv24485/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl
Modified Files:
NewsletterSubscriptionServicesImpl.java
NewsletterServiceImpl.java StatisticServiceImpl.java
NewsletterPublicationServiceImpl.java
NewsletterSubscriptionHibernateService.java
Log Message:
CMSC-1091 improve code style.
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-1091
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.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- NewsletterSubscriptionServicesImpl.java 23 Sep 2008 10:31:36 -0000
1.26
+++ NewsletterSubscriptionServicesImpl.java 14 Oct 2008 11:22:44 -0000
1.27
@@ -264,11 +264,11 @@
return subscriptionCAO.getSubscription(Integer.parseInt(newsletterId));
}
- public Set<Newsletter> getNewslettersBySubscription(int subscriberId,
String title, boolean paging){
+ public Set<Newsletter> getNewslettersBySubscription(int subscriberId,
String title, boolean paging) {
log.debug("Get Subscriptions of subscriberId" + subscriberId);
List<Newsletter> newsletters =
subscriptionCAO.getNewslettersByScription(subscriberId, title, paging);
Set<Newsletter> results = new HashSet<Newsletter>();
- for(Newsletter newsletter: newsletters){
+ for (Newsletter newsletter : newsletters) {
String status = subscriptionCAO.getSubscription(newsletter.getId(),
subscriberId).getStatus().toString();
newsletter.setStatus(status);
results.add(newsletter);
@@ -385,7 +385,7 @@
public Set<Long> getAuthenticationIdsByNewsletter(int newsletterId) {
List<Subscription> subscriptions =
subscriptionCAO.getSubscription(newsletterId);
Set<Long> subscriberIds = new HashSet<Long>();
- for(Subscription subscription: subscriptions){
+ for (Subscription subscription : subscriptions) {
subscriberIds.add(new
Long(Integer.parseInt(subscription.getSubscriberId())));
}
return subscriberIds;
@@ -394,7 +394,7 @@
public Set<Long> getAuthenticationIds() {
List<Node> subscriptions = subscriptionCAO.getAllSubscriptions();
Set<Long> subscriberIds = new HashSet<Long>();
- for(Node subscription: subscriptions){
+ for (Node subscription : subscriptions) {
subscriberIds.add(new Long(subscription.getIntValue("subscriber")));
}
return subscriberIds;
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.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- NewsletterServiceImpl.java 23 Sep 2008 10:31:36 -0000 1.12
+++ NewsletterServiceImpl.java 14 Oct 2008 11:22:44 -0000 1.13
@@ -48,7 +48,7 @@
public String getNewsletterName(int newsletterId) {
String name = "";
- if (newsletterId >0) {
+ if (newsletterId > 0) {
name = newsletterCAO.getNewsletterById(newsletterId).getTitle();
}
Index: StatisticServiceImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/StatisticServiceImpl.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- StatisticServiceImpl.java 23 Sep 2008 10:31:36 -0000 1.5
+++ StatisticServiceImpl.java 14 Oct 2008 11:22:44 -0000 1.6
@@ -3,6 +3,7 @@
import java.util.Date;
import java.util.List;
+
import com.finalist.newsletter.cao.NewsLetterStatisticCAO;
import com.finalist.newsletter.cao.NewsletterCAO;
import com.finalist.newsletter.domain.StatisticResult;
@@ -59,7 +60,7 @@
Date endDate;
startDate = DateUtil.parser(start);
endDate = DateUtil.parser(end);
- List<StatisticResult> list =
statisticCAO.getRecordsByNewsletterAndPeriod(startDate, endDate,newsletterId);
+ List<StatisticResult> list =
statisticCAO.getRecordsByNewsletterAndPeriod(startDate, endDate, newsletterId);
StatisticResult result = new StatisticResult();
for (StatisticResult r : list) {
result.setPost(result.getPost() + r.getPost());
@@ -115,7 +116,7 @@
Date endDate;
startDate = DateUtil.parser(start);
endDate = DateUtil.parser(end);
- List<StatisticResult> list =
statisticCAO.getRecordsByNewsletterAndPeriod(startDate, endDate,newsletterId);
+ List<StatisticResult> list =
statisticCAO.getRecordsByNewsletterAndPeriod(startDate, endDate, newsletterId);
return list;
}
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.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- NewsletterPublicationServiceImpl.java 23 Sep 2008 10:31:36 -0000
1.24
+++ NewsletterPublicationServiceImpl.java 14 Oct 2008 11:22:44 -0000
1.25
@@ -78,8 +78,7 @@
/**
* deliver specific publication.
*
- * @param publicationId
- * The id of the publication to be sent out
+ * @param publicationId The id of the publication to be sent out
*/
public Map<String, List<String>> deliver(int publicationId) {
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.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs