Changeset 618

Timestamp:

01/19/10 21:41:34 (2 years ago)

Author:

octorian

Message:

UI and model implementations for basic Copy-To/Move-To. (Still some issues that need to be resolved at the IMAP level, and when dealing with cached-but-unloaded messages)

Location:

trunk/LogicMail/src/org/logicprobe/LogicMail

Files:

• model/MailboxNode.java (modified) (3 diffs)
• ui/MessageActions.java (modified) (5 diffs)

trunk/LogicMail/src/org/logicprobe/LogicMail/model/MailboxNode.java

@@ -44 +44 @@
 import org.logicprobe.LogicMail.AppInfo;
 import org.logicprobe.LogicMail.mail.FolderTreeItem;
+import org.logicprobe.LogicMail.mail.MailStoreRequestCallback;
 import org.logicprobe.LogicMail.mail.MessageToken;
 import org.logicprobe.LogicMail.message.Message;
@@ -411 +412 @@
          * Copies a message into this mailbox from another mailbox within the same account.
          * This method will request the underlying mail store to copy the message
-         * on the server side.  If the mail store does not support this operation, then
-         * this method will have no effect.
+         * on the server side.
+     * <p>
+     * If the mail store does not support this operation, then this method will
+     * have no effect.
+     * </p>
          * 
          * @param messageNode Message to copy into this mailbox
@@ -426 +430 @@
         }
 
+    /**
+     * Moves a message into this mailbox from another mailbox within the same account.
+     * This method will request the underlying mail store to copy the message
+     * on the server side.  If and only if the copy is successful, the source message
+     * will be marked as deleted.
+     * <p>
+     * If the mail store does not support this operation, then this method will
+     * have no effect.
+     * </p>
+     * 
+     * @param messageNode Message to copy into this mailbox
+     */
+        public void moveMessageInto(MessageNode messageNode) {
+            // Sanity check
+            if(!(this.hasAppend
+                    && this.hasCopy()
+                    && messageNode.getParent().getParentAccount() == this.parentAccount)) {
+                return;
+            }
+            parentAccount.getMailStore().requestMessageCopy(
+                    messageNode.getMessageToken(),
+                    this.folderTreeItem,
+                    new MoveMessageIntoCallback(messageNode));
+        }
+        
+        /**
+         * Callback to handle the result of the copy operation dispatched
+         * from <code>moveMessageInto(messageNode)</code>.  If that operation
+         * succeeds, then a request is dispatched to mark the original message
+         * as deleted.  If it fails, then nothing happens.
+         */
+        private class MoveMessageIntoCallback implements MailStoreRequestCallback {
+            private MessageNode messageNode;
+            
+            /**
+         * Instantiates a new callback for handling the result
+         * of the copy operation involved in a message move.
+         * 
+         * @param messageNode the source message node
+         */
+        public MoveMessageIntoCallback(MessageNode messageNode) {
+                this.messageNode = messageNode;
+            }
+            
+        public void mailStoreRequestComplete() {
+            // If the move request succeeded, then dispatch a request
+            // to have the original message marked as deleted.
+            parentAccount.getMailStore().requestMessageDelete(
+                    messageNode.getMessageToken(),
+                    MessageNode.createMessageFlags(messageNode.getFlags()));
+        }
+
+        public void mailStoreRequestFailed(Throwable exception) {
+            // Do nothing if the request failed
+        }
+        }
+        
         /**
          * Adds a mailbox to this mailbox.

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

@@ -200 +200 @@
         
         // Move-To is currently only supported if the underlying mail store
-        // supports protocol-level copy, since it is the only safe way to
-        // ensure no message data is lost.
+        // supports protocol-level copy, and then only between folders on that
+        // mail store.  These limitations have been chosen because it is the
+        // simplest way to be absolutely sure that a user cannot mess up their
+        // data with a message move.
         if(mailboxNode.hasCopy()) {
             menu.add(moveToItem);
@@ -378 +380 @@
     public void copyToMailbox(MessageNode messageNode) {
         if(messageNode.hasMessageContent()) {
+            // Normal case where the message has been loaded within the
+            // data model and all copy options should be made available.
                 AccountNode[] accountNodes = MailManager.getInstance().getMailRootNode().getAccounts();
                 MailboxSelectionDialog dialog = new MailboxSelectionDialog(
@@ -390 +394 @@
                         if(selectedMailbox.hasCopy()
                                         && selectedMailbox.getParentAccount() == messageNode.getParent().getParentAccount()) {
+                            // The source and destination are on the same mail store,
+                            // and that mail store supports protocol-level copy.
                                 selectedMailbox.copyMessageInto(messageNode);
                         }
                         else {
+                            // Protocol-level copy is not possible, so just append
+                            // to the destination mailbox.
                                 selectedMailbox.appendMessage(messageNode);
                         }
                 }
         }
+        else if(messageNode.getParent().hasCopy()) {
+            // Alternate case where the message has not been loaded, but is
+            // on a mail store that supports protocol-level copy.  In this
+            // situation, only other mailboxes on the same mail store are
+            // to be considered valid destinations.
+            MailboxSelectionDialog dialog = new MailboxSelectionDialog(
+                    resources.getString(LogicMailResource.MESSAGE_SELECT_FOLDER_COPY_TO),
+                    new AccountNode[] { messageNode.getParent().getParentAccount() });
+            dialog.setSelectedMailboxNode(messageNode.getParent());
+            dialog.addUnselectableNode(messageNode.getParent());
+            dialog.doModal();
+            
+            MailboxNode selectedMailbox = dialog.getSelectedMailboxNode();
+            if(selectedMailbox != null && selectedMailbox != messageNode.getParent()) {
+                selectedMailbox.copyMessageInto(messageNode);
+            }
+        }
     }
     
@@ -405 +430 @@
      */
     public void moveToMailbox(MessageNode messageNode) {
-        if(messageNode.hasMessageContent()) {
-                AccountNode[] accountNodes = MailManager.getInstance().getMailRootNode().getAccounts();
+        if(messageNode.getParent().hasCopy()) {
                 MailboxSelectionDialog dialog = new MailboxSelectionDialog(
                                 resources.getString(LogicMailResource.MESSAGE_SELECT_FOLDER_MOVE_TO),
-                                accountNodes);
+                                new AccountNode[] { messageNode.getParent().getParentAccount() });
                 dialog.setSelectedMailboxNode(messageNode.getParent());
                 dialog.addUnselectableNode(messageNode.getParent());
@@ -415 +439 @@
                 
                 MailboxNode selectedMailbox = dialog.getSelectedMailboxNode();
-                if(selectedMailbox != null && selectedMailbox != messageNode.getParent()) {
-                        selectedMailbox.appendMessage(messageNode);
-                        //TODO: Move To Folder should delete after append
-                        //This should only be executed after the append was successful
-                        //messageNode.deleteMessage();
-                }
+            if(selectedMailbox != null && selectedMailbox != messageNode.getParent()) {
+                selectedMailbox.moveMessageInto(messageNode);
+            }
         }
     }