Update of
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts
In directory
james.mmbase.org:/tmp/cvs-serv30190/cmsc/utilities/src/java/com/finalist/cmsc/struts
Modified Files:
WizardCloseAction.java WizardInitAction.java MMBaseForm.java
TreeAction.java WizardListAction.java
Log Message:
CMSC-900 Use commons.lang.SringUtils for string emptiness
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts
See also: http://www.mmbase.org/jira/browse/CMSC-900
Index: WizardCloseAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/WizardCloseAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- WizardCloseAction.java 26 Nov 2007 11:43:41 -0000 1.3
+++ WizardCloseAction.java 10 May 2008 16:31:23 -0000 1.4
@@ -4,7 +4,7 @@
import javax.servlet.http.*;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.*;
@@ -25,31 +25,31 @@
session.removeAttribute("creation");
String returnurl = request.getParameter("returnurl");
- if (StringUtil.isEmpty(returnurl)) {
+ if (StringUtils.isEmpty(returnurl)) {
returnurl = (String) session.getAttribute("returnurl");
session.removeAttribute("returnurl");
}
String url = "empty.html";
- if (!StringUtil.isEmpty(returnurl)) {
+ if (StringUtils.isNotEmpty(returnurl)) {
url = returnurl;
}
String action = request.getParameter("action");
- if (StringUtil.isEmpty(action)) {
+ if (StringUtils.isEmpty(action)) {
action = (String) session.getAttribute("wizardaction");
session.removeAttribute("wizardaction");
}
url = addParam(url, "action", action);
String ewnode = request.getParameter("ewnode-lastedited");
- if (StringUtil.isEmpty(ewnode)) {
+ if (StringUtils.isEmpty(ewnode)) {
ewnode = (String) session.getAttribute("ewnode-lastedited");
session.removeAttribute("ewnode-lastedited");
}
url = addParam(url, "ewnodelastedited", ewnode);
String popup = request.getParameter("popup");
- if (StringUtil.isEmpty(popup)) {
+ if (StringUtils.isEmpty(popup)) {
popup = (String) session.getAttribute("popup");
session.removeAttribute("popup");
}
@@ -76,7 +76,7 @@
private String addParam(String url, String name, String value) {
- if (!StringUtil.isEmpty(value)) {
+ if (StringUtils.isNotEmpty(value)) {
if (url.indexOf("?") > -1) {
return url + "&" + name + "=" + value;
}
Index: WizardInitAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/WizardInitAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- WizardInitAction.java 26 Nov 2007 11:43:41 -0000 1.5
+++ WizardInitAction.java 10 May 2008 16:31:23 -0000 1.6
@@ -5,7 +5,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
-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;
@@ -39,17 +39,17 @@
HttpSession session = request.getSession();
String returnurl = request.getParameter("returnurl");
- if (!StringUtil.isEmpty(returnurl)) {
+ if (StringUtils.isNotEmpty(returnurl)) {
session.setAttribute("returnurl", returnurl);
}
String popup = request.getParameter("popup");
- if (!StringUtil.isEmpty(popup)) {
+ if (StringUtils.isNotEmpty(popup)) {
session.setAttribute("popup", popup);
}
String creation = request.getParameter("creation");
- if (!StringUtil.isEmpty(creation)) {
+ if (StringUtils.isNotEmpty(creation)) {
session.setAttribute("creation", creation);
}
else {
@@ -82,7 +82,7 @@
session.setAttribute("contenttype", contenttype);
String wizardConfigName = request.getParameter("wizardConfigName");
- if (StringUtil.isEmpty(wizardConfigName)) {
+ if (StringUtils.isEmpty(wizardConfigName)) {
NodeList list = null;
NodeManager manager = cloud.getNodeManager("editwizards");
list = manager.getList("nodepath = '" + contenttype + "'", null,
null);
Index: MMBaseForm.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/MMBaseForm.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- MMBaseForm.java 26 Nov 2007 11:43:41 -0000 1.3
+++ MMBaseForm.java 10 May 2008 16:31:23 -0000 1.4
@@ -13,7 +13,7 @@
import java.text.ParseException;
import java.util.Date;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForm;
import org.mmbase.util.logging.Logger;
@@ -59,7 +59,7 @@
protected Date convertToDate(String deadline) {
Date input = null;
- if (!StringUtil.isEmpty(deadline)) {
+ if (StringUtils.isNotEmpty(deadline)) {
try {
input = DateFormat.getDateInstance().parse(deadline);
}
Index: TreeAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/TreeAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- TreeAction.java 12 Apr 2008 14:26:11 -0000 1.5
+++ TreeAction.java 10 May 2008 16:31:23 -0000 1.6
@@ -16,7 +16,7 @@
import javax.servlet.http.HttpServletResponse;
import net.sf.mmapps.commons.util.HttpUtil;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.*;
import org.mmbase.bridge.Cloud;
@@ -35,7 +35,7 @@
TreeInfo info = getTreeInfo(cloud);
String action = request.getParameter("action");
- if (!StringUtil.isEmpty(action)) {
+ if (StringUtils.isNotEmpty(action)) {
response.setContentType("text/xml");
if ("expand".equals(action)) {
String persistentid = request.getParameter("persistentid");
@@ -75,7 +75,7 @@
}
else {
String channel = getChannelId(request, cloud);
- if (!StringUtil.isEmpty(channel) && !"notfound".equals(channel)) {
+ if (StringUtils.isNotEmpty(channel) && !"notfound".equals(channel)) {
Node channelNode = cloud.getNode(channel);
List<Node> openChannels = getOpenChannels(channelNode);
if (openChannels != null) {
Index: WizardListAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/struts/WizardListAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- WizardListAction.java 26 Nov 2007 11:43:41 -0000 1.4
+++ WizardListAction.java 10 May 2008 16:31:23 -0000 1.5
@@ -1,6 +1,6 @@
package com.finalist.cmsc.struts;
-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;
@@ -96,10 +96,10 @@
private void addParameter(StringBuffer forward, String value, String
paramname, String defaultvalue) {
- if (StringUtil.isEmptyOrWhitespace(value)) {
+ if (StringUtils.isBlank(value)) {
value = defaultvalue;
}
- if (!StringUtil.isEmptyOrWhitespace(value)) {
+ if (StringUtils.isNotBlank(value)) {
forward.append("&").append(paramname).append("=").append(value);
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
