Author: ggregory
Date: Sun Feb 2 02:51:10 2014
New Revision: 1563555
URL: http://svn.apache.org/r1563555
Log:
[EMAIL-136] Fix Javadoc 1.8 errors.
Modified:
commons/proper/email/trunk/src/changes/changes.xml
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/HtmlEmail.java
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java
Modified: commons/proper/email/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/changes/changes.xml?rev=1563555&r1=1563554&r2=1563555&view=diff
==============================================================================
--- commons/proper/email/trunk/src/changes/changes.xml (original)
+++ commons/proper/email/trunk/src/changes/changes.xml Sun Feb 2 02:51:10 2014
@@ -23,6 +23,9 @@
<body>
<release version="1.4.0" date="xxx">
+ <action dev="ggregory" type="fix" issue="EMAIL-136" date="2014-02-01"
due-to="Ville Skyttä">
+ Fix Javadoc 1.8 errors.
+ </action>
</release>
<release version="1.3.2" date="2013-10-23">
<action dev="tn" type="update" issue="EMAIL-135" date="2013-10-15"
due-to="Andreas Kohn">
Modified:
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java?rev=1563555&r1=1563554&r2=1563555&view=diff
==============================================================================
--- commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
(original)
+++ commons/proper/email/trunk/src/main/java/org/apache/commons/mail/Email.java
Sun Feb 2 02:51:10 2014
@@ -397,7 +397,7 @@ public abstract class Email
}
/**
- * Set the content & contentType
+ * Set the content and contentType.
*
* @param aObject aObject
* @param aContentType aContentType
Modified:
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/HtmlEmail.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/HtmlEmail.java?rev=1563555&r1=1563554&r2=1563555&view=diff
==============================================================================
---
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/HtmlEmail.java
(original)
+++
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/HtmlEmail.java
Sun Feb 2 02:51:10 2014
@@ -59,7 +59,7 @@ import javax.mail.internet.MimeMultipart
*
* <p>It is also possible to embed URLs, files, or arbitrary
* <code>DataSource</code>s directly into the body of the mail:
- * <pre><code>
+ * <pre>
* HtmlEmail he = new HtmlEmail();
* File img = new File("my/image.gif");
* PNGDataSource png = new PNGDataSource(decodedPNGOutputStream); // a custom
class
@@ -70,7 +70,7 @@ import javax.mail.internet.MimeMultipart
* msg.append("</body></html>");
* he.setHtmlMsg(msg.toString());
* // code to set the other email fields (not shown)
- * </pre></code>
+ * </pre>
*
* <p>Embedded entities are tracked by their name, which for
<code>File</code>s is
* the filename itself and for <code>URL</code>s is the canonical path. It is
@@ -110,7 +110,7 @@ public class HtmlEmail extends MultiPart
protected List<InlineImage> inlineImages;
/**
- * Embedded images Map<String, InlineImage> where the key is the
+ * Embedded images Map<String, InlineImage> where the key is the
* user-defined image name.
*/
protected Map<String, InlineImage> inlineEmbeds = new HashMap<String,
InlineImage>();
Modified:
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java
URL:
http://svn.apache.org/viewvc/commons/proper/email/trunk/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java?rev=1563555&r1=1563554&r2=1563555&view=diff
==============================================================================
---
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java
(original)
+++
commons/proper/email/trunk/src/main/java/org/apache/commons/mail/ImageHtmlEmail.java
Sun Feb 2 02:51:10 2014
@@ -24,19 +24,21 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
/**
- * Small wrapper class on top of HtmlEmail which encapsulates the required
logic
+ * <p>Small wrapper class on top of HtmlEmail which encapsulates the required
logic
* to retrieve images that are contained in "<img src=../>" elements in
the HTML
* code. This is done by replacing all img-src-elements with "cid:"-entries and
* embedding images in the email.
- * </br>
+ * </p>
+ * <p>
* For local files the class tries to either load them via an absolute path or
-
* if available - use a relative path starting from a base directory. For files
* that are not found locally, the implementation tries to download
* the element and link it in.
- * </br>
+ * </p>
+ * <p>
* The image loading is done by an instance of <code>DataSourceResolver</code>
* which has to be provided by the caller.
- * </br>
+ * </p>
*
* @since 1.3
* @version $Id$
@@ -48,11 +50,11 @@ public class ImageHtmlEmail extends Html
// including newlines on any place, HTML is not case sensitive and there
// can be arbitrary text between "IMG" and "SRC" like IDs and other things.
- /** regexp for extracting <img> tags */
+ /** Regexp for extracting {@code <img>} tags */
public static final String REGEX_IMG_SRC =
"(<[Ii][Mm][Gg]\\s*[^>]*?\\s+[Ss][Rr][Cc]\\s*=\\s*[\"'])([^\"']+?)([\"'])";
- /** regexp for extracting <script> tags */
+ /** regexp for extracting {@code <script>} tags */
public static final String REGEX_SCRIPT_SRC =
"(<[Ss][Cc][Rr][Ii][Pp][Tt]\\s*.*?\\s+[Ss][Rr][Cc]\\s*=\\s*[\"'])([^\"']+?)([\"'])";
