Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv30840/portlets-newsletter/src/java/com/finalist/newsletter/forms
Modified Files:
NewsletterPublicationEdit.java NewsletterCreate.java
NewsletterPublicationCreate.java NewsletterEdit.java
NewletterPublicationInitAction.java
Log Message:
CMSC-900 Use commons.lang.SringUtils for string emptiness
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-900
Index: NewsletterPublicationEdit.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationEdit.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- NewsletterPublicationEdit.java 29 Nov 2007 10:20:56 -0000 1.3
+++ NewsletterPublicationEdit.java 10 May 2008 16:32:16 -0000 1.4
@@ -11,7 +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;
@@ -27,7 +27,7 @@
String action = getParameter(request, "action");
- if (StringUtil.isEmptyOrWhitespace(action)) {
+ if (StringUtils.isBlank(action)) {
String objectnumber = getParameter(request, "number", true);
ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?objectnumber=" +
objectnumber + "&returnurl="
Index: NewsletterCreate.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterCreate.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- NewsletterCreate.java 6 May 2008 02:56:11 -0000 1.5
+++ NewsletterCreate.java 10 May 2008 16:32:16 -0000 1.6
@@ -12,7 +12,7 @@
import javax.servlet.http.HttpServletRequest;
import net.sf.mmapps.commons.bridge.RelationUtil;
-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;
@@ -33,7 +33,7 @@
String parentnewsletter = getParameter(request, "parentnewsletter",
true);
String action = getParameter(request, "action");
- if (StringUtil.isEmptyOrWhitespace(action)) {
+ if (StringUtils.isBlank(action)) {
request.getSession().setAttribute("parentnewsletter",
parentnewsletter);
ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?action=create" +
"&contenttype=newsletter"
Index: NewsletterPublicationCreate.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterPublicationCreate.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- NewsletterPublicationCreate.java 6 May 2008 02:56:11 -0000 1.14
+++ NewsletterPublicationCreate.java 10 May 2008 16:32:16 -0000 1.15
@@ -11,7 +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;
@@ -29,7 +29,7 @@
String action = request.getParameter("action");
- if (StringUtil.isEmptyOrWhitespace(action)) { // Initialize the new
+ if (StringUtils.isBlank(action)) { // Initialize the new
int parent = Integer.parseInt(getParameter(request, "parent", true));
boolean copyContent = Boolean.valueOf(getParameter(request,
"copycontent", true));
Node publicationNode =
NewsletterPublicationUtil.createPublication(parent, copyContent);
Index: NewsletterEdit.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterEdit.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- NewsletterEdit.java 6 May 2008 02:56:11 -0000 1.7
+++ NewsletterEdit.java 10 May 2008 16:32:16 -0000 1.8
@@ -11,7 +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;
@@ -29,7 +29,7 @@
String action = getParameter(request, "action");
- if (StringUtil.isEmptyOrWhitespace(action)) {
+ if (StringUtils.isBlank(action)) {
String objectnumber = getParameter(request, "number", true);
ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?objectnumber=" +
objectnumber + "&returnurl="
Index: NewletterPublicationInitAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewletterPublicationInitAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- NewletterPublicationInitAction.java 30 Apr 2008 08:21:10 -0000 1.1
+++ NewletterPublicationInitAction.java 10 May 2008 16:32:16 -0000 1.2
@@ -1,6 +1,6 @@
package com.finalist.newsletter.forms;
-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;
@@ -16,7 +16,7 @@
HttpServletRequest httpServletRequest, HttpServletResponse
httpServletResponse) throws Exception {
NewletterPublicationForm searchForm =
(NewletterPublicationForm) actionForm;
- if (StringUtil.isEmpty(searchForm.getOrder())) {
+ if (StringUtils.isEmpty(searchForm.getOrder())) {
searchForm.setOrder("title");
}
return super.execute(actionMapping, actionForm,
httpServletRequest, httpServletResponse);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
