Update of
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/mmbase
In directory
james.mmbase.org:/tmp/cvs-serv30190/cmsc/utilities/src/java/com/finalist/cmsc/mmbase
Modified Files:
PropertiesUtil.java TreeUtil.java EmailUtil.java
ResourcesUtil.java
Log Message:
CMSC-900 Use commons.lang.SringUtils for string emptiness
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/mmbase
See also: http://www.mmbase.org/jira/browse/CMSC-900
Index: PropertiesUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/mmbase/PropertiesUtil.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- PropertiesUtil.java 9 May 2008 11:25:03 -0000 1.8
+++ PropertiesUtil.java 10 May 2008 16:31:23 -0000 1.9
@@ -3,7 +3,7 @@
import java.util.Map;
import java.util.TreeMap;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
import org.mmbase.bridge.Field;
@@ -141,7 +141,7 @@
String result = "";
if (property != null) {
result = property.getStringValue(environment);
- if (!DEFAULT.equals(environment) && StringUtil.isEmpty(result)) {
+ if (!DEFAULT.equals(environment) && StringUtils.isEmpty(result)) {
log.warn("Property '" + key + "' empty in environment " +
environment + ". Using default value");
result = property.getStringValue(DEFAULT);
}
Index: TreeUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/mmbase/TreeUtil.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- TreeUtil.java 8 May 2008 15:11:18 -0000 1.12
+++ TreeUtil.java 10 May 2008 16:31:23 -0000 1.13
@@ -15,7 +15,7 @@
import net.sf.mmapps.commons.bridge.RelationUtil;
import net.sf.mmapps.commons.util.EncodingUtil;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import org.mmbase.bridge.*;
import org.apache.commons.lang.RandomStringUtils;
@@ -210,7 +210,7 @@
String pathStr =
TreePathCache.getPathStringFromCache(getRootManager(treeManagers),
node.getNumber());
if (pathStr == null) {
pathStr = getPathToRootStringWithoutCache(node, treeManagers,
relationName);
- if (!StringUtil.isEmpty(pathStr)) {
+ if (StringUtils.isNotEmpty(pathStr)) {
TreePathCache.addToCache(getRootManager(treeManagers), pathStr,
node.getNumber());
}
}
@@ -456,7 +456,7 @@
}
public static int getLevel(String path) {
- if (StringUtil.isEmpty(path.trim())) {
+ if (StringUtils.isEmpty(path.trim())) {
return 0;
}
String[] fragements = path.split(PATH_SEPARATOR);
Index: EmailUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/mmbase/EmailUtil.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- EmailUtil.java 26 Nov 2007 11:43:40 -0000 1.2
+++ EmailUtil.java 10 May 2008 16:31:23 -0000 1.3
@@ -13,7 +13,7 @@
import org.mmbase.bridge.Node;
import org.mmbase.util.functions.Function;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
public class EmailUtil {
@@ -33,7 +33,7 @@
cloud = CloudProviderFactory.getCloudProvider().getAdminCloud();
}
- if (StringUtil.isEmpty(emailFrom) || StringUtil.isEmpty(nameFrom)) {
+ if (StringUtils.isEmpty(emailFrom) || StringUtils.isEmpty(nameFrom)) {
emailFrom = PropertiesUtil.getProperty("mail.system.email");
nameFrom = PropertiesUtil.getProperty("mail.system.name");
}
@@ -42,8 +42,8 @@
emailNode.setStringValue("subject", subject);
emailNode.setStringValue("body", body);
- String from = StringUtil.isEmpty(nameFrom) ? emailFrom : nameFrom + "<"
+ emailFrom + ">";
- String to = StringUtil.isEmpty(name) ? email : name + "<" + email + ">";
+ String from = StringUtils.isEmpty(nameFrom) ? emailFrom : nameFrom + "<"
+ emailFrom + ">";
+ String to = StringUtils.isEmpty(name) ? email : name + "<" + email + ">";
emailNode.setStringValue("from", from);
emailNode.setStringValue("to", to);
Index: ResourcesUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/java/com/finalist/cmsc/mmbase/ResourcesUtil.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ResourcesUtil.java 12 Apr 2008 14:26:08 -0000 1.9
+++ ResourcesUtil.java 10 May 2008 16:31:23 -0000 1.10
@@ -11,7 +11,7 @@
import java.util.List;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import org.mmbase.bridge.Node;
import org.mmbase.module.builders.Images;
@@ -56,7 +56,7 @@
public static Node getImageNode(Node node, String template) {
- if (StringUtil.isEmpty(template)) {
+ if (StringUtils.isEmpty(template)) {
return node;
}
else {
@@ -92,7 +92,7 @@
servletpath += "/";
}
String url = servletpath + id;
- if (!StringUtil.isEmpty(title)) {
+ if (StringUtils.isNotEmpty(title)) {
url += "/" + TreeUtil.convertToFragment(title);
// Apache webserver fails to pass the request to tomcat when / or \ is
// in the url (escaped or not)
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
