[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository KeywordProcessor.java ContentElementUtil.java RepositoryUtil.java

[Nico Klasens]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository
In directory 
james.mmbase.org:/tmp/cvs-serv30190/cmsc/contentrepository/src/java/com/finalist/cmsc/repository

Modified Files:
        KeywordProcessor.java ContentElementUtil.java 
        RepositoryUtil.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
See also: http://www.mmbase.org/jira/browse/CMSC-900


Index: KeywordProcessor.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/KeywordProcessor.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- KeywordProcessor.java       26 Nov 2007 11:43:41 -0000      1.5
+++ KeywordProcessor.java       10 May 2008 16:31:23 -0000      1.6
@@ -12,7 +12,7 @@
 import java.util.*;
 
 import net.sf.mmapps.commons.util.KeywordUtil;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
 
 import org.mmbase.bridge.*;
 import org.mmbase.datatypes.StringDataType;
@@ -26,7 +26,7 @@
          throw new IllegalArgumentException("Processor only works on 
ContentElement types, not on: "
                + node.getNodeManager().getName());
       }
-      if (StringUtil.isEmpty(node.getStringValue(field.getName()))) {
+      if (StringUtils.isEmpty(node.getStringValue(field.getName()))) {
          List<String> textFields = new ArrayList<String>();
 
          FieldList fields = node.getNodeManager().getFields();
@@ -38,20 +38,20 @@
                   && !ContentElementUtil.isContentElementField(managerField)) {
 
                String text = node.getStringValue(managerField.getName());
-               if (!StringUtil.isEmptyOrWhitespace(text)) {
+               if (StringUtils.isNotBlank(text)) {
                   text = text.replaceAll("<.+?>", "");
                   textFields.add(text);
                }
             }
          }
          String title = node.getStringValue(ContentElementUtil.TITLE_FIELD);
-         if (!StringUtil.isEmptyOrWhitespace(title)) {
+         if (StringUtils.isNotBlank(title)) {
             textFields.add(title);
          }
 
          List<String> keywords = KeywordUtil.getKeywords(textFields, 50);
          String keywordStr = KeywordUtil.keywordsToString(keywords);
-         if (!StringUtil.isEmpty(keywordStr)) {
+         if (StringUtils.isNotEmpty(keywordStr)) {
             node.setValue(field.getName(), keywordStr);
          }
       }


Index: ContentElementUtil.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/ContentElementUtil.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ContentElementUtil.java     9 May 2008 11:25:03 -0000       1.11
+++ ContentElementUtil.java     10 May 2008 16:31:23 -0000      1.12
@@ -11,7 +11,7 @@
 
 import java.util.*;
 
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
 import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
 
 import org.mmbase.bridge.*;
@@ -377,7 +377,7 @@
 
 
    public static void addArchiveConstraint(Node channel, NodeQuery query, Long 
date, String archive) {
-      if (StringUtil.isEmpty(archive) || "all".equalsIgnoreCase(archive)) {
+      if (StringUtils.isEmpty(archive) || "all".equalsIgnoreCase(archive)) {
          return;
       }
       NodeManager contentManager = 
channel.getCloud().getNodeManager(CONTENTELEMENT);
@@ -408,7 +408,7 @@
      *         <li>true if archive is others and content's archive time is 
after or equels to current time
      */
    public static boolean matchArchive(Node content, String archive) {
-      if (StringUtil.isEmpty(archive) || "all".equalsIgnoreCase(archive)) {
+      if (StringUtils.isEmpty(archive) || "all".equalsIgnoreCase(archive)) {
          return true;
       }
       // Precision of now is based on minutes.


Index: RepositoryUtil.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/RepositoryUtil.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- RepositoryUtil.java 24 Apr 2008 07:38:18 -0000      1.18
+++ RepositoryUtil.java 10 May 2008 16:31:23 -0000      1.19
@@ -12,7 +12,7 @@
 import java.util.*;
 
 import net.sf.mmapps.commons.bridge.*;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
 import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
 
 import org.mmbase.bridge.Cloud;
@@ -666,7 +666,7 @@
         if (useLifecycle) {
             ContentElementUtil.addLifeCycleConstraint(query, date);
         }
-        if (!StringUtil.isEmpty(archive)) {
+        if (StringUtils.isNotEmpty(archive)) {
             ContentElementUtil.addArchiveConstraint(channel, query, date, 
archive);
         }
 
@@ -840,7 +840,7 @@
     public static Node createChannel(Cloud cloud, String name, String 
pathname) {
         Node channel = getNodeManager(cloud).createNode();
         channel.setStringValue(TITLE_FIELD, name);
-        if (!StringUtil.isEmpty(pathname)) {
+        if (StringUtils.isNotEmpty(pathname)) {
             channel.setStringValue(FRAGMENT_FIELD, pathname);
         }
         channel.commit();
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs