Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms
In directory
james.mmbase.org:/tmp/cvs-serv30190/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms
Modified Files:
ImageInitAction.java SearchInitAction.java UrlInitAction.java
SearchAction.java AttachmentInitAction.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/resources/forms
See also: http://www.mmbase.org/jira/browse/CMSC-900
Index: ImageInitAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/ImageInitAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ImageInitAction.java 26 Nov 2007 11:43:39 -0000 1.3
+++ ImageInitAction.java 10 May 2008 16:31:23 -0000 1.4
@@ -1,6 +1,6 @@
package com.finalist.cmsc.resources.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 {
ImageForm searchForm = (ImageForm) actionForm;
- if (StringUtil.isEmpty(searchForm.getOrder())) {
+ if (StringUtils.isEmpty(searchForm.getOrder())) {
searchForm.setOrder("title");
}
return super.execute(actionMapping, actionForm, httpServletRequest,
httpServletResponse);
Index: SearchInitAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/SearchInitAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- SearchInitAction.java 26 Nov 2007 11:43:39 -0000 1.3
+++ SearchInitAction.java 10 May 2008 16:31:23 -0000 1.4
@@ -1,6 +1,6 @@
package com.finalist.cmsc.resources.forms;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.Action;
import org.apache.struts.action.ActionForward;
@@ -18,7 +18,7 @@
HttpServletRequest httpServletRequest, HttpServletResponse
httpServletResponse) throws Exception {
SearchForm searchForm = (SearchForm) actionForm;
- if (StringUtil.isEmpty(searchForm.getOffset())) {
+ if (StringUtils.isEmpty(searchForm.getOffset())) {
searchForm.setOffset("0");
}
Index: UrlInitAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/UrlInitAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- UrlInitAction.java 26 Nov 2007 11:43:39 -0000 1.3
+++ UrlInitAction.java 10 May 2008 16:31:23 -0000 1.4
@@ -1,6 +1,6 @@
package com.finalist.cmsc.resources.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 {
UrlForm searchForm = (UrlForm) actionForm;
- if (StringUtil.isEmpty(searchForm.getOrder())) {
+ if (StringUtils.isEmpty(searchForm.getOrder())) {
searchForm.setOrder("name");
}
return super.execute(actionMapping, actionForm, httpServletRequest,
httpServletResponse);
Index: SearchAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/SearchAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- SearchAction.java 26 Nov 2007 11:43:39 -0000 1.7
+++ SearchAction.java 10 May 2008 16:31:23 -0000 1.8
@@ -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.*;
import org.mmbase.bridge.*;
@@ -63,7 +63,7 @@
String order = searchForm.getOrder();
// set default order field
- if (StringUtil.isEmpty(order)) {
+ if (StringUtils.isEmpty(order)) {
if (nodeManager.hasField("title")) {
order = "title";
}
@@ -72,7 +72,7 @@
}
}
- if (!StringUtil.isEmpty(order)) {
+ if (StringUtils.isNotEmpty(order)) {
queryStringComposer.addParameter(ORDER, order);
queryStringComposer.addParameter(DIRECTION, "" +
searchForm.getDirection());
query.addSortOrder(query.getStepField(nodeManager.getField(order)),
searchForm.getDirection());
@@ -83,7 +83,7 @@
addConstraints(searchForm, nodeManager, queryStringComposer, query);
// Set the objectid constraint
- if (!StringUtil.isEmpty(searchForm.getObjectid())) {
+ if (StringUtils.isNotEmpty(searchForm.getObjectid())) {
Integer objectId = null;
if (searchForm.getObjectid().matches("^\\d+$")) {
objectId = new Integer(searchForm.getObjectid());
@@ -135,7 +135,7 @@
protected void addField(NodeManager nodeManager, QueryStringComposer
queryStringComposer, NodeQuery query,
String fieldname, String value) {
- if (!StringUtil.isEmpty(value)) {
+ if (StringUtils.isNotEmpty(value)) {
Field field = nodeManager.getField(fieldname);
SearchUtil.addLikeConstraint(query, field, value);
queryStringComposer.addParameter(fieldname, value);
Index: AttachmentInitAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/AttachmentInitAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- AttachmentInitAction.java 26 Nov 2007 11:43:39 -0000 1.3
+++ AttachmentInitAction.java 10 May 2008 16:31:23 -0000 1.4
@@ -1,6 +1,6 @@
package com.finalist.cmsc.resources.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 {
AttachmentForm searchForm = (AttachmentForm) 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
