commit 317ba16c73eecbb2469ad868cea39852831dec6c
author Stefano Bagnara <bago@apache.org> Mon Jun 20 22:34:28 2011 +0000
committer Stefano Bagnara <bago@apache.org> Mon Jun 20 22:34:28 2011 +0000
tree bf4064aba60f3e0d2dbcd7362da371295215b0d7
parent b684088c87b3cb015293ae8669aea707aaba20c1

Update jDKIM to latest mime4j trunk (MessageFormatter => MessageWriter)

git-svn-id: https://svn.apache.org/repos/asf/james/jdkim/trunk@1137807 13f79535-47bb-0310-9956-ffa450edef68

main/src/main/java/org/apache/james/jdkim/impl/Message.java

diff --git a/main/src/main/java/org/apache/james/jdkim/impl/Message.java b/main/src/main/java/org/apache/james/jdkim/impl/Message.java
index f537036..4ca7182 100644
--- a/main/src/main/java/org/apache/james/jdkim/impl/Message.java
+++ b/main/src/main/java/org/apache/james/jdkim/impl/Message.java
@@ -29,7 +29,7 @@
 import org.apache.james.mime4j.MimeException;
 import org.apache.james.mime4j.MimeIOException;
 import org.apache.james.mime4j.dom.MessageBuilder;
-import org.apache.james.mime4j.dom.MessageFormatter;
+import org.apache.james.mime4j.dom.MessageWriter;
 import org.apache.james.mime4j.dom.MessageServiceFactory;
 import org.apache.james.mime4j.dom.SingleBody;
 import org.apache.james.mime4j.stream.Field;
@@ -56,7 +56,7 @@
      */
     public Message(InputStream is) throws IOException, MimeException {
         MessageBuilder mb = newMessageBuilder().newMessageBuilder();
-        org.apache.james.mime4j.dom.Message mImpl = mb.parse(new EOLConvertingInputStream(is));
+        org.apache.james.mime4j.dom.Message mImpl = mb.parseMessage(new EOLConvertingInputStream(is));
         
         this.message = mImpl;
     }
@@ -92,9 +92,9 @@
 
     private List<String> convertFields(List<Field> res) {
         List<String> res2 = new LinkedList<String>();
-        MessageFormatter mf;
+        MessageWriter mw;
         try {
-            mf = newMessageBuilder().newMessageFormatter();
+            mw = newMessageBuilder().newMessageWriter();
         } catch (MimeException e1) {
             return res2;
         }
@@ -102,7 +102,7 @@
             ByteArrayOutputStream bos = new ByteArrayOutputStream();
             String field = null;
             try {
-                mf.writeField(f, bos);
+                mw.writeField(f, bos);
                 // writeField always ends with CRLF and we don't want it.
                 byte[] fieldbytes = bos.toByteArray();
                 field = new String(fieldbytes, 0, fieldbytes.length - 2);