Update of
/var/cvs/contributions/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms
In directory
james.mmbase.org:/tmp/cvs-serv30647/subsite/src/java/com/finalist/cmsc/subsite/forms
Modified Files:
PersonalPageEdit.java SubSiteAction.java PPContentAction.java
PersonalPageCreate.java SubSiteEdit.java SubSiteCreate.java
Log Message:
CMSC-900 Use commons.lang.SringUtils for string emptiness
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms
See also: http://www.mmbase.org/jira/browse/CMSC-900
Index: PersonalPageEdit.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageEdit.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PersonalPageEdit.java 13 Dec 2007 13:05:42 -0000 1.1
+++ PersonalPageEdit.java 10 May 2008 16:31:48 -0000 1.2
@@ -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;
@@ -25,7 +25,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="
Index: SubSiteAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- SubSiteAction.java 31 Mar 2008 19:49:02 -0000 1.8
+++ SubSiteAction.java 10 May 2008 16:31:48 -0000 1.9
@@ -14,7 +14,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForm;
@@ -100,7 +100,7 @@
String order = searchForm.getOrder();
// set default order field
- if (order != null && StringUtil.isEmpty(order)) {
+ if (order != null && StringUtils.isEmpty(order)) {
if (nodeManager.hasField("title")) {
order = "title";
}
@@ -129,7 +129,7 @@
NodeQuery query = createLinkedElementsQuery(subsiteNode, order,
direction, offset*maxNumber, maxNumber, -1, -1, -1);
// Add the title constraint:
- if (!StringUtil.isEmpty(searchForm.getTitle())) {
+ if (StringUtils.isNotEmpty(searchForm.getTitle())) {
Field field = nodeManager.getField(PagesUtil.TITLE_FIELD);
Constraint titleConstraint = SearchUtil.createLikeConstraint(query,
field, searchForm.getTitle());
SearchUtil.addConstraint(query, titleConstraint);
Index: PPContentAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PPContentAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PPContentAction.java 26 Feb 2008 12:18:09 -0000 1.4
+++ PPContentAction.java 10 May 2008 16:31:48 -0000 1.5
@@ -12,7 +12,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -42,10 +42,10 @@
if (ppChannel != null) {
String orderby = request.getParameter("orderby");
String direction = request.getParameter("direction");
- if (StringUtil.isEmpty(orderby)) {
+ if (StringUtils.isEmpty(orderby)) {
orderby = null;
}
- if (StringUtil.isEmpty(direction)) {
+ if (StringUtils.isEmpty(direction)) {
direction = null;
}
Index: PersonalPageCreate.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- PersonalPageCreate.java 4 Jan 2008 16:51:41 -0000 1.2
+++ PersonalPageCreate.java 10 May 2008 16:31:48 -0000 1.3
@@ -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;
@@ -30,7 +30,7 @@
String parentpage = getParameter(request, "parentpage", true);
String action = getParameter(request, "action");
- if (StringUtil.isEmptyOrWhitespace(action)) {
+ if (StringUtils.isBlank(action)) {
request.getSession().setAttribute("parentpage", parentpage);
ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?action=create"
Index: SubSiteEdit.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- SubSiteEdit.java 11 Dec 2007 13:38:08 -0000 1.1
+++ SubSiteEdit.java 10 May 2008 16:31:48 -0000 1.2
@@ -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;
@@ -25,7 +25,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="
Index: SubSiteCreate.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteCreate.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- SubSiteCreate.java 4 Jan 2008 16:51:41 -0000 1.2
+++ SubSiteCreate.java 10 May 2008 16:31:48 -0000 1.3
@@ -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;
@@ -30,7 +30,7 @@
String parentpage = getParameter(request, "parentpage", true);
String action = getParameter(request, "action");
- if (StringUtil.isEmptyOrWhitespace(action)) {
+ if (StringUtils.isBlank(action)) {
request.getSession().setAttribute("parentpage", parentpage);
ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?action=create"
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
