Changeset 469

Timestamp:

07/18/09 13:47:23 (3 years ago)

Author:

octorian

Message:

Adding additional MIME type classes

Location:

trunk/LogicMail

Files:

• LogicMail.jdp (modified) (4 diffs)
• src/icons/mime_message.png (added)
• src/org/logicprobe/LogicMail/message/AbstractMimeMessagePartVisitor.java (modified) (1 diff)
• src/org/logicprobe/LogicMail/message/ApplicationContent.java (added)
• src/org/logicprobe/LogicMail/message/AudioContent.java (added)
• src/org/logicprobe/LogicMail/message/MessageContent.java (added)
• src/org/logicprobe/LogicMail/message/MessagePart.java (added)
• src/org/logicprobe/LogicMail/message/MimeMessageContent.java (modified) (1 diff)
• src/org/logicprobe/LogicMail/message/MimeMessageContentFactory.java (modified) (3 diffs)
• src/org/logicprobe/LogicMail/message/MimeMessageContentVisitor.java (modified) (1 diff)
• src/org/logicprobe/LogicMail/message/MimeMessagePartFactory.java (modified) (1 diff)
• src/org/logicprobe/LogicMail/message/MimeMessagePartVisitor.java (modified) (1 diff)
• src/org/logicprobe/LogicMail/message/VideoContent.java (added)
• src/org/logicprobe/LogicMail/message/VideoPart.java (modified) (2 diffs)
• src/org/logicprobe/LogicMail/ui/MessageIcons.java (modified) (3 diffs)

trunk/LogicMail/LogicMail.jdp

@@ -55 +55 @@
 src\icons\mime_audio.png
 src\icons\mime_image.png
+src\icons\mime_message.png
 src\icons\mime_text.png
 src\icons\mime_video.png
@@ -125 +126 @@
 src\org\logicprobe\LogicMail\mail\smtp\SmtpProtocol.java
 src\org\logicprobe\LogicMail\message\AbstractMimeMessagePartVisitor.java
+src\org\logicprobe\LogicMail\message\ApplicationContent.java
 src\org\logicprobe\LogicMail\message\ApplicationPart.java
+src\org\logicprobe\LogicMail\message\AudioContent.java
 src\org\logicprobe\LogicMail\message\AudioPart.java
 src\org\logicprobe\LogicMail\message\ContentPart.java
@@ -132 +135 @@
 src\org\logicprobe\LogicMail\message\ImagePart.java
 src\org\logicprobe\LogicMail\message\Message.java
+src\org\logicprobe\LogicMail\message\MessageContent.java
 src\org\logicprobe\LogicMail\message\MessageEnvelope.java
 src\org\logicprobe\LogicMail\message\MessageFlags.java
 src\org\logicprobe\LogicMail\message\MessageMimeConverter.java
+src\org\logicprobe\LogicMail\message\MessagePart.java
 src\org\logicprobe\LogicMail\message\MimeMessageContent.java
 src\org\logicprobe\LogicMail\message\MimeMessageContentFactory.java
@@ -147 +152 @@
 src\org\logicprobe\LogicMail\message\UnsupportedContentException.java
 src\org\logicprobe\LogicMail\message\UnsupportedPart.java
+src\org\logicprobe\LogicMail\message\VideoContent.java
 src\org\logicprobe\LogicMail\message\VideoPart.java
 src\org\logicprobe\LogicMail\model\AccountNode.java

trunk/LogicMail/src/org/logicprobe/LogicMail/message/AbstractMimeMessagePartVisitor.java

@@ -39 +39 @@
         public void visitAudioPart(AudioPart part) { }
         public void visitImagePart(ImagePart part) { }
+        public void visitMessagePart(MessagePart part) { }
         public void visitMultiPart(MultiPart part) { }
         public void visitTextPart(TextPart part) { }

trunk/LogicMail/src/org/logicprobe/LogicMail/message/MimeMessageContent.java

@@ -58 +58 @@
         }
         
+    /**
+     * Accept a visitor on this message content.
+     * @param visitor The visitor instance
+     */
+        public abstract void accept(MimeMessageContentVisitor visitor);
+        
         /**
          * Gets the raw data representing this message content.

trunk/LogicMail/src/org/logicprobe/LogicMail/message/MimeMessageContentFactory.java

@@ -59 +59 @@
                 content = new ImageContent(imagePart, imagePart.getEncoding(), data);
         }
+        else if(mimeMessagePart instanceof ApplicationPart) {
+                ApplicationPart applicationPart = (ApplicationPart)mimeMessagePart;
+                content = new ApplicationContent(applicationPart, applicationPart.getEncoding(), data);
+        }
+        else if(mimeMessagePart instanceof AudioPart) {
+                AudioPart audioPart = (AudioPart)mimeMessagePart;
+                content = new AudioContent(audioPart, audioPart.getEncoding(), data);
+        }
+        else if(mimeMessagePart instanceof VideoPart) {
+                VideoPart videoPart = (VideoPart)mimeMessagePart;
+                content = new VideoContent(videoPart, videoPart.getEncoding(), data);
+        }
+        else if(mimeMessagePart instanceof MessagePart) {
+                MessagePart messagePart = (MessagePart)mimeMessagePart;
+                content = new MessageContent(messagePart, messagePart.getEncoding(), data);
+        }
         else {
                 throw new UnsupportedContentException("Unsupported content type");
@@ -64 +80 @@
         return content;
     }
-        
+
         /**
      * Find out if a particular message content type is supported
@@ -82 +98 @@
                 result = ImageContent.isPartSupported((ImagePart)mimeMessagePart);
         }
+        else if(mimeMessagePart instanceof ApplicationPart) {
+                result = ApplicationContent.isPartSupported((ApplicationPart)mimeMessagePart);
+        }
+        else if(mimeMessagePart instanceof AudioPart) {
+                result = AudioContent.isPartSupported((AudioPart)mimeMessagePart);
+        }
+        else if(mimeMessagePart instanceof VideoPart) {
+                result = VideoContent.isPartSupported((VideoPart)mimeMessagePart);
+        }
+        else if(mimeMessagePart instanceof MessagePart) {
+                result = MessageContent.isPartSupported((MessagePart)mimeMessagePart);
+        }
         else {
                 result = false;

trunk/LogicMail/src/org/logicprobe/LogicMail/message/MimeMessageContentVisitor.java

@@ -35 +35 @@
  */
 public interface MimeMessageContentVisitor {
+        void visit(ApplicationContent content);
+        void visit(AudioContent content);
+        void visit(ImageContent content);
+        void visit(MessageContent content);
         void visit(TextContent content);
-        void visit(ImageContent content);
+        void visit(VideoContent content);
 }

trunk/LogicMail/src/org/logicprobe/LogicMail/message/MimeMessagePartFactory.java

@@ -72 +72 @@
         } else if (mimeType.equalsIgnoreCase("image")) {
                 part = new ImagePart(mimeSubtype, name, encoding, disposition, contentId, size, tag);
+        } else if (mimeType.equalsIgnoreCase("application")) {
+                part = new ApplicationPart(mimeSubtype, name, encoding, disposition, contentId, size, tag);
+        } else if (mimeType.equalsIgnoreCase("audio")) {
+                part = new AudioPart(mimeSubtype, name, encoding, disposition, contentId, size, tag);
+        } else if (mimeType.equalsIgnoreCase("video")) {
+                part = new VideoPart(mimeSubtype, name, encoding, disposition, contentId, size, tag);
+        } else if (mimeType.equalsIgnoreCase("message")) {
+                part = new MessagePart(mimeSubtype, name, encoding, disposition, contentId, size, tag);
         } else {
             part = new UnsupportedPart(mimeType, mimeSubtype, tag);

trunk/LogicMail/src/org/logicprobe/LogicMail/message/MimeMessagePartVisitor.java

@@ -36 +36 @@
  */
 public interface MimeMessagePartVisitor {
-    public abstract void visitApplicationPart(ApplicationPart part);
-    public abstract void visitAudioPart(AudioPart part);
-    public abstract void visitImagePart(ImagePart part);
-    public abstract void visitMultiPart(MultiPart part);
-    public abstract void visitTextPart(TextPart part);
-    public abstract void visitVideoPart(VideoPart part);
-    public abstract void visitUnsupportedPart(UnsupportedPart part);
+    void visitApplicationPart(ApplicationPart part);
+    void visitAudioPart(AudioPart part);
+    void visitImagePart(ImagePart part);
+    void visitMessagePart(MessagePart part);
+    void visitMultiPart(MultiPart part);
+    void visitTextPart(TextPart part);
+    void visitVideoPart(VideoPart part);
+    void visitUnsupportedPart(UnsupportedPart part);
 }

trunk/LogicMail/src/org/logicprobe/LogicMail/message/VideoPart.java

@@ -41 +41 @@
 
         public VideoPart(String mimeSubtype, String name, String encoding, String disposition, String contentId, int size, String tag) {
-                super("audio", mimeSubtype, name, encoding, disposition, contentId, size, tag);
+                super("video", mimeSubtype, name, encoding, disposition, contentId, size, tag);
         }
         
@@ -56 +56 @@
                 visitor.visitVideoPart(this);
         }
-        
+
     /* (non-Javadoc)
          * @see org.logicprobe.LogicMail.util.Serializable#serialize(java.io.DataOutputStream)

trunk/LogicMail/src/org/logicprobe/LogicMail/ui/MessageIcons.java

@@ -34 +34 @@
 import org.logicprobe.LogicMail.message.AudioPart;
 import org.logicprobe.LogicMail.message.ImagePart;
+import org.logicprobe.LogicMail.message.MessagePart;
 import org.logicprobe.LogicMail.message.MimeMessagePart;
 import org.logicprobe.LogicMail.message.MimeMessagePartVisitor;
@@ -52 +53 @@
         private Bitmap mimeVideoBitmap;
         private Bitmap mimeApplicationBitmap;
+        private Bitmap mimeMessageBitmap;
         
         private MessageIcons() {
@@ -102 +104 @@
                 }
                 
+                public void visitMessagePart(MessagePart part) {
+                        if(icon != null) { return; }
+                        if(mimeMessageBitmap == null) {
+                                mimeMessageBitmap = Bitmap.getBitmapResource("mime_message.png");
+                        }
+                        icon = mimeMessageBitmap;
+                }
+                
                 public void visitMultiPart(MultiPart part) {
                         if(icon != null) { return; }