Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/portlets/responseform
In directory
james.mmbase.org:/tmp/cvs-serv30840/portlets-dynamicforms/src/java/com/finalist/portlets/responseform
Modified Files:
EmailSender.java ResponseFormPortlet.java
Log Message:
CMSC-900 Use commons.lang.SringUtils for string emptiness
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/portlets/responseform
See also: http://www.mmbase.org/jira/browse/CMSC-900
Index: EmailSender.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/portlets/responseform/EmailSender.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- EmailSender.java 26 Nov 2007 11:42:56 -0000 1.2
+++ EmailSender.java 10 May 2008 16:32:16 -0000 1.3
@@ -15,7 +15,7 @@
import javax.mail.internet.MimeBodyPart;
import javax.mail.internet.MimeMessage;
import javax.mail.internet.MimeMultipart;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import com.finalist.cmsc.mmbase.PropertiesUtil;
/**
@@ -64,10 +64,10 @@
*/
public void sendEmail(String emailFrom, String nameFrom, List<String>
toAddresses, String subject, String body,
DataSource dataSource) throws UnsupportedEncodingException,
MessagingException {
- if (StringUtil.isEmptyOrWhitespace(emailFrom)) {
+ if (StringUtils.isBlank(emailFrom)) {
emailFrom = PropertiesUtil.getProperty("mail.system.email");
}
- if (StringUtil.isEmptyOrWhitespace(nameFrom)) {
+ if (StringUtils.isBlank(nameFrom)) {
nameFrom = PropertiesUtil.getProperty("mail.system.name");
}
Session session = Session.getInstance(props, null);
@@ -106,10 +106,10 @@
*/
public void sendEmail(String emailFrom, String nameFrom, String emailTo,
String subject, String body)
throws UnsupportedEncodingException, MessagingException {
- if (StringUtil.isEmptyOrWhitespace(emailFrom)) {
+ if (StringUtils.isBlank(emailFrom)) {
emailFrom = PropertiesUtil.getProperty("mail.system.email");
}
- if (StringUtil.isEmptyOrWhitespace(nameFrom)) {
+ if (StringUtils.isBlank(nameFrom)) {
nameFrom = PropertiesUtil.getProperty("mail.system.name");
}
Session session = Session.getInstance(props, null);
Index: ResponseFormPortlet.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-dynamicforms/src/java/com/finalist/portlets/responseform/ResponseFormPortlet.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- ResponseFormPortlet.java 28 Mar 2008 10:09:35 -0000 1.13
+++ ResponseFormPortlet.java 10 May 2008 16:32:16 -0000 1.14
@@ -32,7 +32,7 @@
import javax.portlet.RenderResponse;
import net.sf.mmapps.commons.bridge.RelationUtil;
-import net.sf.mmapps.commons.util.StringUtil;
+import org.apache.commons.lang.StringUtils;
import net.sf.mmapps.modules.cloudprovider.CloudProvider;
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
@@ -275,8 +275,8 @@
userEmailText.append(userEmailTextAfter);
}
- if (!StringUtil.isEmptyOrWhitespace(userEmailText.toString())
- && !StringUtil.isEmptyOrWhitespace(userEmailSenderName)
+ if (StringUtils.isNotBlank(userEmailText.toString())
+ && StringUtils.isNotBlank(userEmailSenderName)
&& isEmailAddress(userEmailAddress)
&& isEmailAddress(userEmailSenderAddress)) {
try {
@@ -311,7 +311,7 @@
String senderEmailAddress = userEmailAddress;
String senderName = userEmailAddress;
- if (StringUtil.isEmptyOrWhitespace(userEmailAddress)) {
+ if (StringUtils.isBlank(userEmailAddress)) {
senderEmailAddress = responseform.getStringValue("useremailsender");
senderName = responseform.getStringValue("useremailsendername");
}
@@ -456,7 +456,7 @@
}
}
else {
- if (!StringUtil.isEmptyOrWhitespace(fileItem.getName())) {
+ if (StringUtils.isNotBlank(fileItem.getName())) {
if (fileItem.getSize() <= getMaxAttachmentSize()) {
attachment = new WrappedFileItem(fileItem);
}
@@ -474,7 +474,7 @@
public boolean isEmailAddress(String emailAddress) {
if (emailAddress == null) return false;
- if (StringUtil.isEmptyOrWhitespace(emailAddress)) return false;
+ if (StringUtils.isBlank(emailAddress)) return false;
String emailRegex = getEmailRegex();
return emailAddress.matches(emailRegex);
@@ -486,7 +486,7 @@
String emailRegex = getEmailRegex();
for (String email : emailList) {
- if (email == null || StringUtil.isEmptyOrWhitespace(email)) return
false;
+ if (email == null || StringUtils.isBlank(email)) return false;
if (!email.matches(emailRegex)) return false;
}
@@ -496,7 +496,7 @@
private long getMaxAttachmentSize() {
long maxFileSize = DEFAULT_MAXFILESIZE;
String maxFileSizeValue =
PropertiesUtil.getProperty("email.maxattachmentsize");
- if (!StringUtil.isEmptyOrWhitespace(maxFileSizeValue)) {
+ if (StringUtils.isNotBlank(maxFileSizeValue)) {
try {
maxFileSize = Integer.parseInt(maxFileSizeValue);
}
@@ -511,7 +511,7 @@
protected String getEmailRegex() {
String emailRegex = PropertiesUtil.getProperty("email.regex");
- if (!StringUtil.isEmptyOrWhitespace(emailRegex)) {
+ if (StringUtils.isNotBlank(emailRegex)) {
return emailRegex;
}
else {
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
