[MMBASE CVS] contributions/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders RichTextBuilder.java

[Nico Klasens]

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

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


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders
See also: http://www.mmbase.org/jira/browse/CMSC-900


Index: RichTextBuilder.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders/RichTextBuilder.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- RichTextBuilder.java        12 Apr 2008 14:26:07 -0000      1.12
+++ RichTextBuilder.java        10 May 2008 16:31:23 -0000      1.13
@@ -4,7 +4,7 @@
 import java.net.URL;
 import java.util.*;
 
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
 
 import org.mmbase.applications.wordfilter.WordHtmlCleaner;
 import org.mmbase.bridge.Field;
@@ -58,18 +58,18 @@
 
       Map<String, String> map = getInitParameters("cmsc/richtext");
       String download = map.get("downloadImages");
-      if (!StringUtil.isEmpty(download)) {
+      if (StringUtils.isNotEmpty(download)) {
          downloadImages = Boolean.valueOf(download);
       }
       String resolve = map.get("resolveIds");
-      if (!StringUtil.isEmpty(resolve)) {
+      if (StringUtils.isNotEmpty(resolve)) {
          resolveIds = Boolean.valueOf(resolve);
       }
 
       Collection<CoreField> fields = getFields();
       for (CoreField field : fields) {
          DataType dataType = field.getDataType();
-         while (StringUtil.isEmpty(dataType.getName())) {
+         while (StringUtils.isEmpty(dataType.getName())) {
             dataType = dataType.getOrigin();
          }
 
@@ -212,7 +212,7 @@
                if (isSnsert || node.getChanged().contains(fieldName)) {
                   // Persistent string field.
                   String fieldValue = (String) node.getValues().get(fieldName);
-                  if (!StringUtil.isEmpty(fieldValue)) {
+                  if (StringUtils.isNotEmpty(fieldValue)) {
                      try {
                         if (RichText.hasRichtextItems(fieldValue)) {
                            Document doc = 
RichText.getRichTextDocument(fieldValue);
@@ -233,7 +233,7 @@
                }
                else {
                   String fieldValue = (String) node.getValues().get(fieldName);
-                  if (!StringUtil.isEmpty(fieldValue) && 
RichText.hasRichtextItems(fieldValue)) {
+                  if (StringUtils.isNotEmpty(fieldValue) && 
RichText.hasRichtextItems(fieldValue)) {
                      Document doc = RichText.getRichTextDocument(fieldValue);
                      fillIdFromLinks(doc, idsList);
                      fillIdFromImages(doc, idsList);
@@ -642,13 +642,13 @@
 
 
    protected void setImageIdRelFields(MMObjectNode imagerel, String height, 
String width, String legend) {
-      if (!StringUtil.isEmpty(height)) {
+      if (StringUtils.isNotEmpty(height)) {
          imagerel.setValue("height", height);
       }
-      if (!StringUtil.isEmpty(width)) {
+      if (StringUtils.isNotEmpty(width)) {
          imagerel.setValue("width", width);
       }
-      if (!StringUtil.isEmpty(legend)) {
+      if (StringUtils.isNotEmpty(legend)) {
          imagerel.setValue("legend", legend);
       }
    }
@@ -691,7 +691,7 @@
 
    protected MMObjectNode createUrl(String owner, String href, String name) {
       MMObjectNode urlNode = mmb.getMMObject("urls").getNewNode(owner);
-      if (!StringUtil.isEmpty(name)) {
+      if (StringUtils.isNotEmpty(name)) {
          urlNode.setValue("name", name);
       }
       else {
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs