Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv30190/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
Modified Files:
ChannelDelete.java SearchInitAction.java ContentAction.java
NavigatorAction.java ReorderAction.java ChannelEdit.java
ChannelCreate.java LinkToChannelAction.java SearchAction.java
Log Message:
CMSC-900 Use commons.lang.SringUtils for string emptiness
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
See also: http://www.mmbase.org/jira/browse/CMSC-900
Index: ChannelDelete.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ChannelDelete.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ChannelDelete.java 7 Mar 2008 13:00:53 -0000 1.8
+++ ChannelDelete.java 10 May 2008 16:31:23 -0000 1.9
@@ -13,7 +13,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;
@@ -38,7 +38,7 @@
String action = getParameter(request, "remove");
Node channelNode = cloud.getNode(objectnumber);
- if (StringUtil.isEmptyOrWhitespace(action)) {
+ if (StringUtils.isBlank(action)) {
if (RepositoryUtil.hasCreatedContent(channelNode)) {
return mapping.findForward("channeldeletewarning");
}
Index: SearchInitAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchInitAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- SearchInitAction.java 9 May 2008 11:25:03 -0000 1.6
+++ SearchInitAction.java 10 May 2008 16:31:23 -0000 1.7
@@ -2,7 +2,7 @@
import java.util.*;
-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,19 +25,19 @@
SearchForm searchForm = (SearchForm) form;
- if (StringUtil.isEmpty(searchForm.getExpiredate())) {
+ if (StringUtils.isEmpty(searchForm.getExpiredate())) {
searchForm.setExpiredate("0");
}
- if (StringUtil.isEmpty(searchForm.getPublishdate())) {
+ if (StringUtils.isEmpty(searchForm.getPublishdate())) {
searchForm.setPublishdate("0");
}
- if (StringUtil.isEmpty(searchForm.getOffset())) {
+ if (StringUtils.isEmpty(searchForm.getOffset())) {
searchForm.setOffset("0");
}
- if (StringUtil.isEmpty(searchForm.getOrder())) {
+ if (StringUtils.isEmpty(searchForm.getOrder())) {
searchForm.setOrder("title");
}
Index: ContentAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ContentAction.java 9 May 2008 11:25:03 -0000 1.7
+++ ContentAction.java 10 May 2008 16:31:23 -0000 1.8
@@ -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.struts.action.*;
import org.apache.struts.util.LabelValueBean;
@@ -47,10 +47,10 @@
String parentchannel = request.getParameter("parentchannel");
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;
}
@@ -69,7 +69,7 @@
}
addToRequest(request, "resultsPerPage", Integer.toString(maxNumber));
- if (!StringUtil.isEmpty(parentchannel)) {
+ if (StringUtils.isNotEmpty(parentchannel)) {
Node channel = cloud.getNode(parentchannel);
NodeList elements = RepositoryUtil.getLinkedElements(channel, null,
orderby, direction, false, offset*maxNumber, maxNumber, -1, -1, -1);
int elementCount = RepositoryUtil.countLinkedContent(channel);
Index: NavigatorAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/NavigatorAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- NavigatorAction.java 26 Nov 2007 11:43:40 -0000 1.6
+++ NavigatorAction.java 10 May 2008 16:31:23 -0000 1.7
@@ -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.struts.action.*;
import org.mmbase.bridge.*;
@@ -73,7 +73,7 @@
@Override
protected List<String> getChildren(Cloud cloud, String path) {
List<String> strings = new ArrayList<String>();
- if (StringUtil.isEmpty(path)) {
+ if (StringUtils.isEmpty(path)) {
Node parentNode = RepositoryUtil.getRootNode(cloud);
strings.add(parentNode.getStringValue(TreeUtil.PATH_FIELD));
}
Index: ReorderAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ReorderAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ReorderAction.java 26 Nov 2007 11:43:40 -0000 1.7
+++ ReorderAction.java 10 May 2008 16:31:23 -0000 1.8
@@ -13,7 +13,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;
@@ -31,7 +31,7 @@
String action = getParameter(request, "action");
- if (!StringUtil.isEmptyOrWhitespace(action)) {
+ if (StringUtils.isNotBlank(action)) {
if ("reorder".equals(action)) {
String parent = request.getParameter("parent");
if (!isCancelled(request)) {
@@ -61,7 +61,7 @@
String direction = request.getParameter("direction");
String offsetStr = request.getParameter("offset");
String[] ids = request.getParameterValues("ids[]");
- if (!StringUtil.isEmptyOrWhitespace(direction) &&
direction.equalsIgnoreCase("down")) {
+ if (StringUtils.isNotBlank(direction) &&
direction.equalsIgnoreCase("down")) {
ids = reverseIds(ids).split(",");
}
List<Integer> changeNumbers = RepositoryUtil
Index: ChannelEdit.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ChannelEdit.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ChannelEdit.java 26 Nov 2007 11:43:40 -0000 1.4
+++ ChannelEdit.java 10 May 2008 16:31:23 -0000 1.5
@@ -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="
Index: ChannelCreate.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ChannelCreate.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ChannelCreate.java 26 Nov 2007 11:43:40 -0000 1.4
+++ ChannelCreate.java 10 May 2008 16:31:23 -0000 1.5
@@ -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");
String channeltype = getParameter(request, "channeltype",
RepositoryUtil.CONTENTCHANNEL);
- if (StringUtil.isEmptyOrWhitespace(action)) {
+ if (StringUtils.isBlank(action)) {
request.getSession().setAttribute("parentchannel", parentchannel);
ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?action=create"
Index: LinkToChannelAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/LinkToChannelAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- LinkToChannelAction.java 7 Jan 2008 22:37:25 -0000 1.10
+++ LinkToChannelAction.java 10 May 2008 16:31:23 -0000 1.11
@@ -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;
@@ -53,7 +53,7 @@
}
else {
String destinationnumber = getParameter(request,
"destionationchannel");
- if (!StringUtil.isEmpty(destinationnumber)) {
+ if (StringUtils.isNotEmpty(destinationnumber)) {
Node newCreationNode = cloud.getNode(destinationnumber);
RepositoryUtil.removeContentFromChannel(objectNode,
channelNode);
Index: SearchAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- SearchAction.java 9 May 2008 11:25:03 -0000 1.12
+++ SearchAction.java 10 May 2008 16:31:23 -0000 1.13
@@ -4,7 +4,7 @@
import java.util.List;
import java.util.StringTokenizer;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import net.sf.mmapps.commons.util.KeywordUtil;
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
import net.sf.mmapps.modules.cloudprovider.CloudProvider;
@@ -90,7 +90,7 @@
NodeManager nodeManager =
cloud.getNodeManager(searchForm.getContenttypes());
QueryStringComposer queryStringComposer = new QueryStringComposer();
- if(!StringUtil.isEmpty(request.getParameter(MODE))) {
+ if(StringUtils.isNotEmpty(request.getParameter(MODE))) {
queryStringComposer.addParameter(MODE,
request.getParameter(MODE));
}
NodeQuery query = cloud.createNodeQuery();
@@ -100,7 +100,7 @@
// First add the proper step to the query.
Step theStep = null;
- if (!StringUtil.isEmpty(searchForm.getParentchannel())) {
+ if (StringUtils.isNotEmpty(searchForm.getParentchannel())) {
Step step =
query.addStep(cloud.getNodeManager(RepositoryUtil.CONTENTCHANNEL));
query.addNode(step, cloud.getNode(searchForm.getParentchannel()));
theStep = query.addRelationStep(nodeManager,
RepositoryUtil.CONTENTREL, "DESTINATION").getNext();
@@ -116,7 +116,7 @@
String order = searchForm.getOrder();
// set default order field
- if (StringUtil.isEmpty(order)) {
+ if (StringUtils.isEmpty(order)) {
if (nodeManager.hasField("title")) {
order = "title";
}
@@ -124,7 +124,7 @@
order = "name";
}
}
- if (StringUtil.isEmpty(order)) {
+ if (StringUtils.isEmpty(order)) {
queryStringComposer.addParameter(ORDER, searchForm.getOrder());
queryStringComposer.addParameter(DIRECTION, "" +
searchForm.getDirection());
query.addSortOrder(query.getStepField(nodeManager.getField(order)),
searchForm.getDirection());
@@ -157,7 +157,7 @@
Field field = fieldIterator.nextField();
String paramName = nodeManager.getName() + "." +
field.getName();
String paramValue = request.getParameter(paramName);
- if (!StringUtil.isEmpty(paramValue)) {
+ if (StringUtils.isNotEmpty(paramValue)) {
SearchUtil.addLikeConstraint(query, field,
paramValue.trim());
}
queryStringComposer.addParameter(paramName, paramValue);
@@ -165,7 +165,7 @@
}
// Add the title constraint:
- if (!StringUtil.isEmpty(searchForm.getTitle())) {
+ if (StringUtils.isNotEmpty(searchForm.getTitle())) {
queryStringComposer.addParameter(ContentElementUtil.TITLE_FIELD,
searchForm.getTitle().trim());
Field field = nodeManager.getField(ContentElementUtil.TITLE_FIELD);
@@ -174,7 +174,7 @@
}
// And some keyword searching
- if (!StringUtil.isEmpty(searchForm.getKeywords())) {
+ if (StringUtils.isNotEmpty(searchForm.getKeywords())) {
queryStringComposer.addParameter(ContentElementUtil.KEYWORD_FIELD,
searchForm.getKeywords());
Field keywordField =
nodeManager.getField(ContentElementUtil.KEYWORD_FIELD);
List<String> keywords =
KeywordUtil.getKeywords(searchForm.getKeywords());
@@ -185,7 +185,7 @@
}
// Set the objectid constraint
- if (!StringUtil.isEmpty(searchForm.getObjectid())) {
+ if (StringUtils.isNotEmpty(searchForm.getObjectid())) {
String stringObjectId = searchForm.getObjectid().trim();
Integer objectId = null;
if (stringObjectId.matches("^\\d+$")) {
@@ -204,7 +204,7 @@
}
// Add the user personal:
- if (!StringUtil.isEmpty(searchForm.getPersonal())) {
+ if (StringUtils.isNotEmpty(searchForm.getPersonal())) {
String useraccount = cloud.getUser().getIdentifier();
if
(ContentElementUtil.LASTMODIFIER_FIELD.equals(searchForm.getPersonal())) {
@@ -217,7 +217,7 @@
}
// Add the user
- if (!StringUtil.isEmpty(searchForm.getUseraccount())) {
+ if (StringUtils.isNotEmpty(searchForm.getUseraccount())) {
String useraccount = searchForm.getUseraccount();
SearchUtil.addEqualConstraint(query, nodeManager,
ContentElementUtil.LASTMODIFIER_FIELD, useraccount);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
