Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv14599/portlets-newsletter/src/java/com/finalist/newsletter/forms
Modified Files:
NewsletterDelete.java SubscriptioManagementAction.java
Log Message:
CMSC-1029 Move some sources from net.sf.mmapps.mmcommons to cmsc cvs
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-1029
Index: NewsletterDelete.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterDelete.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- NewsletterDelete.java 21 Jul 2008 12:52:40 -0000 1.12
+++ NewsletterDelete.java 25 Jul 2008 15:53:09 -0000 1.13
@@ -11,8 +11,7 @@
import javax.servlet.http.HttpServletRequest;
-import net.sf.mmapps.commons.util.StringUtil;
-
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.mmbase.bridge.Cloud;
@@ -52,7 +51,7 @@
NewsletterUtil.deleteSubscriptionByTerm(newsletterNode);
NavigationUtil.deleteItem(newsletterNode);
- if(!StringUtil.isEmpty(getParameter(request,"forward"))){
+ if(StringUtils.isNotEmpty(getParameter(request,"forward"))){
return mapping.findForward("newslettermanage");
}
return mapping.findForward(SUCCESS);
Index: SubscriptioManagementAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscriptioManagementAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- SubscriptioManagementAction.java 7 Jul 2008 04:03:43 -0000 1.8
+++ SubscriptioManagementAction.java 25 Jul 2008 15:53:09 -0000 1.9
@@ -1,24 +1,21 @@
package com.finalist.newsletter.forms;
-import com.finalist.cmsc.services.community.person.Person;
-import com.finalist.cmsc.services.community.person.PersonService;
-import com.finalist.newsletter.domain.Newsletter;
-import com.finalist.newsletter.domain.Subscription;
-import com.finalist.newsletter.services.*;
+import java.util.*;
-import net.sf.mmapps.commons.util.StringUtil;
+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;
-import org.apache.struts.action.ActionForward;
-import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.*;
import org.springframework.web.struts.DispatchActionSupport;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import com.finalist.cmsc.services.community.person.Person;
+import com.finalist.cmsc.services.community.person.PersonService;
+import com.finalist.newsletter.domain.Newsletter;
+import com.finalist.newsletter.domain.Subscription;
+import com.finalist.newsletter.services.*;
public class SubscriptioManagementAction extends DispatchActionSupport {
@@ -29,6 +26,7 @@
NewsletterPublicationService publicationService;
PersonService personServices;
+ @Override
protected void onInit() {
super.onInit();
newsletterService = (NewsletterService)
getWebApplicationContext().getBean("newsletterServices");
@@ -37,6 +35,7 @@
publicationService = (NewsletterPublicationService)
getWebApplicationContext().getBean("publicationService");
}
+ @Override
protected ActionForward unspecified(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
HttpServletResponse response)
throws Exception {
@@ -134,10 +133,12 @@
result.put("status",subscription.getStatus().toString());
result.put("newsletter",newsletterService.getNewsletterBySubscription(subscription.getId()).getTitle());
Person tmpPerson
=personServices.getPersonByEmail(subscription.getSubscriber().getEmail());
- if(tmpPerson.getFirstName() != null)
+ if(tmpPerson.getFirstName() != null) {
result.put("username", tmpPerson.getFirstName());
- if(tmpPerson.getLastName() != null)
+ }
+ if(tmpPerson.getLastName() != null) {
result.put("fullname", tmpPerson.getFirstName() + " " +
tmpPerson.getLastName());
+ }
result.put("email", subscription.getSubscriber().getEmail());
results.add(result);
}
@@ -191,9 +192,9 @@
public ActionForward showImportPage(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
HttpServletResponse response) {
log.debug("Show import page");
- String importType = (String)request.getParameter("importType");
- if(!StringUtil.isEmpty(importType)){
- int newsletterId =
Integer.parseInt((String)request.getParameter("newsletterId"));
+ String importType = request.getParameter("importType");
+ if(StringUtils.isNotEmpty(importType)){
+ int newsletterId =
Integer.parseInt(request.getParameter("newsletterId"));
request.setAttribute("importType",importType);
request.setAttribute("newsletterId", newsletterId);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
