You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by vg...@apache.org on 2007/06/26 22:03:52 UTC

svn commit: r550922 - in /cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/java/org/apache/cocoon/mail: MailMessageSender.java MailSender.java

Author: vgritsenko
Date: Tue Jun 26 13:03:51 2007
New Revision: 550922

URL: http://svn.apache.org/viewvc?view=rev&rev=550922
Log:
add setSubject(subject,charset) method

Modified:
    cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/java/org/apache/cocoon/mail/MailMessageSender.java
    cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/java/org/apache/cocoon/mail/MailSender.java

Modified: cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/java/org/apache/cocoon/mail/MailMessageSender.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/java/org/apache/cocoon/mail/MailMessageSender.java?view=diff&rev=550922&r1=550921&r2=550922
==============================================================================
--- cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/java/org/apache/cocoon/mail/MailMessageSender.java (original)
+++ cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/java/org/apache/cocoon/mail/MailMessageSender.java Tue Jun 26 13:03:51 2007
@@ -91,6 +91,7 @@
     private String cc;
     private String bcc;
     private String subject;
+    private String subjectCharset;
 
     private Attachment body;
     private String bodyType;
@@ -445,7 +446,11 @@
         }
 
         if (this.subject != null) {
-            message.setSubject(this.subject);
+            if (this.subjectCharset == null) {
+                message.setSubject(this.subject);
+            } else {
+                message.setSubject(this.subject, this.subjectCharset);
+            }
         }
 
         message.setSentDate(new Date());
@@ -616,6 +621,19 @@
     public void setSubject(String subject) {
         if (!isNullOrEmpty(subject)) {
             this.subject = subject;
+        }
+    }
+
+    /**
+     * Sets the subject line of the message.
+     *
+     * @param subject the subject line of the message
+     * @param charset the character set to be used for encoding the subject
+     */
+    public void setSubject(String subject, String charset) {
+        setSubject(subject);
+        if (!isNullOrEmpty(charset)) {
+            this.subjectCharset = charset;
         }
     }
 

Modified: cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/java/org/apache/cocoon/mail/MailSender.java
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/java/org/apache/cocoon/mail/MailSender.java?view=diff&rev=550922&r1=550921&r2=550922
==============================================================================
--- cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/java/org/apache/cocoon/mail/MailSender.java (original)
+++ cocoon/trunk/blocks/cocoon-mail/cocoon-mail-impl/src/main/java/org/apache/cocoon/mail/MailSender.java Tue Jun 26 13:03:51 2007
@@ -111,6 +111,13 @@
      */
     void setSubject(String subject);
 
+    /**
+     * Sets the subject line of the message.
+     * @param subject the subject line of the message
+     * @param charset the character set to be used for encoding the subject
+     */
+    void setSubject(String subject, String charset);
+
     //
     // Set the Body
     //