Update of
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib
In directory
james.mmbase.org:/tmp/cvs-serv30190/cmsc/taglib/src/java/com/finalist/cmsc/taglib
Modified Files:
AbstractListTag.java ListNavigationItemsTag.java
LinkedContentTag.java
Log Message:
CMSC-900 Use commons.lang.SringUtils for string emptiness
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib
See also: http://www.mmbase.org/jira/browse/CMSC-900
Index: AbstractListTag.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/AbstractListTag.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- AbstractListTag.java 26 Nov 2007 11:43:40 -0000 1.5
+++ AbstractListTag.java 10 May 2008 16:31:24 -0000 1.6
@@ -14,7 +14,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.jsp.PageContext;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
/**
* Register a list as attribute in the request.
@@ -44,7 +44,7 @@
protected void setAttribute(HttpServletRequest request, List<E> list) {
- if (!StringUtil.isEmpty(var)) {
+ if (StringUtils.isNotEmpty(var)) {
// put in variable
if (list != null) {
request.setAttribute(var, list);
Index: ListNavigationItemsTag.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/ListNavigationItemsTag.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ListNavigationItemsTag.java 28 Jan 2008 21:15:45 -0000 1.1
+++ ListNavigationItemsTag.java 10 May 2008 16:31:24 -0000 1.2
@@ -67,7 +67,7 @@
}
protected Class<? extends NavigationItem> getChildNavigationClass() {
- if (!StringUtils.isBlank(type)) {
+ if (StringUtils.isNotBlank(type)) {
NavigationItemManager navigationManager =
NavigationManager.getNavigationManager(type);
if (navigationManager != null) {
return navigationManager.getItemClass();
Index: LinkedContentTag.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/LinkedContentTag.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- LinkedContentTag.java 26 Nov 2007 11:43:40 -0000 1.3
+++ LinkedContentTag.java 10 May 2008 16:31:24 -0000 1.4
@@ -1,7 +1,7 @@
package com.finalist.cmsc.taglib;
import net.sf.mmapps.commons.bridge.NodeFieldComparator;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import org.mmbase.bridge.*;
import org.mmbase.bridge.jsp.taglib.NodeReferrerTag;
@@ -50,7 +50,7 @@
private String getFormatter() throws JspTagException {
String result = formatter.getString(this);
- if (StringUtil.isEmpty(result)) {
+ if (StringUtils.isEmpty(result)) {
result =
"net.sf.mmapps.commons.basicmodel.taglib.LinkedContentTag$DefaultFormatter";
}
return result;
@@ -76,11 +76,11 @@
// get the related nodes
NodeList nodes = contentNode.getRelatedNodes(mgrRelatedNodesStr,
roleStr, "destination");
- if (!StringUtil.isEmpty(sortStr)) {
+ if (StringUtils.isNotEmpty(sortStr)) {
Collections.sort(nodes, new NodeFieldComparator(sortStr));
}
else {
- if (!StringUtil.isEmpty(roleStr)) {
+ if (StringUtils.isNotEmpty(roleStr)) {
RelationManager relationManager =
contentNode.getCloud().getRelationManager(roleStr);
if (relationManager != null && relationManager.hasField("pos"))
{
Collections.sort(nodes, new NodeFieldComparator("pos"));
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
