svn commit: r1210249 - in /commons/proper/email/trunk/src/java/org/apache/commons/mail: Email.java resolver/DataSourceFileResolver.java

[sgoeschl]

Author: sgoeschl
Date: Sun Dec  4 22:08:29 2011
New Revision: 1210249

URL: http://svn.apache.org/viewvc?rev=1210249&view=rev
Log:
Cleaning up the code

Modified:
    commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
    
commons/proper/email/trunk/src/java/org/apache/commons/mail/resolver/DataSourceFileResolver.java

Modified: commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java
URL: 
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java?rev=1210249&r1=1210248&r2=1210249&view=diff
==============================================================================
--- commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java 
(original)
+++ commons/proper/email/trunk/src/java/org/apache/commons/mail/Email.java Sun 
Dec  4 22:08:29 2011
@@ -159,7 +159,7 @@ public abstract class Email implements E
 
     /** does client want STARTTLS encryption */
     protected boolean startTlsEnabled;
-    
+
     /** does client require STARTTLS encryption */
     protected boolean startTlsRequired;
 
@@ -351,7 +351,7 @@ public abstract class Email implements E
     {
         return setStartTLSEnabled(startTlsEnabled);
     }
-    
+
     /**
      * Set or disable the STARTTLS encryption.
      *
@@ -364,7 +364,7 @@ public abstract class Email implements E
         this.startTlsEnabled = startTlsEnabled;
         return this;
     }
-    
+
     /**
      * Set or disable the STARTTLS encryption.
      *
@@ -512,23 +512,23 @@ public abstract class Email implements E
 
             properties.setProperty(MAIL_TRANSPORT_STARTTLS_ENABLE, 
startTlsEnabled ? "true" : "false");
             properties.setProperty(MAIL_TRANSPORT_STARTTLS_REQUIRED, 
startTlsRequired ? "true" : "false");
-            
+
             if (this.authenticator != null)
             {
                 properties.setProperty(MAIL_SMTP_AUTH, "true");
             }
-            
+
             if (this.sslOnConnect || this.startTlsEnabled || 
this.startTlsRequired)
             {
                 properties.setProperty(MAIL_SMTP_SSL_SOCKET_FACTORY_PORT, 
this.sslSmtpPort);
                 properties.setProperty(MAIL_SMTP_SSL_SOCKET_FACTORY_CLASS, 
"javax.net.ssl.SSLSocketFactory");
                 properties.setProperty(MAIL_SMTP_SOCKET_FACTORY_FALLBACK, 
"false");
-                   properties.put(MAIL_SMTP_SSL_CHECKSERVERIDENTITY, 
Boolean.TRUE);
+                properties.put(MAIL_SMTP_SSL_CHECKSERVERIDENTITY, 
Boolean.TRUE);
             }
 
             if (this.sslOnConnect)
             {
-                   properties.put(MAIL_SMTP_SSL_ENABLE, Boolean.TRUE);
+                properties.put(MAIL_SMTP_SSL_ENABLE, Boolean.TRUE);
                 properties.setProperty(MAIL_PORT, this.sslSmtpPort);
                 properties.setProperty(MAIL_SMTP_SOCKET_FACTORY_PORT, 
this.sslSmtpPort);
                 properties.setProperty(MAIL_SMTP_SOCKET_FACTORY_CLASS, 
"javax.net.ssl.SSLSocketFactory");
@@ -1293,7 +1293,7 @@ public abstract class Email implements E
         }
         return null;
     }
-    
+
     /**
      * Gets whether the client is configured to require STARTTLS.
      *
@@ -1303,7 +1303,7 @@ public abstract class Email implements E
     {
         return this.startTlsRequired;
     }
-    
+
     /**
      * Gets whether the client is configured to try to enable STARTTLS.
      *
@@ -1369,7 +1369,7 @@ public abstract class Email implements E
     /**
      * Returns whether SSL/TLS encryption for the transport is currently 
enabled (SMTPS/POPS).
      * See EMAIL-105 for reason of deprecation.
-     * 
+     *
      * @deprecated since 1.3
      * @return true if SSL enabled for the transport
      */
@@ -1377,17 +1377,17 @@ public abstract class Email implements E
     {
         return isSSLOnConnect();
     }
-    
+
     /**
      * Returns whether SSL/TLS encryption for the transport is currently 
enabled (SMTPS/POPS).
-     * 
+     *
      * @return true if SSL enabled for the transport
      */
     public boolean isSSLOnConnect()
     {
         return sslOnConnect;
     }
-    
+
     /**
      * Sets whether SSL/TLS encryption should be enabled for the SMTP 
transport upon connection (SMTPS/POPS).
      * See EMAIL-105 for reason of deprecation.

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=1210249&r1=1210248&r2=1210249&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 22:08:29 2011
@@ -32,6 +32,9 @@ public class DataSourceFileResolver exte
     /** the base directory of the resource when resolving relative paths */
     private final File baseDir;
 
+    /**
+     * Constructor.
+     */
     public DataSourceFileResolver()
     {
         baseDir = new File(".");