Author: sgoeschl
Date: Sun Dec 4 21:44:00 2011
New Revision: 1210236
URL: http://svn.apache.org/viewvc?rev=1210236&view=rev
Log:
Cleaning up the code
Modified:
commons/proper/email/trunk/NOTICE.txt
commons/proper/email/trunk/pom.xml
commons/proper/email/trunk/src/java/org/apache/commons/mail/ImageHtmlEmail.java
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java
commons/proper/email/trunk/src/java/org/apache/commons/mail/util/MimeMessageParser.java
Modified: commons/proper/email/trunk/NOTICE.txt
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/NOTICE.txt?rev=1210236&r1=1210235&r2=1210236&view=diff
==============================================================================
--- commons/proper/email/trunk/NOTICE.txt (original)
+++ commons/proper/email/trunk/NOTICE.txt Sun Dec 4 21:44:00 2011
@@ -1,5 +1,5 @@
Apache Commons Email
-Copyright 2001-2010 The Apache Software Foundation
+Copyright 2001-2011 The Apache Software Foundation
This product includes software developed by
The Apache Software Foundation (http://www.apache.org/).
Modified: commons/proper/email/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/pom.xml?rev=1210236&r1=1210235&r2=1210236&view=diff
==============================================================================
--- commons/proper/email/trunk/pom.xml (original)
+++ commons/proper/email/trunk/pom.xml Sun Dec 4 21:44:00 2011
@@ -252,7 +252,7 @@
<commons.jira.id>EMAIL</commons.jira.id>
<commons.jira.pid>12310474</commons.jira.pid>
<commons.release.version>1.3</commons.release.version>
- <commons.rc.version>RC2</commons.rc.version>
+ <commons.rc.version>RC1</commons.rc.version>
<commons.binary.suffix>-bin</commons.binary.suffix>
</properties>
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/ImageHtmlEmail.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/ImageHtmlEmail.java?rev=1210236&r1=1210235&r2=1210236&view=diff
==============================================================================
---
commons/proper/email/trunk/src/java/org/apache/commons/mail/ImageHtmlEmail.java
(original)
+++
commons/proper/email/trunk/src/java/org/apache/commons/mail/ImageHtmlEmail.java
Sun Dec 4 21:44:00 2011
@@ -37,7 +37,7 @@ import java.util.regex.Pattern;
* The image loading is done by an instance of <code>DataSourceResolver</code>
* which has to be provided by the caller.
* </br>
- *
+ *
* @since 1.3
*/
public class ImageHtmlEmail extends HtmlEmail
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java?rev=1210236&r1=1210235&r2=1210236&view=diff
==============================================================================
---
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
(original)
+++
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceClassPathResolver.java
Sun Dec 4 21:44:00 2011
@@ -74,7 +74,7 @@ public class DataSourceClassPathResolver
String resourceName = getResourceName(resourceLocation);
InputStream is =
DataSourceClassPathResolver.class.getResourceAsStream(resourceName);
- if(is != null)
+ if (is != null)
{
result = new ByteArrayDataSource(is, mimeType);
}
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java?rev=1210236&r1=1210235&r2=1210236&view=diff
==============================================================================
---
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java
(original)
+++
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java
Sun Dec 4 21:44:00 2011
@@ -85,7 +85,7 @@ public class DataSourceFileResolver exte
if (!file.isAbsolute())
{
- file = (getBaseDir() != null ? new File(getBaseDir(),
resourceLocation) : new File(resourceLocation));
+ file = getBaseDir() != null ? new File(getBaseDir(),
resourceLocation) : new File(resourceLocation);
}
if (file.exists())
Modified:
commons/proper/email/trunk/src/java/org/apache/commons/mail/util/MimeMessageParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/util/MimeMessageParser.java?rev=1210236&r1=1210235&r2=1210236&view=diff
==============================================================================
---
commons/proper/email/trunk/src/java/org/apache/commons/mail/util/MimeMessageParser.java
(original)
+++
commons/proper/email/trunk/src/java/org/apache/commons/mail/util/MimeMessageParser.java
Sun Dec 4 21:44:00 2011
@@ -316,7 +316,7 @@ public class MimeMessageParser
if (result != null && result.length() > 0)
{
- result = MimeUtility.decodeText( result );
+ result = MimeUtility.decodeText(result);
}
else
{
@@ -355,7 +355,6 @@ public class MimeMessageParser
return result;
}
-
/**
* Parses the mimeType.
*
