Update of
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms
In directory
james.mmbase.org:/tmp/cvs-serv30190/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms
Modified Files:
ReorderAction.java SiteCreate.java NavigatorPanelAction.java
NavigatorAction.java SiteEdit.java PageEdit.java
PageCreate.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/forms
See also: http://www.mmbase.org/jira/browse/CMSC-900
Index: ReorderAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms/ReorderAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ReorderAction.java 26 Nov 2007 11:43:41 -0000 1.3
+++ ReorderAction.java 10 May 2008 16:31:23 -0000 1.4
@@ -11,7 +11,7 @@
import javax.servlet.http.HttpServletRequest;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -29,7 +29,7 @@
String action = getParameter(request, "action");
- if (!StringUtil.isEmptyOrWhitespace(action) && "reorder".equals(action))
{
+ if (StringUtils.isNotBlank(action) && "reorder".equals(action)) {
String parent = request.getParameter("parent");
if (!isCancelled(request)) {
String ids = request.getParameter("ids");
Index: SiteCreate.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms/SiteCreate.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- SiteCreate.java 1 Feb 2008 12:08:43 -0000 1.5
+++ SiteCreate.java 10 May 2008 16:31:23 -0000 1.6
@@ -11,7 +11,7 @@
import javax.servlet.http.HttpServletRequest;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -30,7 +30,7 @@
String action = getParameter(request, "action");
- if (StringUtil.isEmptyOrWhitespace(action)) {
+ if (StringUtils.isBlank(action)) {
ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?action=create"
+ "&contenttype=" + SiteUtil.SITE + "&returnurl=" +
mapping.findForward("returnurl").getPath());
ret.setRedirect(true);
Index: NavigatorPanelAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms/NavigatorPanelAction.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- NavigatorPanelAction.java 12 Apr 2008 14:26:08 -0000 1.7
+++ NavigatorPanelAction.java 10 May 2008 16:31:23 -0000 1.8
@@ -7,7 +7,7 @@
import org.apache.struts.action.ActionMapping;
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -22,7 +22,7 @@
String pathofpage = NavigationUtil.getNavigationItemUrl(request,
response, parentNode);
String fresh = request.getParameter("fresh");
- if (!StringUtil.isEmpty(fresh)) {
+ if (StringUtils.isNotEmpty(fresh)) {
request.setAttribute("fresh", fresh);
}
request.setAttribute("toolbar", "toolbar.jsp");
Index: NavigatorAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms/NavigatorAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- NavigatorAction.java 26 Nov 2007 11:43:41 -0000 1.5
+++ NavigatorAction.java 10 May 2008 16:31:23 -0000 1.6
@@ -14,7 +14,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 org.apache.struts.action.*;
import org.mmbase.bridge.*;
@@ -78,7 +78,7 @@
@Override
protected List<String> getChildren(Cloud cloud, String path) {
List<String> strings = new ArrayList<String>();
- if (StringUtil.isEmpty(path)) {
+ if (StringUtils.isEmpty(path)) {
NodeList sites = SiteUtil.getSites(cloud);
for (Iterator<Node> iter = sites.iterator(); iter.hasNext();) {
Node child = iter.next();
Index: SiteEdit.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms/SiteEdit.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- SiteEdit.java 26 Nov 2007 11:43:41 -0000 1.4
+++ SiteEdit.java 10 May 2008 16:31:23 -0000 1.5
@@ -11,7 +11,7 @@
import javax.servlet.http.HttpServletRequest;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -27,7 +27,7 @@
String action = getParameter(request, "action");
- if (StringUtil.isEmptyOrWhitespace(action)) {
+ if (StringUtils.isBlank(action)) {
String objectnumber = getParameter(request, "number", true);
ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?objectnumber="
Index: PageEdit.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms/PageEdit.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PageEdit.java 26 Nov 2007 11:43:41 -0000 1.4
+++ PageEdit.java 10 May 2008 16:31:23 -0000 1.5
@@ -11,7 +11,7 @@
import javax.servlet.http.HttpServletRequest;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -27,7 +27,7 @@
String action = getParameter(request, "action");
- if (StringUtil.isEmptyOrWhitespace(action)) {
+ if (StringUtils.isBlank(action)) {
String objectnumber = getParameter(request, "number", true);
ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?objectnumber="
Index: PageCreate.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms/PageCreate.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PageCreate.java 26 Nov 2007 11:43:41 -0000 1.4
+++ PageCreate.java 10 May 2008 16:31:23 -0000 1.5
@@ -11,7 +11,7 @@
import javax.servlet.http.HttpServletRequest;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
@@ -28,7 +28,7 @@
String parentpage = getParameter(request, "parentpage", true);
String action = getParameter(request, "action");
- if (StringUtil.isEmptyOrWhitespace(action)) {
+ if (StringUtils.isBlank(action)) {
request.getSession().setAttribute("parentpage", parentpage);
ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?action=create"
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
