Update of
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard
In directory
james.mmbase.org:/tmp/cvs-serv30190/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard
Modified Files:
WizardController.java
Log Message:
CMSC-900 Use commons.lang.SringUtils for string emptiness
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard
See also: http://www.mmbase.org/jira/browse/CMSC-900
Index: WizardController.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/java/com/finalist/cmsc/editwizard/WizardController.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- WizardController.java 26 Nov 2007 11:43:42 -0000 1.7
+++ WizardController.java 10 May 2008 16:31:23 -0000 1.8
@@ -4,7 +4,7 @@
*/
package com.finalist.cmsc.editwizard;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import org.mmbase.applications.editwizard.Config;
import org.mmbase.applications.editwizard.Config.WizardConfig;
@@ -67,7 +67,7 @@
log.debug("contenttype " + contenttype);
String readonly = (String) session.getAttribute("readonly");
- if (StringUtil.isEmptyOrWhitespace(readonly)) {
+ if (StringUtils.isBlank(readonly)) {
readonly = "false";
}
@@ -77,9 +77,9 @@
log.debug("readonly " + readonly);
Node creationNode = null;
- if (!StringUtil.isEmpty(contenttype)) {
+ if (StringUtils.isNotEmpty(contenttype)) {
String creation = (String) session.getAttribute("creation");
- if (!StringUtil.isEmpty(creation)) {
+ if (StringUtils.isNotEmpty(creation)) {
creationNode = cloud.getNode(creation);
}
if (creationNode == null && objectnr != null &&
!"new".equals(objectnr)) {
@@ -179,7 +179,7 @@
String objectnr = wizardConfig.objectNumber;
log.debug("objectnr " + objectnr);
- if (!StringUtil.isEmpty(objectnr)) {
+ if (StringUtils.isNotEmpty(objectnr)) {
if (!"new".equals(objectnr) || wizardConfig.wiz.committed()) {
if ("new".equals(objectnr)) {
// We are closing a wizard which was called with
@@ -206,7 +206,7 @@
// will create double creationchannels when first "save" and
// then "save and close"
if (!RepositoryUtil.hasCreationChannel(editNode)) {
- if (!StringUtil.isEmpty(channelnr)) {
+ if (StringUtils.isNotEmpty(channelnr)) {
RepositoryUtil.addCreationChannel(editNode, channelnr);
ContentElementUtil.addOwner(editNode);
if (isMainWizard(ewconfig, wizardConfig)) {
@@ -227,7 +227,7 @@
String channelnr = (String)
session.getAttribute("creation");
log.debug("Creation " + channelnr);
- if (!StringUtil.isEmpty(channelnr)) {
+ if (StringUtils.isNotEmpty(channelnr)) {
RepositoryUtil.addCreationChannel(editNode, channelnr);
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs