Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
In directory
james.mmbase.org:/tmp/cvs-serv30647/community/src/java/com/finalist/cmsc/community/forms
Modified Files:
UserForm.java DeleteUserAction.java UserAddAction.java
Log Message:
CMSC-900 Use commons.lang.SringUtils for string emptiness
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms
See also: http://www.mmbase.org/jira/browse/CMSC-900
Index: UserForm.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/UserForm.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- UserForm.java 31 Mar 2008 19:49:01 -0000 1.4
+++ UserForm.java 10 May 2008 16:31:49 -0000 1.5
@@ -129,7 +129,7 @@
validatePassword(actionErrors);
} else {
if (this.getAction().equalsIgnoreCase(ACTION_EDIT)){
- if (!StringUtils.isBlank(passwordText) ||
!StringUtils.isBlank(passwordConfirmation)){
+ if (StringUtils.isNotBlank(passwordText) ||
StringUtils.isNotBlank(passwordConfirmation)){
validatePassword(actionErrors);
}
}
@@ -145,8 +145,8 @@
if (StringUtils.isBlank(passwordConfirmation)) {
actionErrors.add("passwordConfirmation", new
ActionMessage("userform.password.empty"));
}
- if (!StringUtils.isBlank(passwordText)
- && !StringUtils.isBlank(passwordConfirmation)
+ if (StringUtils.isNotBlank(passwordText)
+ && StringUtils.isNotBlank(passwordConfirmation)
&& !passwordText.equals(passwordConfirmation)) {
actionErrors.add("password", new
ActionMessage("userform.passwords.not_equal"));
}
Index: DeleteUserAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/DeleteUserAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- DeleteUserAction.java 31 Mar 2008 19:49:01 -0000 1.4
+++ DeleteUserAction.java 10 May 2008 16:31:49 -0000 1.5
@@ -21,7 +21,7 @@
public ActionForward execute(ActionMapping mapping, ActionForm
actionForm, HttpServletRequest request,
HttpServletResponse httpServletResponse) throws
Exception {
String authenticationId =
request.getParameter(AUTHENTICATION_ID);
- if (!StringUtils.isBlank(authenticationId)) {
+ if (StringUtils.isNotBlank(authenticationId)) {
Long authId = Long.valueOf(authenticationId);
getPersonService().deletePersonByAuthenticationId(authId);
getAuthenticationService().deleteAuthentication(authId);
Index: UserAddAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/UserAddAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- UserAddAction.java 31 Mar 2008 19:49:01 -0000 1.5
+++ UserAddAction.java 10 May 2008 16:31:49 -0000 1.6
@@ -70,7 +70,7 @@
if (authenticationId != null) {
String newPassword1 = userForm.getPasswordText();
String newPassword2 = userForm.getPasswordConfirmation();
- if (!StringUtils.isBlank(newPassword1) &&
!StringUtils.isBlank(newPassword2)) {
+ if (StringUtils.isNotBlank(newPassword1) &&
StringUtils.isNotBlank(newPassword2)) {
if (newPassword1.equals(newPassword2)) {
as.updateAuthenticationPassword(accountName,
newPassword1);
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
