Update of
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation
In directory
james.mmbase.org:/tmp/cvs-serv30190/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation
Modified Files:
PortletUtil.java NavigationUtil.java PagesUtil.java
SiteUtil.java
Log Message:
CMSC-900 Use commons.lang.SringUtils for string emptiness
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation
See also: http://www.mmbase.org/jira/browse/CMSC-900
Index: PortletUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/PortletUtil.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- PortletUtil.java 12 Apr 2008 14:26:07 -0000 1.12
+++ PortletUtil.java 10 May 2008 16:31:23 -0000 1.13
@@ -14,7 +14,7 @@
import net.sf.mmapps.commons.bridge.CloneUtil;
import net.sf.mmapps.commons.bridge.RelationUtil;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import org.mmbase.bridge.*;
import org.mmbase.bridge.util.SearchUtil;
@@ -277,7 +277,7 @@
}
for (String newValue : values) {
- if (!StringUtil.isEmptyOrWhitespace(newValue)) {
+ if (StringUtils.isNotBlank(newValue)) {
if (storedValues.containsKey(newValue)) {
storedValues.remove(newValue);
}
@@ -296,7 +296,7 @@
}
else {
for (String value : values) {
- if (!StringUtil.isEmptyOrWhitespace(value)) {
+ if (StringUtils.isNotBlank(value)) {
log.debug("creating node for node:" + portlet.getNumber());
Node newNode = createPortletParameter(portlet.getCloud(),
key, value);
addPortletParameter(portlet, newNode);
@@ -310,7 +310,7 @@
public static void updatePortletParameter(Node portlet, String key, String
value) {
NodeList plist = SearchUtil.findRelatedNodeList(portlet,
PORTLETPARAMETER, PARAMETERREL, KEY_FIELD, key);
if (!plist.isEmpty()) {
- if (StringUtil.isEmptyOrWhitespace(value)) {
+ if (StringUtils.isBlank(value)) {
for (Iterator<Node> iterator = plist.iterator();
iterator.hasNext();) {
Node foundNode = iterator.next();
log.debug("removing parameter node:" + foundNode.getNumber());
@@ -333,7 +333,7 @@
}
}
else {
- if (!StringUtil.isEmptyOrWhitespace(value)) {
+ if (StringUtils.isNotBlank(value)) {
log.debug("creating node for node:" + portlet.getNumber());
Node newNode = createPortletParameter(portlet.getCloud(), key,
value);
addPortletParameter(portlet, newNode);
@@ -496,11 +496,11 @@
public static Node createPortlet(Cloud cloud, String portletName, String
definitionId, String viewId) {
Node viewNode = null;
- if (!StringUtil.isEmpty(viewId)) {
+ if (StringUtils.isNotEmpty(viewId)) {
viewNode = cloud.getNode(viewId);
}
Node definitionNode = null;
- if (!StringUtil.isEmpty(definitionId)) {
+ if (StringUtils.isNotEmpty(definitionId)) {
definitionNode = cloud.getNode(definitionId);
}
Index: NavigationUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/NavigationUtil.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- NavigationUtil.java 7 Mar 2008 15:00:39 -0000 1.19
+++ NavigationUtil.java 10 May 2008 16:31:23 -0000 1.20
@@ -18,7 +18,7 @@
import net.sf.mmapps.commons.bridge.*;
import net.sf.mmapps.commons.util.HttpUtil;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import org.mmbase.bridge.*;
import org.mmbase.bridge.util.SearchUtil;
@@ -211,7 +211,7 @@
* @return node with page path
*/
public static Node getPageFromPath(Cloud cloud, String path) {
- if (!StringUtil.isEmptyOrWhitespace(path)) {
+ if (StringUtils.isNotBlank(path)) {
int index = path.indexOf(TreeUtil.PATH_SEPARATOR);
if (index == -1) {
Node site = SiteUtil.getSite(cloud, path);
@@ -230,7 +230,7 @@
}
public static Node getSiteFromPath(Cloud cloud, String path) {
- if (!StringUtil.isEmptyOrWhitespace(path)) {
+ if (StringUtils.isNotBlank(path)) {
int index = path.indexOf(TreeUtil.PATH_SEPARATOR);
if (index == -1) {
Node site = SiteUtil.getSite(cloud, path);
Index: PagesUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/PagesUtil.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- PagesUtil.java 18 Feb 2008 13:33:35 -0000 1.12
+++ PagesUtil.java 10 May 2008 16:31:23 -0000 1.13
@@ -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.*;
@@ -170,10 +170,10 @@
String description, Node layout, String managerName) {
Node page = TreeUtil.getNodeManager(cloud, managerName).createNode();
page.setStringValue(TITLE_FIELD, name);
- if (!StringUtil.isEmpty(pathname)) {
+ if (StringUtils.isNotEmpty(pathname)) {
page.setStringValue(FRAGMENT_FIELD, pathname);
}
- if (!StringUtil.isEmpty(description)) {
+ if (StringUtils.isNotEmpty(description)) {
page.setStringValue(DESCRIPTION_FIELD, description);
}
page.commit();
Index: SiteUtil.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/SiteUtil.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- SiteUtil.java 26 Nov 2007 11:43:41 -0000 1.4
+++ SiteUtil.java 10 May 2008 16:31:23 -0000 1.5
@@ -9,7 +9,7 @@
*/
package com.finalist.cmsc.navigation;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import org.mmbase.bridge.*;
@@ -68,11 +68,11 @@
public static Node createSite(Cloud cloud, String name, String pathname,
String description, Node layout) {
Node site = cloud.getNodeManager(SITE).createNode();
site.setStringValue(TITLE_FIELD, name);
- if (!StringUtil.isEmpty(pathname)) {
+ if (StringUtils.isNotEmpty(pathname)) {
site.setStringValue(STAGING_FRAGMENT, pathname);
site.setStringValue(LIVE_FRAGMENT, pathname);
}
- if (!StringUtil.isEmpty(description)) {
+ if (StringUtils.isNotEmpty(description)) {
site.setStringValue(DESCRIPTION_FIELD, description);
}
site.commit();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
