Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv2858/java/com/finalist/newsletter/forms
Modified Files:
NewsletterTermAction.java
Log Message:
CMSC-990,Redesign Newsletter: Subscribers & Terms tabs improve terms
management
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: NewsletterTermAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterTermAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NewsletterTermAction.java 21 Jul 2008 04:55:05 -0000 1.4
+++ NewsletterTermAction.java 22 Jul 2008 03:16:06 -0000 1.5
@@ -18,27 +18,40 @@
public class NewsletterTermAction extends DispatchAction{
+ private static final String MESSAGE_KEY = "term.exist";
+ private static final String MESSAGE_TERM_MANDATORY =
"newsletter.term.mandatory";
+ private static final String MESSAGE_TERM_EXIST = "newsletter.term.exist";
+
+ private static final String ACTION_FORWORD_ADD = "add";
+ private static final String ACTION_FORWORD_list = "list";
+ private static final String ACTION_FORWORD_SUCCESS = "success";
+ private static final String LIST_OFFSET = "offset";
+ private static final String LIST_NEWSLETTER = "newsletter";
+ private static final String TERM_NUMBER = "id";
+
public ActionForward add(ActionMapping mapping, ActionForm form,
HttpServletRequest request, HttpServletResponse response)
throws Exception {
NewsletterTermForm termForm = (NewsletterTermForm)form;
ActionMessages messages = new ActionMessages();
if(StringUtils.isBlank(termForm.getName())) {
- messages.add("term.exist",new
ActionMessage("newsletter.term.mandatory"));
+ messages.add(MESSAGE_KEY,new ActionMessage(MESSAGE_TERM_MANDATORY));
saveMessages(request, messages);
- return mapping.findForward("add");
+ return mapping.findForward(ACTION_FORWORD_ADD);
}
boolean hasTerm = NewsletterTermUtil.hasTerm(termForm.getName());
if(hasTerm){
- messages.add("term.exist",new ActionMessage("newsletter.term.exist"));
+ messages.add(MESSAGE_KEY,new ActionMessage(MESSAGE_TERM_EXIST));
saveMessages(request, messages);
- return mapping.findForward("add");
+ return mapping.findForward(ACTION_FORWORD_ADD);
}
else {
NewsletterTermUtil.addTerm(termForm.getName());
termForm.reset();
}
- return mapping.findForward("success");
+ termForm.setName(null);
+ ActionForward forward = mapping.findForward(ACTION_FORWORD_list);
+ return forward;
}
public ActionForward addInit(ActionMapping mapping, ActionForm form,
@@ -46,13 +59,13 @@
throws Exception {
NewsletterTermForm termForm = (NewsletterTermForm)form;
termForm.reset();
- return mapping.findForward("add");
+ return mapping.findForward(ACTION_FORWORD_ADD);
}
public ActionForward delete(ActionMapping mapping, ActionForm form,
HttpServletRequest request, HttpServletResponse response)
throws Exception {
- String id = request.getParameter("id");
+ String id = request.getParameter(TERM_NUMBER);
String requestIds = request.getParameter("deleteRequest");
if(StringUtils.isNotEmpty(requestIds)) {
String[] ids = requestIds.split(",");
@@ -67,14 +80,14 @@
NewsletterTermUtil.deleteTerm(Integer.parseInt(id));
}
}
- return mapping.findForward("list");
+ return mapping.findForward(ACTION_FORWORD_list);
}
public ActionForward modify(ActionMapping mapping, ActionForm form,
HttpServletRequest request, HttpServletResponse response)
throws Exception {
- String id = request.getParameter("id");
+ String id = request.getParameter(TERM_NUMBER);
String nameValue = request.getParameter("name");
if(StringUtils.isBlank(nameValue)) {
response.getWriter().print("term.mandatory");
@@ -82,7 +95,7 @@
}
boolean hasTerm = NewsletterTermUtil.hasTerm(nameValue);
if(hasTerm){
- response.getWriter().print("term.exist");
+ response.getWriter().print(MESSAGE_KEY);
}
else {
NewsletterTermUtil.updateTerm(Integer.parseInt(id), nameValue);
@@ -110,17 +123,18 @@
if(resultList == null || resultList.size() ==0) {
if(offset >= 1) {
resultList = NewsletterTermUtil.searchTerms(termForm.getName(),
(offset-1)*pageSize, pageSize);
- request.setAttribute("offset", (offset-1));
+ request.setAttribute(LIST_OFFSET, (offset-1));
termForm.setOffset(String.valueOf(offset-1));
}
}
request.setAttribute("resultList", resultList);
request.setAttribute("resultCount", totalCount);
- request.setAttribute("offset", termForm.getOffset());
- if(StringUtils.isNotEmpty(request.getParameter("newsletterId"))) {
- request.setAttribute("newsletterId",
request.getParameter("newsletterId"));
+ request.setAttribute(LIST_OFFSET, termForm.getOffset());
+
+ if(StringUtils.isNotEmpty(request.getParameter(LIST_NEWSLETTER))) {
+ request.setAttribute("newsletterId",
request.getParameter(LIST_NEWSLETTER));
}
- return mapping.findForward("success");
+ return mapping.findForward(ACTION_FORWORD_SUCCESS);
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
