Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv9993/java/com/finalist/newsletter/forms
Modified Files:
NewsletterCreate.java NewsletterPublicationCreate.java
NewsletterPublicationEdit.java
NewsletterPublicationManagementAction.java
NewsletterStatisticSearchAction.java
NewsletterSubscriberSearchAction.java
NewsletterSubscriptionAddRelAction.java
NewsletterTermSearchAction.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/forms
See also: http://www.mmbase.org/jira/browse/CMSC-990
Index: NewsletterCreate.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterCreate.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- NewsletterCreate.java 24 Jul 2008 09:04:16 -0000 1.11
+++ NewsletterCreate.java 28 Jul 2008 14:46:13 -0000 1.12
@@ -55,7 +55,7 @@
.getStringValue("schedule")));
newNewsletter.commit();
addToRequest(request, "showpage",
ewnodelastedited);
- ActionForward ret = new
ActionForward("/editors/site/NavigatorPanel.do?nodeId=" + ewnodelastedited +
"&fresh=fresh");
+ ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?nodeId=" +
ewnodelastedited + "&fresh=fresh");
return ret;
}
request.getSession().removeAttribute("parentnewsletter");
Index: NewsletterPublicationCreate.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationCreate.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- NewsletterPublicationCreate.java 24 Jul 2008 09:04:16 -0000 1.17
+++ NewsletterPublicationCreate.java 28 Jul 2008 14:46:13 -0000 1.18
@@ -61,7 +61,7 @@
if (StringUtils.isNotEmpty(forwardType)) {
ret = new
ActionForward(mapping.findForward("publicationedit").getPath() +
"?newsletterId=" + request.getParameter("newsletterId"));
} else {
- ret = new
ActionForward("/editors/site/NavigatorPanel.do?nodeId=" + ewnodelastedited +
"&fresh=fresh");
+ ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?nodeId=" +
ewnodelastedited + "&fresh=fresh");
}
return ret;
}
Index: NewsletterPublicationEdit.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationEdit.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- NewsletterPublicationEdit.java 24 Jul 2008 09:04:16 -0000 1.6
+++ NewsletterPublicationEdit.java 28 Jul 2008 14:46:13 -0000 1.7
@@ -14,7 +14,6 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.commons.lang.StringUtils;
-
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.mmbase.bridge.Cloud;
@@ -44,11 +43,12 @@
String ewnodelastedited = getParameter(request,
"ewnodelastedited");
addToRequest(request, "showpage", ewnodelastedited);
ActionForward ret = null;
- if (StringUtils.isNotEmpty(forwardType)) {
+ if (StringUtils.isNotBlank(forwardType) &&
!"null".equals(forwardType)) {
ret = new
ActionForward(mapping.findForward(forwardType).getPath() + "?newsletterId=" +
parent);
} else {
- ret = new
ActionForward("/editors/site/NavigatorPanel.do?nodeId=" + ewnodelastedited +
"&fresh=fresh");
+ ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?nodeId=" +
ewnodelastedited + "&fresh=fresh");
}
+ ret.setRedirect(true);
return ret;
}
}
Index: NewsletterPublicationManagementAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationManagementAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NewsletterPublicationManagementAction.java 27 Jul 2008 07:38:09 -0000
1.4
+++ NewsletterPublicationManagementAction.java 28 Jul 2008 14:46:13 -0000
1.5
@@ -1,17 +1,24 @@
package com.finalist.newsletter.forms;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.struts.action.*;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
import org.springframework.web.struts.DispatchActionSupport;
-import com.finalist.cmsc.mmbase.PropertiesUtil;
+import com.finalist.cmsc.paging.PagingStatusHolder;
+import com.finalist.cmsc.paging.PagingUtils;
import com.finalist.newsletter.domain.Publication;
import com.finalist.newsletter.services.NewsletterPublicationService;
@@ -32,25 +39,20 @@
throws Exception {
log.debug("No parameter specified,go to edit page ,show related
publications");
+ PagingStatusHolder pagingHolder =
PagingUtils.getStatusHolder(request);
int newsletterId =
Integer.parseInt(request.getParameter("newsletterId"));
- List<Publication> publications;
+
Date now = new Date();
- int pagesize = 10;
- if
(StringUtils.isNotEmpty(PropertiesUtil.getProperty("repository.search.results.per.page")))
{
- pagesize =
Integer.parseInt(PropertiesUtil.getProperty("repository.search.results.per.page"));
- }
- int offset = 0;
- if (StringUtils.isNotBlank(request.getParameter("offset"))) {
- offset =
Integer.parseInt(request.getParameter("offset"));
- }
- int resultCount =
publicationService.searchPublicationCountForEdit(newsletterId, "", "", null,
now);
- publications =
publicationService.searchPublication(newsletterId, "", "", null, now, pagesize,
offset * pagesize, "number", "UP");
+ int resultCount =
publicationService.searchPublication(newsletterId, "", "", null, now,
false).size();
+
+ List<Publication> publications;
+ publications =
publicationService.searchPublication(newsletterId, "", "", null, now, true);
List<Map<String, String>> results =
convertPublicationsToMap(publications);
+ if (results.size() > 0) {
request.setAttribute("results", results);
- request.setAttribute("resultCount", resultCount);
+ }
+ request.setAttribute("resultCount",resultCount);
request.setAttribute("newsletterId", newsletterId);
- request.setAttribute("order", "number");
- request.setAttribute("direction", "1");
return mapping.findForward("newsletterpublicationlist");
}
@@ -58,25 +60,8 @@
public ActionForward searchPublication(ActionMapping mapping,
ActionForm form, HttpServletRequest request, HttpServletResponse response) {
log.debug("parameter specified, search newsletterpublication ");
+ PagingStatusHolder pagingHolder =
PagingUtils.getStatusHolder(request);
int newsletterId =
Integer.parseInt(request.getParameter("newsletterId"));
- int pagesize = 10;
- if
(StringUtils.isNotEmpty(PropertiesUtil.getProperty("repository.search.results.per.page")))
{
- pagesize =
Integer.parseInt(PropertiesUtil.getProperty("repository.search.results.per.page"));
- }
- int offset = 0;
- if (StringUtils.isNotBlank(request.getParameter("offset"))) {
- offset =
Integer.parseInt(request.getParameter("offset"));
- }
- String order = "number";
- if (StringUtils.isNotBlank(request.getParameter("order"))) {
- order = request.getParameter("order");
- }
- String direction = "UP";
- String paramDir = request.getParameter("direction");
- if (StringUtils.isNotBlank(paramDir)) {
- direction = "1".equals(paramDir) ? "UP" : "DOWN";
- }
-
NewsletterPublicationManageForm myForm =
(NewsletterPublicationManageForm) form;
String tmpTitle = myForm.getTitle();
String tmpSubject = myForm.getSubject();
@@ -126,17 +111,16 @@
default:
break;
}
+
+ int resultCount =
publicationService.searchPublication(newsletterId, tmpTitle, tmpSubject,
startTime, endTime, false).size();
List<Publication> publications;
- int resultCount =
publicationService.searchPublicationCountForEdit(newsletterId, tmpTitle,
tmpSubject, startTime, endTime);
- publications =
publicationService.searchPublication(newsletterId, tmpTitle, tmpSubject,
startTime, endTime, pagesize, offset * pagesize,
- order, direction);
- request.setAttribute("newsletterId", newsletterId);
+ publications =
publicationService.searchPublication(newsletterId, tmpTitle, tmpSubject,
startTime, endTime, true);
+ if (publications.size() > 0) {
request.setAttribute("results", publications);
- request.setAttribute("resultCount", resultCount);
- request.setAttribute("offset", offset);
+ }
+ request.setAttribute("resultCount",resultCount);
+ request.setAttribute("newsletterId", newsletterId);
- request.setAttribute("order", order);
- request.setAttribute("direction", paramDir);
return mapping.findForward("newsletterpublicationlist");
}
Index: NewsletterStatisticSearchAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterStatisticSearchAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- NewsletterStatisticSearchAction.java 24 Jul 2008 09:04:16 -0000
1.1
+++ NewsletterStatisticSearchAction.java 28 Jul 2008 14:46:13 -0000
1.2
@@ -6,12 +6,10 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.ActionForm;
@@ -19,7 +17,8 @@
import org.apache.struts.action.ActionMapping;
import org.springframework.web.struts.DispatchActionSupport;
-import com.finalist.cmsc.mmbase.PropertiesUtil;
+import com.finalist.cmsc.paging.PagingStatusHolder;
+import com.finalist.cmsc.paging.PagingUtils;
import com.finalist.newsletter.domain.Publication;
import com.finalist.newsletter.services.NewsletterPublicationService;
@@ -35,53 +34,31 @@
protected ActionForward unspecified(ActionMapping mapping, ActionForm
form, HttpServletRequest request, HttpServletResponse response)
throws Exception {
+
log.debug("No parameter specified,go to edit page ,show related
publications");
+ PagingStatusHolder pagingHolder =
PagingUtils.getStatusHolder(request);
int newsletterId =
Integer.parseInt(request.getParameter("newsletterId"));
- int pagesize = 10;
- if
(StringUtils.isNotEmpty(PropertiesUtil.getProperty("repository.search.results.per.page")))
{
- pagesize =
Integer.parseInt(PropertiesUtil.getProperty("repository.search.results.per.page"));
- }
- int offset = 0;
- if (StringUtils.isNotBlank(request.getParameter("offset")))
- offset =
Integer.parseInt(request.getParameter("offset"));
Date endDate = new Date();
- int resultCount =
publicationService.searchPublicationCountForEdit(newsletterId, "", "", null,
endDate);
+ int resultCount =
publicationService.searchPublication(newsletterId, "", "", null, endDate,
false).size();
List<Publication> publications;
- publications =
publicationService.searchPublication(newsletterId, "", "", null, endDate,
pagesize, offset * pagesize, "number", "UP");
+ publications =
publicationService.searchPublication(newsletterId, "", "", null, endDate, true);
List<Map<String, String>> results =
convertPublicationsToMap(publications);
-
- request.setAttribute("newsletterId", newsletterId);
+ if (results.size() > 0) {
request.setAttribute("results", results);
+ }
request.setAttribute("resultCount", resultCount);
- request.setAttribute("order", "number");
- request.setAttribute("direction", "1");
-
+ request.setAttribute("newsletterId", newsletterId);
return mapping.findForward("success");
}
public ActionForward searchPublicationStatistic(ActionMapping mapping,
ActionForm form, HttpServletRequest request, HttpServletResponse response) {
log.debug("parameter specified, search newsletterpublication ");
+ PagingStatusHolder pagingHolder =
PagingUtils.getStatusHolder(request);
+
int newsletterId =
Integer.parseInt(request.getParameter("newsletterId"));
- int pagesize = 10;
- if
(StringUtils.isNotEmpty(PropertiesUtil.getProperty("repository.search.results.per.page")))
{
- pagesize =
Integer.parseInt(PropertiesUtil.getProperty("repository.search.results.per.page"));
- }
- int offset = 0;
- if (StringUtils.isNotBlank(request.getParameter("offset")))
- offset =
Integer.parseInt(request.getParameter("offset"));
-
- String order = "number";
- if (StringUtils.isNotBlank(request.getParameter("order"))) {
- order = request.getParameter("order");
- }
- String direction = "UP";
- String paramDir = request.getParameter("direction");
- if (StringUtils.isNotBlank(paramDir)) {
- direction = "1".equals(paramDir) ? "UP" : "DOWN";
- }
NewsletterPublicationManageForm myForm =
(NewsletterPublicationManageForm) form;
String tmpTitle = myForm.getTitle();
String tmpSubject = myForm.getSubject();
@@ -130,16 +107,14 @@
break;
}
List<Publication> publications;
- int resultCount =
publicationService.searchPublicationCountForEdit(newsletterId, tmpTitle,
tmpSubject, startTime, endTime);
- publications =
publicationService.searchPublicationStatistics(newsletterId, tmpTitle,
tmpSubject, startTime, endTime, pagesize, offset
- * pagesize, order, direction);
+ int resultCount =
publicationService.searchPublication(newsletterId, tmpTitle, tmpSubject,
startTime, endTime, false).size();
+ publications =
publicationService.searchPublication(newsletterId, tmpTitle, tmpSubject,
startTime, endTime, true);
List<Map<String, String>> results =
convertPublicationsToMap(publications);
+ if (results.size() > 0) {
request.setAttribute("results", results);
+ pagingHolder.setListSize(resultCount);
+ }
request.setAttribute("newsletterId", newsletterId);
- request.setAttribute("resultCount", resultCount);
-
- request.setAttribute("order", order);
- request.setAttribute("direction", paramDir);
return mapping.findForward("success");
}
Index: NewsletterSubscriberSearchAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberSearchAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NewsletterSubscriberSearchAction.java 27 Jul 2008 07:38:09 -0000
1.4
+++ NewsletterSubscriberSearchAction.java 28 Jul 2008 14:46:13 -0000
1.5
@@ -10,7 +10,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.struts.action.ActionForm;
@@ -18,7 +17,6 @@
import org.apache.struts.action.ActionMapping;
import org.springframework.web.struts.DispatchActionSupport;
-import com.finalist.cmsc.mmbase.PropertiesUtil;
import com.finalist.cmsc.paging.PagingStatusHolder;
import com.finalist.cmsc.paging.PagingUtils;
import com.finalist.cmsc.services.community.person.PersonService;
@@ -61,9 +59,7 @@
if (resultCount > 0) {
List results = searchSubscribers(newsletterId, "", "",
"", "");
request.setAttribute("results", results);
- pagingHolder.setPageCount(resultCount);
}
-
request.setAttribute("resultCount", resultCount);
request.setAttribute("newsletterId", newsletterId);
@@ -83,7 +79,6 @@
String tmpEmail = myForm.getEmail();
int resultCount = countsearchSubscribers(newsletterId, tmpTerm,
tmpFullName, tmpUserName, tmpEmail);
-
if (resultCount > 0) {
List results = searchSubscribers(newsletterId, tmpTerm,
tmpFullName, tmpUserName, tmpEmail);
request.setAttribute("results", results);
Index: NewsletterSubscriptionAddRelAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriptionAddRelAction.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- NewsletterSubscriptionAddRelAction.java 27 Jul 2008 07:38:09 -0000
1.2
+++ NewsletterSubscriptionAddRelAction.java 28 Jul 2008 14:46:13 -0000
1.3
@@ -30,7 +30,6 @@
int authId =
Integer.parseInt(request.getParameter("authid"));
subscriptionServices.addNewRecord(authId, newsletterId);
}
-
request.setAttribute("newsletterId",
request.getParameter("newsletterId"));
return mapping.findForward("success");
}
@@ -38,7 +37,6 @@
public ActionForward subscribeNewsletters(ActionMapping mapping,
ActionForm form, HttpServletRequest request, HttpServletResponse response)
throws Exception {
log.debug("With parameter subscribeNewsletters,go to search
page");
- // TODO: merge Eva's code
if
(StringUtils.isNotBlank(request.getParameter("newsletterId"))) {
int newsletterId =
Integer.parseInt(request.getParameter("newsletterId"));
Enumeration<String> parameterNames =
request.getParameterNames();
@@ -52,7 +50,9 @@
}
}
}
- request.setAttribute("newsletterId",
request.getParameter("newsletterId"));
- return mapping.findForward("success");
+
+ ActionForward ret = new
ActionForward(mapping.findForward("success").getPath() + "?newsletterId=" +
request.getParameter("newsletterId"));
+ ret.setRedirect(true);
+ return ret;
}
}
Index: NewsletterTermSearchAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterTermSearchAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NewsletterTermSearchAction.java 24 Jul 2008 09:04:16 -0000 1.4
+++ NewsletterTermSearchAction.java 28 Jul 2008 14:46:13 -0000 1.5
@@ -4,12 +4,12 @@
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.mmbase.bridge.Cloud;
-import com.finalist.cmsc.mmbase.PropertiesUtil;
+import com.finalist.cmsc.paging.PagingStatusHolder;
+import com.finalist.cmsc.paging.PagingUtils;
import com.finalist.cmsc.services.community.ApplicationContextFactory;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
import com.finalist.newsletter.domain.Term;
@@ -19,39 +19,20 @@
@Override
public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud) throws Exception {
- // TODO Auto-generated method stub
+
+ PagingStatusHolder pagingHolder =
PagingUtils.getStatusHolder(request);
+
int newsletterId =
Integer.parseInt(request.getParameter("newsletterId"));
String tmpName = request.getParameter("name");
- int pagesize = 10;
- int offset = 0;
- int resultCount = 0;
- if
(StringUtils.isNotEmpty(PropertiesUtil.getProperty("repository.search.results.per.page")))
{
- pagesize =
Integer.parseInt(PropertiesUtil.getProperty("repository.search.results.per.page"));
- }
- if (StringUtils.isNotBlank(request.getParameter("offset"))) {
- offset =
Integer.parseInt(request.getParameter("offset"));
- }
- String order = "number";
- if (StringUtils.isNotBlank(request.getParameter("order"))) {
- order = request.getParameter("order");
- }
- String direction = "UP";
- String paramDir = request.getParameter("direction");
- if (StringUtils.isNotBlank(paramDir)) {
- direction = "1".equals(paramDir) ? "UP" : "DOWN";
- }
NewsletterService newsletterService = (NewsletterService)
ApplicationContextFactory.getBean("newsletterServices");
- resultCount =
newsletterService.getNewsletterTermsCountByName(newsletterId, tmpName);
- List<Term> terms =
newsletterService.getNewsletterTermsByName(newsletterId, tmpName, pagesize,
offset * pagesize, order, direction);
+
+ int resultCount =
newsletterService.getNewsletterTermsByName(newsletterId, tmpName, false).size();
+ List<Term> terms =
newsletterService.getNewsletterTermsByName(newsletterId, tmpName, true);
if (terms != null) {
request.setAttribute("results", terms);
- request.setAttribute("resultCount", resultCount);
- request.setAttribute("offset", offset);
-
- request.setAttribute("order", order);
- request.setAttribute("direction", paramDir);
}
+ request.setAttribute("resultCount", resultCount);
request.setAttribute("newsletterId", newsletterId);
return mapping.findForward("success");
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
