Changeset 282 for trunk/src/org/expeditee/agents/mail/MailSession.java

Timestamp:

08/27/08 09:18:49 (16 years ago)

Author:

ra33

Message:

 

File:

• trunk/src/org/expeditee/agents/mail/MailSession.java (modified) (7 diffs)

trunk/src/org/expeditee/agents/mail/MailSession.java

@@ -224 +224 @@
 
         public static boolean sendTextMessage(String to, String cc, String bcc,
-                        String subject, String body) {
+                        String subject, String body, Object attachments) {
 
                 if (_theMailSession == null) {
@@ -236 +236 @@
                 }
 
-                return _theMailSession.sendText(to, cc, bcc, subject, body);
+                return _theMailSession.sendText(to, cc, bcc, subject, body, attachments);
         }
 
         private synchronized boolean sendText(String to, String cc, String bcc,
-                        String subject, String body) {
+                        String subject, String body, Object attachments) {
                 if (!_transport.isConnected()) {
                         MessageBay
@@ -263 +263 @@
                         // -- Create a new message --
                         Message msg = new MimeMessage(_session);
-
+                        
                         // -- Set the FROM and TO fields --
                         msg.setFrom(new InternetAddress(_address));
@@ -409 +409 @@
                                 if (flag == null
                                                 || msgs[msgNum].getFlags().contains(flag) == isPresent) {
-                                        Item newItem = readMessage(msgs[msgNum], msgNum, frame, point);
+                                        Item newItem = readMessage(msgs[msgNum], msgNum, frame,
+                                                        point);
                                         if (newItem != null) {
                                                 mailItems.add(newItem);
@@ -423 +424 @@
         }
 
-        private Item readMessage(final Message message, int messageNo, Frame frame, Point point) {
-                String subject;
-                try {
-                        subject = message.getSubject();
-                } catch (MessagingException e) {
-                        MessageBay.errorMessage("GetMail error: " + e.getMessage());
-                        return null;
-                }
-
-                final Text source = FrameDNDTransferHandler
-                                .importString(subject, point);
-                // Create a frameCreator
-                final FrameCreator frames = new FrameCreator(frame.getFramesetName(),
-                                frame.path, messageNo + ". " + subject, false);
+        private Item readMessage(final Message message, final int messageNo,
+                        final Frame frame, final Point point) {
+
+                final Text source = FrameDNDTransferHandler.importString(
+                                "Loading message " + messageNo, point);
 
                 new Thread() {
                         public void run() {
                                 try {
+                                        String subject = message.getSubject();
+                                        source.setText(messageNo + ". " + subject);
+                                        // Create a frameCreator
+                                        final FrameCreator frames = new FrameCreator(frame
+                                                        .getFramesetName(), frame.path, subject, false);
+
                                         // Get the header information
                                         String from = ((InternetAddress) message.getFrom()[0])
                                                         .getPersonal();
-                                        if( from != null){
-                                                frames.addText("@fromName: " + from, null, null, null, false);
+                                        if (from != null) {
+                                                frames.addText("@fromName: " + from, null, null, null,
+                                                                false);
                                         }
                                         from = ((InternetAddress) message.getFrom()[0])
-                                                                .getAddress();
-                                        frames.addText("@fromAddress: " + from, null, null, null, false);
+                                                        .getAddress();
+                                        Text fromAddressItem = frames.addText("@from: " + from,
+                                                        null, null, null, false);
+
+                                        Text reply = frames.addText("@reply" + from, null, null,
+                                                        null, false);
+                                        reply.setPosition(10 + fromAddressItem.getX()
+                                                        + fromAddressItem.getBoundsWidth(), fromAddressItem
+                                                        .getY());
 
                                         // -- Get the message part (i.e. the message itself) --
@@ -461 +467 @@
                                         }
                                         // -- Get the content type --
-                                        String contentType = messagePart.getContentType().toLowerCase();
+                                        String contentType = messagePart.getContentType()
+                                                        .toLowerCase();
                                         // -- If the content is plain text, we can print it --
                                         // System.out.println("CONTENT:" + contentType);
@@ -479 +486 @@
                                         frames.save();
                                         source.setLink(frames.getName());
+                                } catch (MessagingException e) {
+                                        MessageBay.errorMessage("GetMail error: " + e.getMessage());
                                 } catch (Exception e) {
-                                        MessageBay.errorMessage("GetMail error: " + e.getMessage());
+                                        MessageBay.errorMessage("Error reading mail: "
+                                                        + e.getMessage());
                                 }
                         }