Update of
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet
In directory
james.mmbase.org:/tmp/cvs-serv30190/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet
Modified Files:
BasicURLTag.java RenderURLTag.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/portlet
See also: http://www.mmbase.org/jira/browse/CMSC-900
Index: BasicURLTag.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/BasicURLTag.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- BasicURLTag.java 28 Jan 2008 21:15:45 -0000 1.9
+++ BasicURLTag.java 10 May 2008 16:31:23 -0000 1.10
@@ -11,7 +11,7 @@
import javax.servlet.jsp.tagext.TagSupport;
import javax.servlet.jsp.tagext.VariableInfo;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import com.finalist.cmsc.beans.om.NavigationItem;
import com.finalist.cmsc.mmbase.ResourcesUtil;
@@ -65,7 +65,7 @@
// make sure we start with an unset url variable;
setUrl(null);
- if (StringUtil.isEmpty(page) && StringUtil.isEmpty(window) &&
!StringUtil.isEmpty(elementId)) {
+ if (StringUtils.isEmpty(page) && StringUtils.isEmpty(window) &&
StringUtils.isNotEmpty(elementId)) {
contenturl = ResourcesUtil.getServletPathWithAssociation("content",
"/content/*", elementId, null);
return EVAL_PAGE;
}
Index: RenderURLTag.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/taglib/src/java/com/finalist/cmsc/taglib/portlet/RenderURLTag.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- RenderURLTag.java 26 Nov 2007 11:43:41 -0000 1.4
+++ RenderURLTag.java 10 May 2008 16:31:23 -0000 1.5
@@ -4,7 +4,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import com.finalist.pluto.PortletURLImpl;
@@ -18,7 +18,7 @@
@Override
protected PortletURL getRenderUrl() {
PortletURL renderUrl = null;
- if (!StringUtil.isEmpty(page) && !StringUtil.isEmpty(window)) {
+ if (StringUtils.isNotEmpty(page) && StringUtils.isNotEmpty(window)) {
String link = getLink();
renderUrl = new PortletURLImpl(link, window, (HttpServletRequest)
pageContext.getRequest(),
(HttpServletResponse) pageContext.getResponse(), false);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs