[MMBASE CVS] contributions/CMSContainer_Modules/egemmail/src/java/com/finalist/cmsc/egemmail/forms EgemSearchAction.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer_Modules/egemmail/src/java/com/finalist/cmsc/egemmail/forms
In directory 
james.mmbase.org:/tmp/cvs-serv30647/egemmail/src/java/com/finalist/cmsc/egemmail/forms

Modified Files:
        EgemSearchAction.java 
Log Message:
CMSC-900 Use commons.lang.SringUtils for string emptiness


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/egemmail/src/java/com/finalist/cmsc/egemmail/forms
See also: http://www.mmbase.org/jira/browse/CMSC-900


Index: EgemSearchAction.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer_Modules/egemmail/src/java/com/finalist/cmsc/egemmail/forms/EgemSearchAction.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- EgemSearchAction.java       12 Apr 2008 14:26:33 -0000      1.6
+++ EgemSearchAction.java       10 May 2008 16:31:49 -0000      1.7
@@ -6,7 +6,7 @@
 import javax.servlet.http.HttpServletResponse;
 
 import net.sf.mmapps.commons.util.KeywordUtil;
-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;
@@ -39,16 +39,16 @@
       NodeManager nodeManager = 
cloud.getNodeManager(ContentElementUtil.CONTENTELEMENT);
       NodeQuery query = nodeManager.createQuery();
 
-      if (!StringUtil.isEmpty(form.getTitle())) {
+      if (StringUtils.isNotEmpty(form.getTitle())) {
          Field field = nodeManager.getField("title");
          SearchUtil.addLikeConstraint(query, field, form.getTitle());
       }
 
-      if (!StringUtil.isEmpty(form.getAuthor())) {
+      if (StringUtils.isNotEmpty(form.getAuthor())) {
          SearchUtil.addEqualConstraint(query, nodeManager, "lastmodifier", 
form.getAuthor());
       }
 
-      if (!StringUtil.isEmpty(form.getKeywords())) {
+      if (StringUtils.isNotEmpty(form.getKeywords())) {
          List<String> keywords = KeywordUtil.getKeywords(form.getKeywords());
          Field field = nodeManager.getField("keywords");
          for (String string : keywords) {
@@ -72,7 +72,7 @@
          removeUnpublished(cloud, results);
       }
 
-      int offset = StringUtil.isEmptyOrWhitespace(form.getPage()) ? 0 : 
Integer.parseInt(form.getPage());
+      int offset = StringUtils.isBlank(form.getPage()) ? 0 : 
Integer.parseInt(form.getPage());
       int resultsPerPage = 50;
       int numberOfResults = results.size();
 
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs