[prev in list] [next in list] [prev in thread] [next in thread] 

List:       james-dev
Subject:    svn commit: r510583 - in /james/mime4j/trunk: TODO.txt
From:       norman () apache ! org
Date:       2007-02-22 16:45:52
Message-ID: 20070222164552.978CA1A981A () eris ! apache ! org
[Download RAW message or body]

Author: norman
Date: Thu Feb 22 08:45:51 2007
New Revision: 510583

URL: http://svn.apache.org/viewvc?view=rev&rev=510583
Log:
Remove TODO
Get sure the CLRFCLRF is handled correctly

Removed:
    james/mime4j/trunk/TODO.txt
Modified:
    james/mime4j/trunk/src/main/java/org/mime4j/message/BodyPart.java
    james/mime4j/trunk/src/main/java/org/mime4j/message/Header.java
    james/mime4j/trunk/src/main/java/org/mime4j/message/Message.java
    james/mime4j/trunk/src/main/java/org/mime4j/message/Multipart.java

Modified: james/mime4j/trunk/src/main/java/org/mime4j/message/BodyPart.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/mime4j/message/BodyPart.java?view=diff&rev=510583&r1=510582&r2=510583
 ==============================================================================
--- james/mime4j/trunk/src/main/java/org/mime4j/message/BodyPart.java (original)
+++ james/mime4j/trunk/src/main/java/org/mime4j/message/BodyPart.java Thu Feb 22 \
08:45:51 2007 @@ -29,13 +29,18 @@
  * @version $Id: BodyPart.java,v 1.3 2004/10/02 12:41:11 ntherning Exp $
  */
 public class BodyPart extends Entity {
-    
+
     /**
      * 
      * @see org.mime4j.message.Entity#writeTo(java.io.OutputStream)
      */
     public void writeTo(OutputStream out) throws IOException {
-	out.write(getHeader().toString().getBytes());
-	getBody().writeTo(out);
+        String header = getHeader().toString();
+        if (header.equals("") == false) {
+
+            out.write((header + "\r\n").getBytes());
+        }
+
+        getBody().writeTo(out);
     }
 }

Modified: james/mime4j/trunk/src/main/java/org/mime4j/message/Header.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/mime4j/message/Header.java?view=diff&rev=510583&r1=510582&r2=510583
 ==============================================================================
--- james/mime4j/trunk/src/main/java/org/mime4j/message/Header.java (original)
+++ james/mime4j/trunk/src/main/java/org/mime4j/message/Header.java Thu Feb 22 \
08:45:51 2007 @@ -129,9 +129,6 @@
             str.append(it.next().toString());
             str.append("\r\n");
         }
-
-        // TODO: Check where the CLRFCLRF is handled
-        // str.append("\r\n");
         return str.toString();
     }
 

Modified: james/mime4j/trunk/src/main/java/org/mime4j/message/Message.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/mime4j/message/Message.java?view=diff&rev=510583&r1=510582&r2=510583
 ==============================================================================
--- james/mime4j/trunk/src/main/java/org/mime4j/message/Message.java (original)
+++ james/mime4j/trunk/src/main/java/org/mime4j/message/Message.java Thu Feb 22 \
08:45:51 2007 @@ -83,11 +83,10 @@
      * @see org.mime4j.message.Entity#writeTo(java.io.OutputStream)
      */
     public void writeTo(OutputStream out) throws IOException {
+        String header = getHeader().toString();
+        out.write((header + "\r\n").getBytes());
 
-        out.write(getHeader().toString().getBytes());
-        out.write("\r\n".getBytes());
         Body body = getBody();
-
         if (body instanceof Multipart) {
             Multipart mp = (Multipart) body;
             mp.writeTo(out);
@@ -99,7 +98,6 @@
     
     private class MessageBuilder implements ContentHandler {
         private Stack stack = new Stack();
-        private Message root = null;
         
         public MessageBuilder() {
         }
@@ -252,6 +250,7 @@
          * @see org.mime4j.ContentHandler#raw(java.io.InputStream)
          */
         public void raw(InputStream is) throws IOException {
+            throw new UnsupportedOperationException("Not supported");
         }
 
     }

Modified: james/mime4j/trunk/src/main/java/org/mime4j/message/Multipart.java
URL: http://svn.apache.org/viewvc/james/mime4j/trunk/src/main/java/org/mime4j/message/Multipart.java?view=diff&rev=510583&r1=510582&r2=510583
 ==============================================================================
--- james/mime4j/trunk/src/main/java/org/mime4j/message/Multipart.java (original)
+++ james/mime4j/trunk/src/main/java/org/mime4j/message/Multipart.java Thu Feb 22 \
08:45:51 2007 @@ -178,6 +178,11 @@
 
     }
 
+    /**
+     * Return the boundory of the parent Entity
+     * 
+     * @return boundery
+     */
     private String getBoundary() {
         Entity e = getParent();
         ContentTypeField cField = (ContentTypeField) e.getHeader().getField(



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


[prev in list] [next in list] [prev in thread] [next in thread]