Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory james.mmbase.org:/tmp/cvs-serv25011
Modified Files:
Tag: b1_5
NewsletterStatisticAction.java
Log Message:
CMSC-1097 Opening Newsletter Management first time gives stacktrace
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1097
Index: NewsletterStatisticAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterStatisticAction.java,v
retrieving revision 1.12.2.1
retrieving revision 1.12.2.2
diff -u -b -r1.12.2.1 -r1.12.2.2
--- NewsletterStatisticAction.java 10 Nov 2008 06:47:00 -0000 1.12.2.1
+++ NewsletterStatisticAction.java 24 Nov 2008 10:38:21 -0000 1.12.2.2
@@ -9,11 +9,11 @@
import com.finalist.newsletter.services.*;
-
import java.util.ArrayList;
import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
import org.apache.struts.action.*;
import org.apache.struts.actions.MappingDispatchAction;
@@ -22,7 +22,6 @@
* Search some newsletters according to these search conditions.
*
* @author Eva
- *
*/
public class NewsletterStatisticAction extends MappingDispatchAction {
@@ -51,6 +50,9 @@
HttpServletRequest request, HttpServletResponse response)
throws Exception {
+ PagingUtils.initStatusHolder(request);
+ PagingStatusHolder holder = PagingUtils.getStatusHolder();
+
NewsletterService newsletterService = (NewsletterService)
ApplicationContextFactory.getBean("newsletterServices");
StatisticService service = (StatisticService)
ApplicationContextFactory.getBean("statisticService");
List<Newsletter> newsletters = newsletterService.getAllNewsletter(false);
@@ -59,9 +61,6 @@
NewsLetterLogSearchForm searchForm = (NewsLetterLogSearchForm) form;
StatisticResult result = new StatisticResult();
request.setAttribute("searchForm", searchForm);
- PagingUtils.initStatusHolder(request);
- PagingStatusHolder holder = PagingUtils.getStatusHolder();
-
boolean isAll = Integer.parseInt(searchForm.getNewsletters()) == 0;
boolean isDetail = searchForm.getDetailOrSum().equals("2");
@@ -75,16 +74,16 @@
List<StatisticResult> records = service.statisticAllByPeriod(
startDate, endDate);
transferShowingFromDB(records, newsletterService);
- request.setAttribute("records",
addPagingCondition(request,records,holder));
+ request.setAttribute("records", addPagingCondition(request, records,
holder));
} else if (isAll && !hasDate && isDetail) {
List<StatisticResult> records = service.statisticAll();
transferShowingFromDB(records, newsletterService);
- request.setAttribute("records",
addPagingCondition(request,records,holder));
+ request.setAttribute("records", addPagingCondition(request, records,
holder));
} else if (!isAll && !hasDate && isDetail) {
List<StatisticResult> records = service
.statisticByNewsletter(newsletterId);
transferShowingFromDB(records, newsletterService);
- request.setAttribute("records",
addPagingCondition(request,records,holder));
+ request.setAttribute("records", addPagingCondition(request, records,
holder));
} else if (!isAll && hasDate && !isDetail) {
result = service.statisticByNewsletterPeriod(newsletterId,
startDate, endDate);
@@ -105,7 +104,7 @@
.StatisticDetailByNewsletterPeriod(newsletterId, startDate,
endDate);
transferShowingFromDB(records, newsletterService);
- request.setAttribute("records",
addPagingCondition(request,records,holder));
+ request.setAttribute("records", addPagingCondition(request, records,
holder));
}
return mapping.findForward("result");
}
@@ -121,7 +120,7 @@
Newsletter newsletter = new Newsletter();
newsletter.setTitle("ALL");
newsletter.setId(0);
- newsletters.add(0,newsletter);
+ newsletters.add(0, newsletter);
}
private void transferShowingFromDB(List<StatisticResult> records,
@@ -133,12 +132,13 @@
}
}
- private List<StatisticResult> addPagingCondition(HttpServletRequest
request,List<StatisticResult> records ,PagingStatusHolder holder){
+
+ private List<StatisticResult> addPagingCondition(HttpServletRequest
request, List<StatisticResult> records, PagingStatusHolder holder) {
List<StatisticResult> recordsForShow = new ArrayList<StatisticResult>();
int totalCount = records.size();
request.setAttribute("totalCount", totalCount);
- for(int
i=holder.getOffset();i<holder.getPageSize()+holder.getOffset()&&i<totalCount;i++){
+ for (int i = holder.getOffset(); i < holder.getPageSize() +
holder.getOffset() && i < totalCount; i++) {
recordsForShow.add(records.get(i));
}
return recordsForShow;
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
