From cfc513043c5830b5a967733066068c7097b42e3c Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Wed, 15 Aug 2007 21:34:53 +0000
Subject: [PATCH] This commit is a step toward getting OpenDS internationalized. There are still issues to be resolved before we can declare that we are internationalized but this commit covers the bulk of changes needed at this time.

---
 opendj-sdk/opends/src/server/org/opends/server/util/EMailMessage.java |   45 ++++++++++++++++++++++-----------------------
 1 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/opendj-sdk/opends/src/server/org/opends/server/util/EMailMessage.java b/opendj-sdk/opends/src/server/org/opends/server/util/EMailMessage.java
index 2396b51..1a6ec8b 100644
--- a/opendj-sdk/opends/src/server/org/opends/server/util/EMailMessage.java
+++ b/opendj-sdk/opends/src/server/org/opends/server/util/EMailMessage.java
@@ -25,6 +25,7 @@
  *      Portions Copyright 2006-2007 Sun Microsystems, Inc.
  */
 package org.opends.server.util;
+import org.opends.messages.Message;
 
 
 
@@ -35,7 +36,6 @@
 import java.util.Properties;
 import javax.activation.DataHandler;
 import javax.activation.FileDataSource;
-import javax.mail.Message;
 import javax.mail.MessagingException;
 import javax.mail.SendFailedException;
 import javax.mail.Session;
@@ -50,8 +50,8 @@
 import org.opends.server.types.DebugLogLevel;
 
 import static org.opends.server.loggers.debug.DebugLogger.*;
-import static org.opends.server.messages.MessageHandler.*;
-import static org.opends.server.messages.UtilityMessages.*;
+import static org.opends.messages.UtilityMessages.*;
+import org.opends.messages.MessageBuilder;
 
 
 /**
@@ -83,7 +83,7 @@
   private String subject;
 
   // The body for the mail message.
-  private StringBuilder body;
+  private MessageBuilder body;
 
 
 
@@ -102,7 +102,7 @@
     recipients = new ArrayList<String>();
     recipients.add(recipient);
 
-    body         = new StringBuilder();
+    body         = new MessageBuilder();
     attachments  = new LinkedList<MimeBodyPart>();
     bodyMIMEType = "text/plain";
   }
@@ -123,7 +123,7 @@
     this.recipients = recipients;
     this.subject    = subject;
 
-    body         = new StringBuilder();
+    body         = new MessageBuilder();
     attachments  = new LinkedList<MimeBodyPart>();
     bodyMIMEType = "text/plain";
   }
@@ -221,7 +221,7 @@
    *
    * @return  The body for this message.
    */
-  public StringBuilder getBody()
+  public MessageBuilder getBody()
   {
     return body;
   }
@@ -233,7 +233,7 @@
    *
    * @param  body  The body for this message.
    */
-  public void setBody(StringBuilder body)
+  public void setBody(MessageBuilder body)
   {
     this.body = body;
   }
@@ -243,11 +243,11 @@
   /**
    * Specifies the body for this message.
    *
-   * @param  bodyString  The body for this message.
+   * @param  body  The body for this message.
    */
-  public void setBody(String bodyString)
+  public void setBody(Message body)
   {
-    body = new StringBuilder(bodyString);
+    this.body = new MessageBuilder(body);
   }
 
 
@@ -365,10 +365,9 @@
           TRACER.debugCaught(DebugLogLevel.ERROR, me);
         }
 
-        int msgID = MSGID_EMAILMSG_INVALID_SENDER_ADDRESS;
-        String msg = getMessage(msgID, String.valueOf(sender),
-                                me.getMessage());
-        throw new MessagingException(msg, me);
+        Message msg = ERR_EMAILMSG_INVALID_SENDER_ADDRESS.get(
+            String.valueOf(sender), me.getMessage());
+        throw new MessagingException(msg.toString(), me);
       }
 
 
@@ -391,13 +390,14 @@
             TRACER.debugCaught(DebugLogLevel.ERROR, me);
           }
 
-          int msgID = MSGID_EMAILMSG_INVALID_RECIPIENT_ADDRESS;
-          String msg = getMessage(msgID, String.valueOf(recipient),
-                                  me.getMessage());
-          throw new MessagingException(msg, me);
+          Message msg = ERR_EMAILMSG_INVALID_RECIPIENT_ADDRESS.get(
+              String.valueOf(recipient), me.getMessage());
+          throw new MessagingException(msg.toString(), me);
         }
       }
-      message.setRecipients(Message.RecipientType.TO, recipientAddresses);
+      message.setRecipients(
+              javax.mail.Message.RecipientType.TO,
+              recipientAddresses);
 
 
       // If we have any attachments, then the whole thing needs to be
@@ -456,9 +456,8 @@
     // Otherwise, throw a generic exception.
     if (sendException == null)
     {
-      int    msgID   = MSGID_EMAILMSG_CANNOT_SEND;
-      String message = getMessage(msgID);
-      throw new MessagingException(message);
+      Message message = ERR_EMAILMSG_CANNOT_SEND.get();
+      throw new MessagingException(message.toString());
     }
     else
     {

--
Gitblit v1.10.0