Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
In directory
james.mmbase.org:/tmp/cvs-serv24485/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
Modified Files:
NewsLetterStatisticCAOImpl.java
NewsletterPublicationCAOImpl.java
NewsletterSubscriptionCAOImpl.java NewsletterCAOImpl.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/cao/impl
See also: http://www.mmbase.org/jira/browse/CMSC-1091
Index: NewsLetterStatisticCAOImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsLetterStatisticCAOImpl.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- NewsLetterStatisticCAOImpl.java 23 Sep 2008 07:52:39 -0000 1.17
+++ NewsLetterStatisticCAOImpl.java 14 Oct 2008 11:22:44 -0000 1.18
@@ -6,6 +6,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+
import org.apache.commons.lang.time.DateUtils;
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
@@ -37,7 +38,7 @@
this.cloud = cloud;
}
- public List < StatisticResult > getAllRecords() {
+ public List<StatisticResult> getAllRecords() {
NodeQuery query = cloud.createNodeQuery();
Step step = query.addStep(cloud.getNodeManager("newsletterdailylog"));
@@ -47,7 +48,7 @@
return util.convertFromNodeList(list);
}
- public List < StatisticResult > getRecordsByNewsletter(int newsletter) {
+ public List<StatisticResult> getRecordsByNewsletter(int newsletter) {
NodeQuery query = cloud.createNodeQuery();
NodeManager manager = cloud.getNodeManager("newsletterdailylog");
Step step1 = query.addStep(manager);
@@ -66,7 +67,7 @@
return util.convertFromNodeList(list);
}
- public List < StatisticResult > getAllRecordsByPeriod(Date start, Date end)
{
+ public List<StatisticResult> getAllRecordsByPeriod(Date start, Date end) {
NodeQuery query = cloud.createNodeQuery();
NodeManager manager = cloud.getNodeManager("newsletterdailylog");
Step step1 = query.addStep(manager);
@@ -88,14 +89,14 @@
/**
* @return List which sumLogs about StatisticResult
*/
- public List < StatisticResult > getLogs() {
+ public List<StatisticResult> getLogs() {
NodeList nodelist = getNodelist();
synchronized (this) {
- List < StatisticResult > logsList = new ArrayList < StatisticResult
>();
- List < StatisticResult > resultList = getLogsByNode(nodelist);
+ List<StatisticResult> logsList = new ArrayList<StatisticResult>();
+ List<StatisticResult> resultList = getLogsByNode(nodelist);
if (null != resultList) {
// use newsletterId and userId as key to take the logic
- Map < String , StatisticResult > sumedMap = new HashMap < String ,
StatisticResult >();
+ Map<String, StatisticResult> sumedMap = new HashMap<String,
StatisticResult>();
for (StatisticResult r : resultList) {
String uniteKey = r.getNewsletterId() + "H" + r.getUserId();
StatisticResult freq = (StatisticResult) sumedMap.get(uniteKey);
@@ -165,7 +166,7 @@
return list;
}
- private List < StatisticResult > getLogsByNode(NodeList list) {
+ private List<StatisticResult> getLogsByNode(NodeList list) {
StatisticUtil util = new StatisticUtil();
return util.convertFromNodeList(list);
}
@@ -184,7 +185,7 @@
}
- public List < StatisticResult > getRecordsByNewsletterAndPeriod(Date start,
Date end, int newsletter) {
+ public List<StatisticResult> getRecordsByNewsletterAndPeriod(Date start,
Date end, int newsletter) {
NodeQuery query = cloud.createNodeQuery();
NodeManager manager = cloud.getNodeManager("newsletterdailylog");
Step step1 = query.addStep(manager);
@@ -202,7 +203,7 @@
constraints.addChild(constraint2);
query.setConstraint(constraints);
query.setNodeStep(step1);
- List < Node > list = query.getList();
+ List<Node> list = query.getList();
StatisticUtil util = new StatisticUtil();
return util.convertFromNodeList((NodeList) list);
}
@@ -309,7 +310,7 @@
* @param listRecorder which get from data
* @return how many SumedLogs insert
*/
- public int insertSumedLogs(List < StatisticResult > logsList) {
+ public int insertSumedLogs(List<StatisticResult> logsList) {
int i = 0;
NodeManager logManager = cloud.getNodeManager("newsletterdailylog");
Node logNode;
Index: NewsletterPublicationCAOImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterPublicationCAOImpl.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- NewsletterPublicationCAOImpl.java 19 Sep 2008 10:32:02 -0000 1.24
+++ NewsletterPublicationCAOImpl.java 14 Oct 2008 11:22:44 -0000 1.25
@@ -191,8 +191,7 @@
if (startDate != null) {
SearchUtil.addDatetimeConstraint(nodeQuery,
manager.getField("creationdate"), startDate.getTime(), endDate.getTime());
- }
- else {
+ } else {
SearchUtil.addDatetimeConstraint(nodeQuery,
manager.getField("creationdate"), Long.decode("1"), endDate.getTime());
}
Index: NewsletterSubscriptionCAOImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- NewsletterSubscriptionCAOImpl.java 23 Sep 2008 10:31:36 -0000 1.30
+++ NewsletterSubscriptionCAOImpl.java 14 Oct 2008 11:22:44 -0000 1.31
@@ -323,7 +323,7 @@
return newsletters;
}
- public List<Newsletter> getNewslettersByScription(int subscriberId, String
title, boolean paging){
+ public List<Newsletter> getNewslettersByScription(int subscriberId, String
title, boolean paging) {
PagingStatusHolder pagingHolder = PagingUtils.getStatusHolder();
NodeManager subscriptionNodeManager =
cloud.getNodeManager("subscriptionrecord");
@@ -331,13 +331,13 @@
NodeQuery query = cloud.createNodeQuery();
Step subscriptionStep = query.addStep(subscriptionNodeManager);
query.setNodeStep(subscriptionStep);
- if(subscriberId>0){
+ if (subscriberId > 0) {
SearchUtil.addEqualConstraint(query,
subscriptionNodeManager.getField("subscriber"), Integer.toString(subscriberId));
}
- RelationStep newsletterRelStep =
query.addRelationStep(newsletterNodeManager, "newslettered","source");
+ RelationStep newsletterRelStep =
query.addRelationStep(newsletterNodeManager, "newslettered", "source");
Step newsletterStep = newsletterRelStep.getNext();
query.setNodeStep(newsletterStep);
- if(StringUtils.isNotBlank(title)){
+ if (StringUtils.isNotBlank(title)) {
SearchUtil.addLikeConstraint(query,
newsletterNodeManager.getField("title"), title);
}
if (paging) {
Index: NewsletterCAOImpl.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterCAOImpl.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
