Changeset 617

Timestamp:

01/18/10 22:25:45 (2 years ago)

Author:

octorian

Message:

Refactored the request-level notification infrastructure to use callback methods, so it can be very granular when necessary, and completely ignored when irrelevant.

Location:

trunk

Files:

• LogicMail/src/org/logicprobe/LogicMail/mail/AbstractMailConnectionHandler.java (modified) (8 diffs)
• LogicMail/src/org/logicprobe/LogicMail/mail/AbstractMailSender.java (modified) (1 diff)
• LogicMail/src/org/logicprobe/LogicMail/mail/AbstractMailStore.java (modified) (29 diffs)
• LogicMail/src/org/logicprobe/LogicMail/mail/IncomingMailConnectionHandler.java (modified) (24 diffs)
• LogicMail/src/org/logicprobe/LogicMail/mail/LocalMailStore.java (modified) (22 diffs)
• LogicMail/src/org/logicprobe/LogicMail/mail/MailConnectionHandlerListener.java (modified) (2 diffs)
• LogicMail/src/org/logicprobe/LogicMail/mail/MailStoreListener.java (modified) (1 diff)
• LogicMail/src/org/logicprobe/LogicMail/mail/MailStoreRequestCallback.java (moved) (moved from trunk/LogicMail/src/org/logicprobe/LogicMail/mail/RequestEvent.java) (1 diff)
• LogicMail/src/org/logicprobe/LogicMail/mail/NetworkMailSender.java (modified) (3 diffs)
• LogicMail/src/org/logicprobe/LogicMail/mail/NetworkMailStore.java (modified) (3 diffs)
• LogicMail/src/org/logicprobe/LogicMail/mail/OutgoingMailConnectionHandler.java (modified) (4 diffs)
• LogicMail/src/org/logicprobe/LogicMail/model/AccountNode.java (modified) (3 diffs)
• LogicMailTests/src/org/logicprobe/LogicMail/mail/NetworkMailStoreTest.java (modified) (9 diffs)
• LogicMailTests/src/org/logicprobe/LogicMail/model/AccountNodeTest.java (modified) (2 diffs)

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/AbstractMailConnectionHandler.java

@@ -163 +163 @@
          * @param params Parameters passed to the corresponding
          *               AbstractMailStore.requestXXXX() method. 
-         */
-        public void addRequest(int type, Object[] params) {
+     * @param tag Tag reference to pass along with the request
+         */
+        public void addRequest(int type, Object[] params, Object tag) {
                 synchronized(requestQueue) {
                         if(!shutdownInProgress) {
-                                requestQueue.add(new Object[] {new Integer(type), params});
+                                requestQueue.add(new Object[] {new Integer(type), params, tag});
                                 requestQueue.notifyAll();
                         }
@@ -260 +261 @@
                         int type = ((Integer)request[0]).intValue();
                         Object[] params = (Object[])request[1];
+            Object tag = request[2];
                         
                         // Delegate to subclasses to handle the specific request
                         requestInProgress = request;
-                        handleRequest(type, params);
+                        handleRequest(type, params, tag);
                         requestInProgress = null;
                         
@@ -285 +287 @@
          * @param type Type identifier for the request.
          * @param params Parameters for the request.
+     * @param tag Tag reference to pass along with the request
      * @throws IOException on I/O errors
      * @throws MailException on protocol errors
          */
-        protected abstract void handleRequest(int type, Object[] params) throws IOException, MailException;
+        protected abstract void handleRequest(int type, Object[] params, Object tag) throws IOException, MailException;
         
         /**
@@ -297 +300 @@
          * </p>
          * 
+     * @param type Type identifier for the request.
+     * @param params Parameters for the request.
+     * @param tag Tag reference to pass along with the request
          * @param exception Exception that was thrown to fail the request,
          * or null if it failed due to a queue flush
          */
-        protected void handleRequestFailed(int type, Object[] params, Throwable exception) {
+        protected void handleRequestFailed(int type, Object[] params, Object tag, Throwable exception) {
         if(this.listener != null) {
             listener.mailConnectionRequestFailed(type, params, exception);
@@ -532 +538 @@
                     ((Integer)requestInProgress[0]).intValue(),
                     (Object[])requestInProgress[1],
+                    requestInProgress[2],
                     e);
             requestInProgress = null;
@@ -562 +569 @@
                     ((Integer)requestInProgress[0]).intValue(),
                     (Object[])requestInProgress[1],
+                    requestInProgress[2],
                     e);
             requestInProgress = null;
@@ -591 +599 @@
                     ((Integer)requestInProgress[0]).intValue(),
                     (Object[])requestInProgress[1],
+                    requestInProgress[2],
                     t);
             requestInProgress = null;
@@ -610 +619 @@
                         ((Integer)request[0]).intValue(),
                         (Object[])request[1],
+                        request[2],
                         null);
                     element = requestQueue.element();

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/AbstractMailSender.java

@@ -74 +74 @@
      */
         public abstract void requestSendMessage(MessageEnvelope envelope, Message message);
-        
+
     /**
      * Adds a <tt>MailSenderListener</tt> to the mail sender.

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/AbstractMailStore.java

@@ -52 +52 @@
 public abstract class AbstractMailStore {
     private EventListenerList listenerList = new EventListenerList();
-        
-        protected AbstractMailStore() {
-        }
-        
-        /**
-         * Shutdown the mail store.
-         * <p>
-         * Only relevant for non-local stores which have stateful connections.
-         * </p>
-         * 
-         * @param wait If true, wait for all pending requests to finish.
-         */
-        public abstract void shutdown(boolean wait);
-        
-        /**
-         * Returns whether the mail store is local or remote.
-         * 
-         * @return True if local, false if remote.
-         */
-        public abstract boolean isLocal();
-        
+
+    protected AbstractMailStore() {
+    }
+
+    /**
+     * Shutdown the mail store.
+     * <p>
+     * Only relevant for non-local stores which have stateful connections.
+     * </p>
+     * 
+     * @param wait If true, wait for all pending requests to finish.
+     */
+    public abstract void shutdown(boolean wait);
+
+    /**
+     * Returns whether the mail store is local or remote.
+     * 
+     * @return True if local, false if remote.
+     */
+    public abstract boolean isLocal();
+
     /**
      * Returns whether the mail store supports mail folders.
@@ -90 +90 @@
      */
     public abstract boolean hasMessageParts();
-    
+
     /**
      * Returns whether the mail store supports message flags.
@@ -97 +97 @@
      */
     public abstract boolean hasFlags();
-    
+
     /**
      * Returns whether the mail store supports appending messages.
@@ -104 +104 @@
      */
     public abstract boolean hasAppend();
-    
+
     /**
      * Returns whether the mail store supports server-side copying of messages between mailboxes.
@@ -110 +110 @@
      * @return True if message copying is supported
      */
-        public abstract boolean hasCopy();
-        
+    public abstract boolean hasCopy();
+
     /**
      * Returns whether the mail store supports undeletion of messages.
@@ -125 +125 @@
      */
     public abstract boolean hasExpunge();
-    
+
     /**
      * Requests the regeneration of the mail folder tree.
@@ -134 +134 @@
      * <p>This can be an expensive operation, so it should
      * be called sparingly on non-local mail stores.
-     */
-    public abstract void requestFolderTree();
-    
+     * 
+     * @param callback The callback to receive success or failure notifications about the request
+     */
+    public abstract void requestFolderTree(MailStoreRequestCallback callback);
+
+    /**
+     * Requests the regeneration of the mail folder tree.
+     * 
+     * <p>Successful completion is indicated by a call to
+     * {@link MailStoreListener#folderTreeUpdated(FolderEvent)}.
+     * 
+     * <p>This can be an expensive operation, so it should
+     * be called sparingly on non-local mail stores.
+     */
+    public void requestFolderTree() {
+        requestFolderTree(null);
+    }
+
     /**
      * Requests that a folder be expunged of deleted messages.
@@ -144 +159 @@
      * 
      * @param folder The folder to expunge
-     */
-    public abstract void requestFolderExpunge(FolderTreeItem folder);
-    
+     * @param callback The callback to receive success or failure notifications about the request
+     */
+    public abstract void requestFolderExpunge(FolderTreeItem folder, MailStoreRequestCallback callback);
+
+    /**
+     * Requests that a folder be expunged of deleted messages.
+     * 
+     * <p>Successful completion is indicated by a call to
+     * {@link FolderListener#folderExpunged(FolderEvent)}.
+     * 
+     * @param folder The folder to expunge
+     */
+    public void requestFolderExpunge(FolderTreeItem folder) {
+        requestFolderExpunge(folder, null);
+    }
+
     /**
      * Requests the current message counts of a group of folders.
@@ -154 +182 @@
      * 
      * @param folders The folder tree items to refresh.
-     */
-    public abstract void requestFolderStatus(FolderTreeItem[] folders);
-    
+     * @param callback The callback to receive success or failure notifications about the request
+     */
+    public abstract void requestFolderStatus(FolderTreeItem[] folders, MailStoreRequestCallback callback);
+
+    /**
+     * Requests the current message counts of a group of folders.
+     * 
+     * <p>Successful completion is indicated by calls to
+     * {@link FolderListener#folderStatusChanged(FolderEvent)}.
+     * 
+     * @param folders The folder tree items to refresh.
+     */
+    public void requestFolderStatus(FolderTreeItem[] folders) {
+        requestFolderStatus(folders, null);
+    }
+
     /**
      * Requests the message listing from a particular folder.
@@ -166 +207 @@
      * @param firstIndex The index of the first message to get headers for.
      * @param lastIndex The index of the last message to get headers for.
-     */
-    public abstract void requestFolderMessagesRange(FolderTreeItem folder, int firstIndex, int lastIndex);
-    
+     * @param callback The callback to receive success or failure notifications about the request
+     */
+    public abstract void requestFolderMessagesRange(FolderTreeItem folder, int firstIndex, int lastIndex, MailStoreRequestCallback callback);
+
+    /**
+     * Requests the message listing from a particular folder.
+     * 
+     * <p>Successful completion is indicated by a call to
+     * {@link FolderListener#folderMessagesAvailable(FolderMessagesEvent)}.
+     * 
+     * @param folder The folder to request a message listing for.
+     * @param firstIndex The index of the first message to get headers for.
+     * @param lastIndex The index of the last message to get headers for.
+     */
+    public void requestFolderMessagesRange(FolderTreeItem folder, int firstIndex, int lastIndex) {
+        requestFolderMessagesRange(folder, firstIndex, lastIndex, null);
+    }
+
     /**
      * Requests the message listing from a particular folder.
@@ -179 +235 @@
      * @param folder The folder to request a message listing for.
      * @param messageTokens The set of tokens for the messages to get headers for.
-     */
-    public abstract void requestFolderMessagesSet(FolderTreeItem folder, MessageToken[] messageTokens);
-    
+     * @param callback The callback to receive success or failure notifications about the request
+     */
+    public abstract void requestFolderMessagesSet(FolderTreeItem folder, MessageToken[] messageTokens, MailStoreRequestCallback callback);
+
+    /**
+     * Requests the message listing from a particular folder.
+     * All message tokens must refer to messages that exist within the provided
+     * folder item, or the results may be unexpected.
+     * 
+     * <p>Successful completion is indicated by a call to
+     * {@link FolderListener#folderMessagesAvailable(FolderMessagesEvent)}.
+     * 
+     * @param folder The folder to request a message listing for.
+     * @param messageTokens The set of tokens for the messages to get headers for.
+     */
+    public void requestFolderMessagesSet(FolderTreeItem folder, MessageToken[] messageTokens) {
+        requestFolderMessagesSet(folder, messageTokens, null);
+    }
+
     /**
      * Requests the recent message listing from a particular folder.
@@ -195 +267 @@
      * @param folder The folder to request a message listing for.
      * @param flagsOnly If true, only tokens and flags will be fetched
-     */
-    public abstract void requestFolderMessagesRecent(FolderTreeItem folder, boolean flagsOnly);
-    
+     * @param callback The callback to receive success or failure notifications about the request
+     */
+    public abstract void requestFolderMessagesRecent(FolderTreeItem folder, boolean flagsOnly, MailStoreRequestCallback callback);
+
     /**
      * Requests the recent message listing from a particular folder.
      * 
-     * <p>Successful completion is indicated by a call to
-     * {@link FolderListener#folderMessagesAvailable(FolderMessagesEvent)}.
+     * <p>
+     * Successful completion is indicated by a call to
+     * {@link FolderListener#folderMessagesAvailable(FolderMessagesEvent)}.
+     * If <tt>flagsOnly</tt> is set to <b>true</b>, then the envelope and
+     * structure fields of the returned <tt>FolderMessage</tt> objects
+     * will be set to <b>null</b>.
+     * </p>
      * 
      * @param folder The folder to request a message listing for.
+     * @param flagsOnly If true, only tokens and flags will be fetched
+     */
+    public void requestFolderMessagesRecent(FolderTreeItem folder, boolean flagsOnly) {
+        requestFolderMessagesRecent(folder, flagsOnly, null);
+    }
+
+    /**
+     * Requests the recent message listing from a particular folder.
+     * 
+     * <p>Successful completion is indicated by a call to
+     * {@link FolderListener#folderMessagesAvailable(FolderMessagesEvent)}.
+     * 
+     * @param folder The folder to request a message listing for.
+     * @param callback The callback to receive success or failure notifications about the request
+     */
+    public void requestFolderMessagesRecent(FolderTreeItem folder, MailStoreRequestCallback callback) {
+        requestFolderMessagesRecent(folder, false, callback);
+    }
+
+    /**
+     * Requests the recent message listing from a particular folder.
+     * 
+     * <p>Successful completion is indicated by a call to
+     * {@link FolderListener#folderMessagesAvailable(FolderMessagesEvent)}.
+     * 
+     * @param folder The folder to request a message listing for.
      */
     public void requestFolderMessagesRecent(FolderTreeItem folder) {
-        requestFolderMessagesRecent(folder, false);
-    }
-    
+        requestFolderMessagesRecent(folder, false, null);
+    }
+
     /**
      * Requests a particular message to be loaded.
@@ -217 +321 @@
      * 
      * @param messageToken The token used to identify the message
-     */
-    public abstract void requestMessage(MessageToken messageToken);
-    
+     * @param callback The callback to receive success or failure notifications about the request
+     */
+    public abstract void requestMessage(MessageToken messageToken, MailStoreRequestCallback callback);
+
+    /**
+     * Requests a particular message to be loaded.
+     * 
+     * <p>Successful completion is indicated by a call to
+     * {@link MessageListener#messageAvailable(MessageEvent)}.
+     * 
+     * @param messageToken The token used to identify the message
+     */
+    public void requestMessage(MessageToken messageToken) {
+        requestMessage(messageToken, null);
+    }
+
     /**
      * Requests a particular message part to be loaded.
@@ -232 +349 @@
      * @param messageToken The token used to identify the message
      * @param messagePart The part of the message to load
-     */
-    public abstract void requestMessageParts(MessageToken messageToken, MimeMessagePart[] messageParts);
-    
+     * @param callback The callback to receive success or failure notifications about the request
+     */
+    public abstract void requestMessageParts(MessageToken messageToken, MimeMessagePart[] messageParts, MailStoreRequestCallback callback);
+
+    /**
+     * Requests a particular message part to be loaded.
+     * 
+     * <p>Successful completion is indicated by a call to
+     * {@link MessageListener#messageAvailable(MessageEvent)}.
+     * 
+     * <p>If <tt>hasMessageParts()</tt> returns <tt>False</tt>,
+     * then this method should throw an
+     * <tt>UnsupportedOperationException</tt>.
+     * 
+     * @param messageToken The token used to identify the message
+     * @param messagePart The part of the message to load
+     */
+    public void requestMessageParts(MessageToken messageToken, MimeMessagePart[] messageParts) {
+        requestMessageParts(messageToken, messageParts, null);
+    }
+
     /**
      * Requests a particular message to be deleted.
@@ -243 +378 @@
      * @param messageToken The token used to identify the message
      * @param messageFlags The flags currently associated with the message
-     */
-    public abstract void requestMessageDelete(MessageToken messageToken, MessageFlags messageFlags);
-    
+     * @param callback The callback to receive success or failure notifications about the request
+     */
+    public abstract void requestMessageDelete(MessageToken messageToken, MessageFlags messageFlags, MailStoreRequestCallback callback);
+
+    /**
+     * Requests a particular message to be deleted.
+     * 
+     * <p>Successful completion is indicated by a call to
+     * {@link MessageListener#messageDeleted(MessageEvent)}.
+     * 
+     * @param messageToken The token used to identify the message
+     * @param messageFlags The flags currently associated with the message
+     */
+    public void requestMessageDelete(MessageToken messageToken, MessageFlags messageFlags) {
+        requestMessageDelete(messageToken, messageFlags, null);
+    }
+
     /**
      * Requests a particular message to be undeleted.
@@ -258 +407 @@
      * @param messageToken The token used to identify the message
      * @param messageFlags The flags currently associated with the message
-     */
-    public abstract void requestMessageUndelete(MessageToken messageToken, MessageFlags messageFlags);
-    
+     * @param callback The callback to receive success or failure notifications about the request
+     */
+    public abstract void requestMessageUndelete(MessageToken messageToken, MessageFlags messageFlags, MailStoreRequestCallback callback);
+
+    /**
+     * Requests a particular message to be undeleted.
+     * 
+     * <p>Successful completion is indicated by a call to
+     * {@link MessageListener#messageUndeleted(MessageEvent)}.
+     * 
+     * <p>If <tt>hasUndelete()</tt> returns <tt>False</tt>,
+     * then this method should throw an
+     * <tt>UnsupportedOperationException</tt>.
+     * 
+     * @param messageToken The token used to identify the message
+     * @param messageFlags The flags currently associated with the message
+     */
+    public void requestMessageUndelete(MessageToken messageToken, MessageFlags messageFlags) {
+        requestMessageUndelete(messageToken, messageFlags, null);
+    }
+
     /**
      * Requests a particular message to be marked as answered.
@@ -273 +440 @@
      * @param messageToken The token used to identify the message
      * @param messageFlags The flags currently associated with the message
-     */
-    public abstract void requestMessageAnswered(MessageToken messageToken, MessageFlags messageFlags);
-    
+     * @param callback The callback to receive success or failure notifications about the request
+     */
+    public abstract void requestMessageAnswered(MessageToken messageToken, MessageFlags messageFlags, MailStoreRequestCallback callback);
+
+    /**
+     * Requests a particular message to be marked as answered.
+     * 
+     * <p>Successful completion is indicated by a call to
+     * {@link MessageListener#messageFlagsChanged(MessageEvent)}.
+     * 
+     * <p>If <tt>hasFlags()</tt> returns <tt>False</tt>,
+     * then this method should throw an
+     * <tt>UnsupportedOperationException</tt>.
+     * 
+     * @param messageToken The token used to identify the message
+     * @param messageFlags The flags currently associated with the message
+     */
+    public void requestMessageAnswered(MessageToken messageToken, MessageFlags messageFlags) {
+        requestMessageAnswered(messageToken, messageFlags, null);
+    }
+
     /**
      * Requests a message to be appended to a folder.
@@ -293 +478 @@
      * @param rawMessage The raw source of the message to add
      * @param initialFlags The initial flags for the message
-     */
-    public abstract void requestMessageAppend(FolderTreeItem folder, String rawMessage, MessageFlags initialFlags);
-    
+     * @param callback The callback to receive success or failure notifications about the request
+     */
+    public abstract void requestMessageAppend(FolderTreeItem folder, String rawMessage, MessageFlags initialFlags, MailStoreRequestCallback callback);
+
+    /**
+     * Requests a message to be appended to a folder.
+     * 
+     * <p>Unlike other methods, this method requires the raw source of a message
+     * in order to add it.  This is because we are often trying to save an
+     * exact message that was returned by an operation such as sending mail.
+     * 
+     * <p>Successful completion is indicated by a call to
+     * {@link FolderListener#folderMessagesAvailable(FolderMessagesEvent)}.
+     * 
+     * <p>If <tt>hasAppend()</tt> returns <tt>False</tt>,
+     * then this method should throw an
+     * <tt>UnsupportedOperationException</tt>.
+     * 
+     * @param folder The folder to add the message to
+     * @param rawMessage The raw source of the message to add
+     * @param initialFlags The initial flags for the message
+     */
+    public void requestMessageAppend(FolderTreeItem folder, String rawMessage, MessageFlags initialFlags) {
+        requestMessageAppend(folder, rawMessage, initialFlags, null);
+    }
+
     /**
      * Requests a message to be copied into a folder on the server-side.
@@ -312 +520 @@
      * @param messageToken The token used to identify the message
      * @param destinationFolder The folder to copy the message into
-     */
-    public abstract void requestMessageCopy(MessageToken messageToken, FolderTreeItem destinationFolder);
-        //TODO Come up with a notification event for copy
-    
+     * @param callback The callback to receive success or failure notifications about the request
+     */
+    public abstract void requestMessageCopy(MessageToken messageToken, FolderTreeItem destinationFolder, MailStoreRequestCallback callback);
+
+    /**
+     * Requests a message to be copied into a folder on the server-side.
+     * 
+     * <p>
+     * If <tt>hasCopy()</tt> returns <tt>false</tt>,
+     * then this method should throw an
+     * <tt>UnsupportedOperationException</tt>.
+     * </p>
+     * 
+     * <p>
+     * Notification of successful completion is not directly provided,
+     * however the destination folder should contain the message if queried.
+     * </p>
+     * 
+     * @param messageToken The token used to identify the message
+     * @param destinationFolder The folder to copy the message into
+     */
+    public void requestMessageCopy(MessageToken messageToken, FolderTreeItem destinationFolder) {
+        requestMessageCopy(messageToken, destinationFolder, null);
+    }
+
     /**
      * Adds a <tt>MailStoreListener</tt> to the mail store.
@@ -332 +561 @@
         listenerList.remove(MailStoreListener.class, l);
     }
-    
+
     /**
      * Returns an array of all <tt>MailStoreListener</tt>s
@@ -360 +589 @@
         listenerList.remove(FolderListener.class, l);
     }
-    
+
     /**
      * Returns an array of all <tt>FolderListener</tt>s
@@ -389 +618 @@
         listenerList.remove(MessageListener.class, l);
     }
-    
+
     /**
      * Returns an array of all <tt>MessageListener</tt>s
@@ -400 +629 @@
         return (MessageListener[])listenerList.getListeners(MessageListener.class);
     }
-    
-    /**
-     * Notifies all registered <tt>MailStoreListener</tt>s that
-     * a mail store request as completed. 
-     * 
-     * @param type The type of the event, which should be a constant defined on <code>RequestEvent</code>.
-     */
-    protected void fireMailStoreRequestComplete(int type) {
-        Object[] listeners = listenerList.getListeners(MailStoreListener.class);
-        RequestEvent e = null;
-        for(int i=0; i<listeners.length; i++) {
-            if(e == null) {
-                e = new RequestEvent(this, type, null, null);
-            }
-            ((MailStoreListener)listeners[i]).mailStoreRequestComplete(e);
-        }
-    }
-    
-    /**
-     * Notifies all registered <tt>MailStoreListener</tt>s that
-     * a mail store request has failed.
-     * 
-     * @param root The type of the event, which should be a constant defined on <code>RequestEvent</code>.
-     * @param params The parameters passed along with the request.
-     * @param exception The exception that caused the request to fail, if applicable.
-     */
-    protected void fireMailStoreRequestFailed(int type, Object[] params, Throwable exception) {
-        Object[] listeners = listenerList.getListeners(MailStoreListener.class);
-        RequestEvent e = null;
-        for(int i=0; i<listeners.length; i++) {
-            if(e == null) {
-                e = new RequestEvent(this, type, params, exception);
-            }
-            ((MailStoreListener)listeners[i]).mailStoreRequestFailed(e);
-        }
-    }
-    
+
     /**
      * Notifies all registered <tt>MailStoreListener</tt>s that
@@ -453 +646 @@
         }
     }
-    
+
     /**
      * Notifies all registered <tt>FolderListener</tt>s that
@@ -489 +682 @@
         }
     }
-    
+
     /**
      * Notifies all registered <tt>FolderListener</tt>s that
@@ -526 +719 @@
         }
     }
-    
+
     /**
      * Notifies all registered <tt>MessageListener</tt>s that
@@ -544 +737 @@
         }
     }
-    
+
     /**
      * Notifies all registered <tt>MessageListener</tt>s that
@@ -562 +755 @@
         }
     }
-    
+
     /**
      * Notifies all registered <tt>MessageListener</tt>s that
@@ -580 +773 @@
         }
     }
-    
+
     /**
      * Notifies all registered <tt>MessageListener</tt>s that

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/IncomingMailConnectionHandler.java

@@ -84 +84 @@
      * @param type Type identifier for the request.
      * @param params Parameters for the request.
+     * @param tag Tag reference to pass along with the request.
      * @throws IOException on I/O errors
      * @throws MailException on protocol errors
      */
-    protected void handleRequest(int type, Object[] params) throws IOException, MailException {
+    protected void handleRequest(int type, Object[] params, Object tag) throws IOException, MailException {
         switch(type) {
         case REQUEST_FOLDER_TREE:
-            handleRequestFolderTree();
+            handleRequestFolderTree(tag);
             break;
         case REQUEST_FOLDER_EXPUNGE:
-            handleRequestFolderExpunge((FolderTreeItem)params[0]);
+            handleRequestFolderExpunge((FolderTreeItem)params[0], tag);
             break;
         case REQUEST_FOLDER_STATUS:
-            handleRequestFolderStatus((FolderTreeItem[])params[0]);
+            handleRequestFolderStatus((FolderTreeItem[])params[0], tag);
             break;
         case REQUEST_FOLDER_MESSAGES_RANGE:
@@ -102 +103 @@
                     (FolderTreeItem)params[0],
                     ((Integer)params[1]).intValue(),
-                    ((Integer)params[2]).intValue());
+                    ((Integer)params[2]).intValue(),
+                    tag);
             break;
         case REQUEST_FOLDER_MESSAGES_SET:
             handleRequestFolderMessagesSet(
                     (FolderTreeItem)params[0],
-                    (MessageToken[])params[1]);
+                    (MessageToken[])params[1],
+                    tag);
             break;
         case REQUEST_FOLDER_MESSAGES_RECENT:
             handleRequestFolderMessagesRecent(
-                    (FolderTreeItem)params[0], ((Boolean)params[1]).booleanValue());
+                    (FolderTreeItem)params[0], ((Boolean)params[1]).booleanValue(), tag);
             break;
         case REQUEST_MESSAGE:
-            handleRequestMessage((MessageToken)params[0]);
+            handleRequestMessage((MessageToken)params[0], tag);
             break;
         case REQUEST_MESSAGE_PARTS:
-            handleRequestMessageParts((MessageToken)params[0], (MimeMessagePart[])params[1]);
+            handleRequestMessageParts((MessageToken)params[0], (MimeMessagePart[])params[1], tag);
             break;
         case REQUEST_MESSAGE_DELETE:
-            handleRequestMessageDelete((MessageToken)params[0], (MessageFlags)params[1]);
+            handleRequestMessageDelete((MessageToken)params[0], (MessageFlags)params[1], tag);
             break;
         case REQUEST_MESSAGE_UNDELETE:
-            handleRequestMessageUndelete((MessageToken)params[0], (MessageFlags)params[1]);
+            handleRequestMessageUndelete((MessageToken)params[0], (MessageFlags)params[1], tag);
             break;
         case REQUEST_MESSAGE_ANSWERED:
-            handleRequestMessageAnswered((MessageToken)params[0], (MessageFlags)params[1]);
+            handleRequestMessageAnswered((MessageToken)params[0], (MessageFlags)params[1], tag);
             break;
         case REQUEST_MESSAGE_APPEND:
-            handleRequestMessageAppend((FolderTreeItem)params[0], (String)params[1], (MessageFlags)params[2]);
+            handleRequestMessageAppend((FolderTreeItem)params[0], (String)params[1], (MessageFlags)params[2], tag);
             break;
         case REQUEST_MESSAGE_COPY:
-            handleRequestMessageCopy((MessageToken)params[0], (FolderTreeItem)params[1]);
+            handleRequestMessageCopy((MessageToken)params[0], (FolderTreeItem)params[1], tag);
         }
     }
@@ -150 +153 @@
                     addRequest(
                             IncomingMailConnectionHandler.REQUEST_FOLDER_MESSAGES_RECENT,
-                            new Object[] { incomingClient.getActiveFolder() });
+                            new Object[] { incomingClient.getActiveFolder() },
+                            null);
                     endIdle = true;
                 }
@@ -177 +181 @@
                     addRequest(
                             IncomingMailConnectionHandler.REQUEST_FOLDER_MESSAGES_RECENT,
-                            new Object[] { incomingClient.getActiveFolder() });
+                            new Object[] { incomingClient.getActiveFolder() },
+                            null);
                 }
                 else {
@@ -205 +210 @@
     }
 
-    private void handleRequestFolderTree() throws IOException, MailException {
+    private void handleRequestFolderTree(Object tag) throws IOException, MailException {
         String message = resources.getString(LogicMailResource.MAILCONNECTION_REQUEST_FOLDER_TREE);
         showStatus(message);
@@ -212 +217 @@
         MailConnectionHandlerListener listener = getListener();
         if(root != null && listener != null) {
-            listener.mailConnectionRequestComplete(REQUEST_FOLDER_TREE, root);
-        }
-    }
-
-    private void handleRequestFolderExpunge(FolderTreeItem folder) throws IOException, MailException {
+            listener.mailConnectionRequestComplete(REQUEST_FOLDER_TREE, root, tag);
+        }
+    }
+
+    private void handleRequestFolderExpunge(FolderTreeItem folder, Object tag) throws IOException, MailException {
         String message = resources.getString(LogicMailResource.MAILCONNECTION_REQUEST_FOLDER_EXPUNGE);
         showStatus(message);
@@ -224 +229 @@
         MailConnectionHandlerListener listener = getListener();
         if(listener != null) {
-            listener.mailConnectionRequestComplete(REQUEST_FOLDER_EXPUNGE, folder);
-        }
-    }
-
-    private void handleRequestFolderStatus(FolderTreeItem[] folders) throws IOException, MailException {
+            listener.mailConnectionRequestComplete(REQUEST_FOLDER_EXPUNGE, folder, tag);
+        }
+    }
+
+    private void handleRequestFolderStatus(FolderTreeItem[] folders, Object tag) throws IOException, MailException {
         String message = resources.getString(LogicMailResource.MAILCONNECTION_REQUEST_FOLDER_STATUS);
         showStatus(message);
@@ -235 +240 @@
         MailConnectionHandlerListener listener = getListener();
         if(listener != null) {
-            listener.mailConnectionRequestComplete(REQUEST_FOLDER_STATUS, folders);
+            listener.mailConnectionRequestComplete(REQUEST_FOLDER_STATUS, folders, tag);
         }
     }
@@ -244 +249 @@
         private FolderTreeItem folder;
         private MailConnectionHandlerListener listener;
+        private Object tag;
         private Object param;
         private FolderMessage[] folderMessages;
         private int count;
 
-        public GetFolderMessageCallback(int maxCount, int type, FolderTreeItem folder, MailConnectionHandlerListener listener) {
-            this(maxCount, type, folder, listener, null);
-        }
-
-        public GetFolderMessageCallback(int maxCount, int type, FolderTreeItem folder, MailConnectionHandlerListener listener, Object param) {
+        public GetFolderMessageCallback(int maxCount, int type, FolderTreeItem folder, MailConnectionHandlerListener listener, Object tag) {
+            this(maxCount, type, folder, listener, null, tag);
+        }
+
+        public GetFolderMessageCallback(int maxCount, int type, FolderTreeItem folder, MailConnectionHandlerListener listener, Object param, Object tag) {
             this.maxCount = maxCount;
             this.type = type;
@@ -258 +264 @@
             this.listener = listener;
             this.param = param;
+            this.tag = tag;
             this.count = 0;
         }
@@ -289 +296 @@
                 if(resultMessages != null) {
                     if(param == null) {
-                        listener.mailConnectionRequestComplete(type, new Object[] { folder, resultMessages });
+                        listener.mailConnectionRequestComplete(type, new Object[] { folder, resultMessages }, tag);
                     }
                     else {
-                        listener.mailConnectionRequestComplete(type, new Object[] { folder, resultMessages, param });
+                        listener.mailConnectionRequestComplete(type, new Object[] { folder, resultMessages, param }, tag);
                     }
                 }
@@ -300 +307 @@
                 if(folderMessage == null) {
                     if(param == null) {
-                        listener.mailConnectionRequestComplete(type, new Object[] { folder, null });
+                        listener.mailConnectionRequestComplete(type, new Object[] { folder, null }, tag);
                     }
                     else {
-                        listener.mailConnectionRequestComplete(type, new Object[] { folder, null, param });
+                        listener.mailConnectionRequestComplete(type, new Object[] { folder, null, param }, tag);
                     }
                 }
@@ -310 +317 @@
     };
 
-    private void handleRequestFolderMessagesRange(FolderTreeItem folder, int firstIndex, int lastIndex) throws IOException, MailException {
+    private void handleRequestFolderMessagesRange(FolderTreeItem folder, int firstIndex, int lastIndex, Object tag) throws IOException, MailException {
         String message = resources.getString(LogicMailResource.MAILCONNECTION_REQUEST_FOLDER_MESSAGES);
         showStatus(message + "...");
@@ -321 +328 @@
                         REQUEST_FOLDER_MESSAGES_RANGE,
                         folder,
-                        getListener()),
+                        getListener(), tag),
                         getProgressHandler(message));
     }
     
-    private void handleRequestFolderMessagesSet(FolderTreeItem folder, MessageToken[] messageTokens) throws IOException, MailException {
+    private void handleRequestFolderMessagesSet(FolderTreeItem folder, MessageToken[] messageTokens, Object tag) throws IOException, MailException {
         String message = resources.getString(LogicMailResource.MAILCONNECTION_REQUEST_FOLDER_MESSAGES);
         showStatus(message + "...");
@@ -336 +343 @@
                         REQUEST_FOLDER_MESSAGES_SET,
                         folder,
-                        getListener()),
+                        getListener(), tag),
                         getProgressHandler(message));
     }
     
-    private void handleRequestFolderMessagesRecent(FolderTreeItem folder, boolean flagsOnly) throws IOException, MailException {
+    private void handleRequestFolderMessagesRecent(FolderTreeItem folder, boolean flagsOnly, Object tag) throws IOException, MailException {
         String message = resources.getString(LogicMailResource.MAILCONNECTION_REQUEST_FOLDER_MESSAGES);
         showStatus(message + "...");
@@ -352 +359 @@
                         folder,
                         getListener(),
-                        new Boolean(flagsOnly)),
+                        new Boolean(flagsOnly), tag),
                         getProgressHandler(message));
     }
@@ -371 +378 @@
     }
     
-    private void handleRequestMessage(MessageToken messageToken) throws IOException, MailException {
+    private void handleRequestMessage(MessageToken messageToken, Object tag) throws IOException, MailException {
         String statusMessage = resources.getString(LogicMailResource.MAILCONNECTION_REQUEST_MESSAGE);
         showStatus(statusMessage);
@@ -380 +387 @@
         MailConnectionHandlerListener listener = getListener();
         if(message != null && listener != null) {
-            listener.mailConnectionRequestComplete(REQUEST_MESSAGE, new Object[] { messageToken, message.getStructure(), message.getAllContent() });
-        }
-    }
-    
-    private void handleRequestMessageParts(MessageToken messageToken, MimeMessagePart[] messageParts) throws IOException, MailException {
+            listener.mailConnectionRequestComplete(REQUEST_MESSAGE, new Object[] { messageToken, message.getStructure(), message.getAllContent() }, tag);
+        }
+    }
+    
+    private void handleRequestMessageParts(MessageToken messageToken, MimeMessagePart[] messageParts, Object tag) throws IOException, MailException {
         String statusMessage = resources.getString(LogicMailResource.MAILCONNECTION_REQUEST_MESSAGE);
         showStatus(statusMessage);
@@ -410 +417 @@
         MailConnectionHandlerListener listener = getListener();
         if(messageContent != null && listener != null) {
-            listener.mailConnectionRequestComplete(REQUEST_MESSAGE_PARTS, new Object[] { messageToken, messageContent });
-        }
-    }
-
-    private void handleRequestMessageDelete(MessageToken messageToken, MessageFlags messageFlags) throws IOException, MailException {
+            listener.mailConnectionRequestComplete(REQUEST_MESSAGE_PARTS, new Object[] { messageToken, messageContent }, tag);
+        }
+    }
+
+    private void handleRequestMessageDelete(MessageToken messageToken, MessageFlags messageFlags, Object tag) throws IOException, MailException {
         showStatus(resources.getString(LogicMailResource.MAILCONNECTION_REQUEST_MESSAGE_DELETE));
         checkActiveFolder(messageToken);
@@ -422 +429 @@
         MailConnectionHandlerListener listener = getListener();
         if(listener != null) {
-            listener.mailConnectionRequestComplete(REQUEST_MESSAGE_DELETE, new Object[] { messageToken, messageFlags });
-        }
-    }
-    
-    private void handleRequestMessageUndelete(MessageToken messageToken, MessageFlags messageFlags) throws IOException, MailException {
+            listener.mailConnectionRequestComplete(REQUEST_MESSAGE_DELETE, new Object[] { messageToken, messageFlags }, tag);
+        }
+    }
+    
+    private void handleRequestMessageUndelete(MessageToken messageToken, MessageFlags messageFlags, Object tag) throws IOException, MailException {
         showStatus(resources.getString(LogicMailResource.MAILCONNECTION_REQUEST_MESSAGE_UNDELETE));
         checkActiveFolder(messageToken);
@@ -434 +441 @@
         MailConnectionHandlerListener listener = getListener();
         if(listener != null) {
-            listener.mailConnectionRequestComplete(REQUEST_MESSAGE_UNDELETE, new Object[] { messageToken, messageFlags });
-        }
-    }
-    
-    private void handleRequestMessageAnswered(MessageToken messageToken, MessageFlags messageFlags) throws IOException, MailException {
+            listener.mailConnectionRequestComplete(REQUEST_MESSAGE_UNDELETE, new Object[] { messageToken, messageFlags }, tag);
+        }
+    }
+    
+    private void handleRequestMessageAnswered(MessageToken messageToken, MessageFlags messageFlags, Object tag) throws IOException, MailException {
         showStatus(resources.getString(LogicMailResource.MAILCONNECTION_REQUEST_MESSAGE_ANSWERED));
         // Replace this with a more general method:
@@ -448 +455 @@
         MailConnectionHandlerListener listener = getListener();
         if(listener != null) {
-            listener.mailConnectionRequestComplete(REQUEST_MESSAGE_ANSWERED, new Object[] { messageToken, messageFlags });
-        }
-    }
-    
-    private void handleRequestMessageAppend(FolderTreeItem folder, String rawMessage, MessageFlags initialFlags) throws IOException, MailException {
+            listener.mailConnectionRequestComplete(REQUEST_MESSAGE_ANSWERED, new Object[] { messageToken, messageFlags }, tag);
+        }
+    }
+    
+    private void handleRequestMessageAppend(FolderTreeItem folder, String rawMessage, MessageFlags initialFlags, Object tag) throws IOException, MailException {
         showStatus(resources.getString(LogicMailResource.MAILCONNECTION_REQUEST_MESSAGE_APPEND));
         // Clean up this interface:
@@ -462 +469 @@
         if(listener != null) {
             // Using a null FolderMessage since no information is returned on the appended message:
-            listener.mailConnectionRequestComplete(REQUEST_MESSAGE_APPEND, new Object[] { folder, null });
-        }
-    }
-    
-    private void handleRequestMessageCopy(MessageToken messageToken, FolderTreeItem destinationFolder) throws IOException, MailException {
+            listener.mailConnectionRequestComplete(REQUEST_MESSAGE_APPEND, new Object[] { folder, null }, tag);
+        }
+    }
+    
+    private void handleRequestMessageCopy(MessageToken messageToken, FolderTreeItem destinationFolder, Object tag) throws IOException, MailException {
         showStatus(resources.getString(LogicMailResource.MAILCONNECTION_REQUEST_MESSAGE_COPY));
         if(incomingClient.hasCopy()) {
@@ -476 +483 @@
         if(listener != null) {
             // Using a null FolderMessage since no information is returned on the appended message:
-            listener.mailConnectionRequestComplete(REQUEST_MESSAGE_COPY, new Object[] { messageToken, destinationFolder });
+            listener.mailConnectionRequestComplete(REQUEST_MESSAGE_COPY, new Object[] { messageToken, destinationFolder }, tag);
         }
     }

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/LocalMailStore.java

@@ -53 +53 @@
 import org.logicprobe.LogicMail.util.ThreadQueue;
 
-
 /**
  * This class manages local mail folders on the device.
@@ -109 +108 @@
 
     public boolean hasCopy() {
-        // TODO Implement copy for local messages
-        return false;
+        return true;
     }
     
@@ -121 +119 @@
     }
     
-    public void requestFolderTree() {
-        fireMailStoreRequestComplete(RequestEvent.TYPE_FOLDER_TREE);
+    public void requestFolderTree(MailStoreRequestCallback callback) {
+        if(callback != null) { callback.mailStoreRequestComplete(); }
         fireFolderTreeUpdated(rootFolder);
     }
 
-    public void requestFolderExpunge(FolderTreeItem folder) {
+    public void requestFolderExpunge(FolderTreeItem folder, MailStoreRequestCallback callback) {
         FolderTreeItem requestFolder = getMatchingFolderTreeItem(folder.getPath());
         
         if(requestFolder != null) {
-            threadQueue.invokeLater(new ExpungeFolderRunnable(requestFolder));
+            threadQueue.invokeLater(new ExpungeFolderRunnable(requestFolder, callback));
+        }
+        else {
+            if(callback != null) { callback.mailStoreRequestFailed(null); }
         }
     }
     
     private class ExpungeFolderRunnable extends MaildirRunnable {
-        public ExpungeFolderRunnable(FolderTreeItem requestFolder) {
-            super(requestFolder);
+        public ExpungeFolderRunnable(FolderTreeItem requestFolder, MailStoreRequestCallback callback) {
+            super(requestFolder, callback);
         }
         
@@ -153 +154 @@
             
             if(expunged) {
-                fireMailStoreRequestComplete(RequestEvent.TYPE_FOLDER_EXPUNGE);
+                if(callback != null) { callback.mailStoreRequestComplete(); }
                 fireFolderExpunged(requestFolder);
             }
             else {
-                fireMailStoreRequestFailed(RequestEvent.TYPE_FOLDER_EXPUNGE, new Object[] { requestFolder }, throwable);
-            }
-        }
-    }
-    
-    public void requestFolderStatus(FolderTreeItem[] folders) {
+                if(callback != null) { callback.mailStoreRequestFailed(throwable); }
+            }
+        }
+    }
+    
+    public void requestFolderStatus(FolderTreeItem[] folders, MailStoreRequestCallback callback) {
         // Make every entry in the provided array match the local folder
         // objects just in case they do not.  Then, fire change events
@@ -173 +174 @@
                 if (folders[i].getPath().equals(localFolders[j].getPath())) {
                     folders[i] = localFolders[j];
-
                     break;
                 }
@@ -179 +179 @@
         }
         
-        fireMailStoreRequestComplete(RequestEvent.TYPE_FOLDER_STATUS);
+        if(callback != null) { callback.mailStoreRequestComplete(); }
         for (int i = 0; i < folders.length; i++) {
             fireFolderStatusChanged(folders[i]);
@@ -185 +185 @@
     }
 
-    public void requestFolderMessagesRange(FolderTreeItem folder, int firstIndex, int lastIndex) {
+    public void requestFolderMessagesRange(FolderTreeItem folder, int firstIndex, int lastIndex, MailStoreRequestCallback callback) {
         throw new UnsupportedOperationException("Not yet implemented");
         }
 
-        public void requestFolderMessagesSet(FolderTreeItem folder, MessageToken[] messageTokens) {
+        public void requestFolderMessagesSet(FolderTreeItem folder, MessageToken[] messageTokens, MailStoreRequestCallback callback) {
                 throw new UnsupportedOperationException("Not yet implemented");
         }
 
-    public void requestFolderMessagesRecent(FolderTreeItem folder, boolean flagsOnly) {
+    public void requestFolderMessagesRecent(FolderTreeItem folder, boolean flagsOnly, MailStoreRequestCallback callback) {
         // The flagsOnly parameter has no effect on local mail stores,
         // and it is not likely to ever be called on them anyways.
@@ -199 +199 @@
         
         if(requestFolder != null) {
-                threadQueue.invokeLater(new RequestFolderMessagesRecentRunnable(requestFolder));
+                threadQueue.invokeLater(new RequestFolderMessagesRecentRunnable(requestFolder, callback));
+        }
+        else {
+            if(callback != null) { callback.mailStoreRequestFailed(null); }
         }
     }
 
     private class RequestFolderMessagesRecentRunnable extends MaildirRunnable {
-        public RequestFolderMessagesRecentRunnable(FolderTreeItem requestFolder) {
-                super(requestFolder);
+        public RequestFolderMessagesRecentRunnable(FolderTreeItem requestFolder, MailStoreRequestCallback callback) {
+                super(requestFolder, callback);
         }
         
@@ -221 +224 @@
                 
                 if(folderMessages != null) {
-                    fireMailStoreRequestComplete(RequestEvent.TYPE_FOLDER_MESSAGES_RECENT);
+                if(callback != null) { callback.mailStoreRequestComplete(); }
                         fireFolderMessagesAvailable(requestFolder, folderMessages, false);
                 }
                 else {
-                    fireMailStoreRequestFailed(RequestEvent.TYPE_FOLDER_MESSAGES_RECENT, new Object[] { requestFolder }, throwable);
+                if(callback != null) { callback.mailStoreRequestFailed(throwable); }
                 }
                 }
     }
     
-    public void requestMessage(MessageToken messageToken) {
+    public void requestMessage(MessageToken messageToken, MailStoreRequestCallback callback) {
         LocalMessageToken localMessageToken = (LocalMessageToken)messageToken;
         FolderTreeItem requestFolder = getMatchingFolderTreeItem(localMessageToken.getFolderPath());
         
         if(requestFolder != null) {
-                threadQueue.invokeLater(new RequestMessageRunnable(requestFolder, localMessageToken));
+                threadQueue.invokeLater(new RequestMessageRunnable(requestFolder, localMessageToken, callback));
+        }
+        else {
+            if(callback != null) { callback.mailStoreRequestFailed(null); }
         }
     }
@@ -242 +248 @@
         private LocalMessageToken localMessageToken;
         
-        public RequestMessageRunnable(FolderTreeItem requestFolder, LocalMessageToken localMessageToken) {
-                super(requestFolder);
+        public RequestMessageRunnable(FolderTreeItem requestFolder, LocalMessageToken localMessageToken, MailStoreRequestCallback callback) {
+                super(requestFolder, callback);
                 this.localMessageToken = localMessageToken;
         }
@@ -273 +279 @@
                 
                 if(message != null && messageSource != null) {
-                    fireMailStoreRequestComplete(RequestEvent.TYPE_MESSAGE);
+                if(callback != null) { callback.mailStoreRequestComplete(); }
                         fireMessageAvailable(localMessageToken, message.getStructure(), message.getAllContent(), messageSource);
                 }
                 else {
-                    fireMailStoreRequestFailed(RequestEvent.TYPE_MESSAGE, new Object[] { localMessageToken }, throwable);
+                if(callback != null) { callback.mailStoreRequestFailed(throwable); }
                 }
                 }
     }
 
-    public void requestMessageParts(MessageToken messageToken, MimeMessagePart[] messageParts) {
+    public void requestMessageParts(MessageToken messageToken, MimeMessagePart[] messageParts, MailStoreRequestCallback callback) {
         throw new UnsupportedOperationException();
     }
     
-    public void requestMessageDelete(MessageToken messageToken, MessageFlags messageFlags) {
+    public void requestMessageDelete(MessageToken messageToken, MessageFlags messageFlags, MailStoreRequestCallback callback) {
         LocalMessageToken localMessageToken = (LocalMessageToken)messageToken;
         FolderTreeItem requestFolder = getMatchingFolderTreeItem(localMessageToken.getFolderPath());
@@ -293 +299 @@
             MessageFlags newFlags = copyMessageFlags(messageFlags);
             newFlags.setDeleted(true);
-            threadQueue.invokeLater(new UpdateMessageFlagsRunnable(requestFolder, localMessageToken, newFlags, RequestEvent.TYPE_MESSAGE_DELETE));
-        }
-    }
-
-    public void requestMessageUndelete(MessageToken messageToken, MessageFlags messageFlags) {
+            threadQueue.invokeLater(new UpdateMessageFlagsRunnable(requestFolder, localMessageToken, newFlags, callback));
+        }
+        else {
+            if(callback != null) { callback.mailStoreRequestFailed(null); }
+        }
+    }
+
+    public void requestMessageUndelete(MessageToken messageToken, MessageFlags messageFlags, MailStoreRequestCallback callback) {
         LocalMessageToken localMessageToken = (LocalMessageToken)messageToken;
         FolderTreeItem requestFolder = getMatchingFolderTreeItem(localMessageToken.getFolderPath());
@@ -304 +313 @@
             MessageFlags newFlags = copyMessageFlags(messageFlags);
             newFlags.setDeleted(false);
-            threadQueue.invokeLater(new UpdateMessageFlagsRunnable(requestFolder, localMessageToken, newFlags, RequestEvent.TYPE_MESSAGE_UNDELETE));
-        }
-    }
-
-    public void requestMessageAnswered(MessageToken messageToken, MessageFlags messageFlags) {
+            threadQueue.invokeLater(new UpdateMessageFlagsRunnable(requestFolder, localMessageToken, newFlags, callback));
+        }
+        else {
+            if(callback != null) { callback.mailStoreRequestFailed(null); }
+        }
+    }
+
+    public void requestMessageAnswered(MessageToken messageToken, MessageFlags messageFlags, MailStoreRequestCallback callback) {
         LocalMessageToken localMessageToken = (LocalMessageToken)messageToken;
         FolderTreeItem requestFolder = getMatchingFolderTreeItem(localMessageToken.getFolderPath());
@@ -315 +327 @@
             MessageFlags newFlags = copyMessageFlags(messageFlags);
             newFlags.setAnswered(true);
-            threadQueue.invokeLater(new UpdateMessageFlagsRunnable(requestFolder, localMessageToken, newFlags, RequestEvent.TYPE_MESSAGE_ANSWERED));
+            threadQueue.invokeLater(new UpdateMessageFlagsRunnable(requestFolder, localMessageToken, newFlags, callback));
+        }
+        else {
+            if(callback != null) { callback.mailStoreRequestFailed(null); }
         }
     }
@@ -322 +337 @@
         private LocalMessageToken localMessageToken;
         private MessageFlags messageFlags;
-        private int requestType;
         
         public UpdateMessageFlagsRunnable(
@@ -328 +342 @@
                 LocalMessageToken localMessageToken,
                 MessageFlags messageFlags,
-                int requestType) {
-            super(requestFolder);
+                MailStoreRequestCallback callback) {
+            super(requestFolder, callback);
             this.localMessageToken = localMessageToken;
             this.messageFlags = messageFlags;
-            this.requestType = requestType;
         }
 
@@ -351 +364 @@
             
             if(success) {
-                fireMailStoreRequestComplete(requestType);
+                if(callback != null) { callback.mailStoreRequestComplete(); }
             }
             else {
-                fireMailStoreRequestFailed(requestType, new Object[] { localMessageToken, messageFlags }, throwable);
-            }
-            
+                if(callback != null) { callback.mailStoreRequestFailed(throwable); }
+            }
+
             if(flagsUpdated) {
                 fireMessageFlagsChanged(localMessageToken, messageFlags);
@@ -363 +376 @@
     }
     
-    public void requestMessageAppend(FolderTreeItem folder, String rawMessage, MessageFlags initialFlags) {
+    public void requestMessageAppend(FolderTreeItem folder, String rawMessage, MessageFlags initialFlags, MailStoreRequestCallback callback) {
         FolderTreeItem requestFolder = getMatchingFolderTreeItem(folder.getPath());
         
         if(requestFolder != null && rawMessage != null && rawMessage.length() > 0 && initialFlags != null) {
-                threadQueue.invokeLater(new RequestMessageAppendRunnable(requestFolder, rawMessage, initialFlags));
+                threadQueue.invokeLater(new RequestMessageAppendRunnable(requestFolder, rawMessage, initialFlags, callback));
+        }
+        else {
+            if(callback != null) { callback.mailStoreRequestFailed(null); }
         }
     }
@@ -375 +391 @@
         private MessageFlags initialFlags;
         
-        public RequestMessageAppendRunnable(FolderTreeItem requestFolder, String rawMessage, MessageFlags initialFlags) {
-                super(requestFolder);
+        public RequestMessageAppendRunnable(FolderTreeItem requestFolder, String rawMessage, MessageFlags initialFlags, MailStoreRequestCallback callback) {
+                super(requestFolder, callback);
                 this.rawMessage = rawMessage;
                 this.initialFlags = initialFlags;
@@ -394 +410 @@
                 
                 if(folderMessage != null) {
-                    fireMailStoreRequestComplete(RequestEvent.TYPE_MESSAGE_APPEND);
+                if(callback != null) { callback.mailStoreRequestComplete(); }
                         fireFolderMessagesAvailable(requestFolder, new FolderMessage[] { folderMessage }, false);
                 }
                 else {
-                    fireMailStoreRequestFailed(RequestEvent.TYPE_MESSAGE_APPEND, new Object[] { requestFolder, rawMessage, initialFlags }, throwable);
+                if(callback != null) { callback.mailStoreRequestFailed(throwable); }
                 }
                 }
@@ -406 +422 @@
      * @see org.logicprobe.LogicMail.mail.AbstractMailStore#requestMessageCopy(org.logicprobe.LogicMail.mail.MessageToken, org.logicprobe.LogicMail.mail.FolderTreeItem)
      */
-    public void requestMessageCopy(MessageToken messageToken, FolderTreeItem destinationFolder) {
-        throw new UnsupportedOperationException();
+    public void requestMessageCopy(MessageToken messageToken, FolderTreeItem destinationFolder, MailStoreRequestCallback callback) {
+        LocalMessageToken localMessageToken = (LocalMessageToken)messageToken;
+        FolderTreeItem fromFolder = getMatchingFolderTreeItem(localMessageToken.getFolderPath());
+        FolderTreeItem toFolder = getMatchingFolderTreeItem(destinationFolder.getPath());
+        if(fromFolder != null && toFolder != null) {
+            threadQueue.invokeLater(new MessageCopyRunnable(localMessageToken, fromFolder, toFolder, callback));
+        }
+        else {
+            if(callback != null) { callback.mailStoreRequestFailed(null); }
+        }
+    }
+    
+    private class MessageCopyRunnable implements Runnable {
+        private LocalMessageToken localMessageToken;
+        private FolderTreeItem toFolder;
+        private MaildirFolder fromMaildirFolder;
+        private MaildirFolder toMaildirFolder;
+        private MailStoreRequestCallback callback;
+
+        public MessageCopyRunnable(LocalMessageToken localMessageToken, FolderTreeItem fromFolder, FolderTreeItem toFolder, MailStoreRequestCallback callback) {
+            this.localMessageToken = localMessageToken;
+            this.toFolder = toFolder;
+            this.fromMaildirFolder = getMaildirFolder(fromFolder);
+            this.toMaildirFolder = getMaildirFolder(toFolder);
+            this.callback = callback;
+        }
+
+        public void run() {
+            Throwable throwable = null;
+            FolderMessage copiedMessage = null;
+            try {
+                fromMaildirFolder.open();
+                toMaildirFolder.open();
+
+                String messageSource = fromMaildirFolder.getMessageSource(localMessageToken);
+                copiedMessage = toMaildirFolder.appendMessage(
+                        messageSource,
+                        new MessageFlags(false, false, false, false, false, true, false));
+
+                toMaildirFolder.close();
+                fromMaildirFolder.close();
+            } catch (IOException e) {
+                EventLogger.logEvent(AppInfo.GUID, ("Unable to read folder: " + e.toString()).getBytes(), EventLogger.ERROR);
+                throwable = e;
+            }
+            
+            if(copiedMessage != null) {
+                if(callback != null) { callback.mailStoreRequestComplete(); }
+                fireFolderMessagesAvailable(toFolder, new FolderMessage[] { copiedMessage }, false);
+            }
+            else {
+                if(callback != null) { callback.mailStoreRequestFailed(throwable); }
+            }
+        }
     }
     
@@ -434 +502 @@
         protected FolderTreeItem requestFolder;
         protected MaildirFolder maildirFolder;
+        protected MailStoreRequestCallback callback;
         
-        public MaildirRunnable(FolderTreeItem requestFolder) {
+        public MaildirRunnable(FolderTreeItem requestFolder, MailStoreRequestCallback callback) {
                 this.requestFolder = requestFolder;
-
-                if(folderMaildirMap.containsKey(requestFolder)) {
-                        maildirFolder = (MaildirFolder)folderMaildirMap.get(requestFolder);
-                }
-                else {
-                        String folderUrl = globalConfig.getLocalDataLocation() + "local/";
-                        try {
-                                FileConnection fileConnection = (FileConnection)Connector.open(folderUrl);
-                                if(!fileConnection.exists()) {
-                                        fileConnection.mkdir();
-                                }
-                                fileConnection.close();
-                        } catch (IOException e) {
-                    EventLogger.logEvent(AppInfo.GUID, ("Error preparing root path: " + e.toString()).getBytes(), EventLogger.ERROR);
-                        }
-                        
-                StringBuffer buf = new StringBuffer();
-                buf.append(folderUrl);
-                buf.append(requestFolder.getPath());
-                        maildirFolder = new MaildirFolder(requestFolder.getPath(), buf.toString());
-                        folderMaildirMap.put(requestFolder, maildirFolder);
-                }
+                this.maildirFolder = getMaildirFolder(requestFolder);
+                this.callback = callback;
         }
+    }
+    
+    private MaildirFolder getMaildirFolder(FolderTreeItem requestFolder) {
+        MaildirFolder maildirFolder;
+        if(folderMaildirMap.containsKey(requestFolder)) {
+            maildirFolder = (MaildirFolder)folderMaildirMap.get(requestFolder);
+        }
+        else {
+            String folderUrl = globalConfig.getLocalDataLocation() + "local/";
+            try {
+                FileConnection fileConnection = (FileConnection)Connector.open(folderUrl);
+                if(!fileConnection.exists()) {
+                    fileConnection.mkdir();
+                }
+                fileConnection.close();
+            } catch (IOException e) {
+                EventLogger.logEvent(AppInfo.GUID, ("Error preparing root path: " + e.toString()).getBytes(), EventLogger.ERROR);
+            }
+            
+            StringBuffer buf = new StringBuffer();
+            buf.append(folderUrl);
+            buf.append(requestFolder.getPath());
+            maildirFolder = new MaildirFolder(requestFolder.getPath(), buf.toString());
+            folderMaildirMap.put(requestFolder, maildirFolder);
+        }
+        return maildirFolder;
     }
     

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/MailConnectionHandlerListener.java

@@ -42 +42 @@
          * @param type The type of the request.
          * @param result The data returned from the request.
+     * @param tag Tag reference to pass along with the request
          */
-        public void mailConnectionRequestComplete(int type, Object result);
+        public void mailConnectionRequestComplete(int type, Object result, Object tag);
         
     /**
@@ -49 +50 @@
      * 
      * @param type The type of the request.
-     * @param params The parameters passed along with the request.
+     * @param tag Tag reference to pass along with the request
      * @param exception The exception that caused the request to fail, if applicable.
      */
-    public void mailConnectionRequestFailed(int type, Object[] params, Throwable exception);
+    public void mailConnectionRequestFailed(int type, Object tag, Throwable exception);
 }

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/MailStoreListener.java

@@ -38 +38 @@
  */
 public interface MailStoreListener extends EventListener {
-    /**
-     * Invoked when a mail store request is completed.
-     * 
-     * @param e the event data
-     */
-    void mailStoreRequestComplete(RequestEvent e);
-    
-    /**
-     * Invoked when a mail store request fails.
-     * 
-     * @param e the event data
-     */
-    void mailStoreRequestFailed(RequestEvent e);
-    
         /**
          * Invoked when the folder tree is updated.

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/MailStoreRequestCallback.java

@@ -32 +32 @@
 
 /**
- * Object for mail store request events. 
+ * Callback interface for mail store requests.
  */
-public class RequestEvent extends MailStoreEvent {
-    private int type;
-    private Object[] params;
-    private Throwable exception;
-    
-    public final static int TYPE_FOLDER_TREE = 0;
-    public final static int TYPE_FOLDER_EXPUNGE = 1;
-    public final static int TYPE_FOLDER_STATUS = 2;
-    public final static int TYPE_FOLDER_MESSAGES_RANGE = 3;
-    public final static int TYPE_FOLDER_MESSAGES_SET = 4;
-    public final static int TYPE_FOLDER_MESSAGES_RECENT = 5;
-    public final static int TYPE_MESSAGE = 6;
-    public final static int TYPE_MESSAGE_PARTS = 7;
-    public final static int TYPE_MESSAGE_DELETE = 8;
-    public final static int TYPE_MESSAGE_UNDELETE = 9;
-    public final static int TYPE_MESSAGE_ANSWERED = 10;
-    public final static int TYPE_MESSAGE_APPEND = 11;
-    public final static int TYPE_MESSAGE_COPY = 12;
+public interface MailStoreRequestCallback {
+    /**
+     * Invoked when the mail store request is completed.
+     */
+    void mailStoreRequestComplete();
     
     /**
-     * Creates a new instance of MessageEvent.
+     * Invoked when the mail store request fails.
      * 
-     * @param source the source of the event
-     * @param type the type of the event
-     * @param params the parameters passed along with the request.
-     * @param exception the exception that caused the request to fail, if applicable.
+     * @param exception the exception that caused the request to fail, if applicable
      */
-    public RequestEvent(Object source, int type, Object[] params, Throwable exception) {
-        super(source);
-        this.type = type;
-        this.params = params;
-        this.exception = exception;
-    }
-
-    /**
-     * Gets the type of this request event.
-     * 
-     * @return Event type.
-     */
-    public int getType() {
-        return this.type;
-    }
-    
-    /**
-     * Gets the parameters passed along with the request.
-     * 
-     * @return the parameters passed along with the request
-     */
-    public Object[] getParameters() {
-        return params;
-    }
-    
-    /**
-     * Gets the exception that caused the request to fail, if applicable.
-     * 
-     * @return the exception that caused the request to fail, if applicable
-     */
-    public Throwable getException() {
-        return exception;
-    }
+    void mailStoreRequestFailed(Throwable exception);
 }

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/NetworkMailSender.java

@@ -47 +47 @@
                 this.connectionHandler = new OutgoingMailConnectionHandler(client);
                 this.connectionHandler.setListener(new MailConnectionHandlerListener() {
-                        public void mailConnectionRequestComplete(int type, Object result) {
-                                connectionHandler_mailConnectionRequestComplete(type, result);
+                        public void mailConnectionRequestComplete(int type, Object tag, Object result) {
+                                connectionHandler_mailConnectionRequestComplete(type, tag, result);
                         }
 
-            public void mailConnectionRequestFailed(int type, Object[] params, Throwable exception) {
-                connectionHandler_mailConnectionRequestFailed(type, params, exception);
+            public void mailConnectionRequestFailed(int type, Object tag, Throwable exception) {
+                connectionHandler_mailConnectionRequestFailed(type, tag, exception);
             }
                 });
@@ -88 +88 @@
         
         public void requestSendMessage(MessageEnvelope envelope, Message message) {
-                connectionHandler.addRequest(OutgoingMailConnectionHandler.REQUEST_SEND_MESSAGE, new Object[] { envelope, message });
+                connectionHandler.addRequest(OutgoingMailConnectionHandler.REQUEST_SEND_MESSAGE, new Object[] { envelope, message }, new Object[] { envelope, message });
         }
         
-        private void connectionHandler_mailConnectionRequestComplete(int type, Object result) {
+        private void connectionHandler_mailConnectionRequestComplete(int type, Object tag, Object result) {
                 Object[] results;
                 switch(type) {
@@ -101 +101 @@
         }
         
-        private void connectionHandler_mailConnectionRequestFailed(int type, Object[] params, Throwable exception) {
+        private void connectionHandler_mailConnectionRequestFailed(int type, Object tag, Throwable exception) {
         switch(type) {
         case OutgoingMailConnectionHandler.REQUEST_SEND_MESSAGE:
+            Object[] params = (Object[])tag;
             fireMessageSendFailed((MessageEnvelope)params[0], (Message)params[1]);
             break;

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/NetworkMailStore.java

@@ -51 +51 @@
                 this.connectionHandler = new IncomingMailConnectionHandler(client);
                 this.connectionHandler.setListener(new MailConnectionHandlerListener() {
-                        public void mailConnectionRequestComplete(int type, Object result) {
-                                connectionHandler_mailConnectionRequestComplete(type, result);
+                        public void mailConnectionRequestComplete(int type, Object tag, Object result) {
+                                connectionHandler_mailConnectionRequestComplete(type, tag, result);
                         }
-            public void mailConnectionRequestFailed(int type, Object[] params, Throwable exception) {
-                connectionHandler_mailConnectionRequestFailed(type, params, exception);
+            public void mailConnectionRequestFailed(int type, Object tag, Throwable exception) {
+                connectionHandler_mailConnectionRequestFailed(type, tag, exception);
             }
                 });
@@ -121 +121 @@
         }
 
-        public void requestFolderTree() {
-                connectionHandler.addRequest(IncomingMailConnectionHandler.REQUEST_FOLDER_TREE, new Object[] { });
-        }
-
-        public void requestFolderExpunge(FolderTreeItem folder) {
-            connectionHandler.addRequest(IncomingMailConnectionHandler.REQUEST_FOLDER_EXPUNGE, new Object[] { folder });
-        }
-        
-        public void requestFolderStatus(FolderTreeItem[] folders) {
-                connectionHandler.addRequest(IncomingMailConnectionHandler.REQUEST_FOLDER_STATUS, new Object[] { folders });
-        }
-
-        public void requestFolderMessagesRange(FolderTreeItem folder, int firstIndex, int lastIndex) {
+        public void requestFolderTree(MailStoreRequestCallback callback) {
+                connectionHandler.addRequest(IncomingMailConnectionHandler.REQUEST_FOLDER_TREE, new Object[] { }, callback);
+        }
+
+        public void requestFolderExpunge(FolderTreeItem folder, MailStoreRequestCallback callback) {
+            connectionHandler.addRequest(IncomingMailConnectionHandler.REQUEST_FOLDER_EXPUNGE, new Object[] { folder }, callback);
+        }
+        
+        public void requestFolderStatus(FolderTreeItem[] folders, MailStoreRequestCallback callback) {
+                connectionHandler.addRequest(IncomingMailConnectionHandler.REQUEST_FOLDER_STATUS, new Object[] { folders }, callback);
+        }
+
+        public void requestFolderMessagesRange(FolderTreeItem folder, int firstIndex, int lastIndex, MailStoreRequestCallback callback) {
                 connectionHandler.addRequest(
                                 IncomingMailConnectionHandler.REQUEST_FOLDER_MESSAGES_RANGE,
-                                new Object[] { folder, new Integer(firstIndex), new Integer(lastIndex) });
-        }
-
-        public void requestFolderMessagesSet(FolderTreeItem folder, MessageToken[] messageTokens) {
+                                new Object[] { folder, new Integer(firstIndex), new Integer(lastIndex) },
+                                callback);
+        }
+
+        public void requestFolderMessagesSet(FolderTreeItem folder, MessageToken[] messageTokens, MailStoreRequestCallback callback) {
                 connectionHandler.addRequest(
                                 IncomingMailConnectionHandler.REQUEST_FOLDER_MESSAGES_SET,
-                                new Object[] { folder, messageTokens });
-        }
-        
-        public void requestFolderMessagesRecent(FolderTreeItem folder, boolean flagsOnly) {
+                                new Object[] { folder, messageTokens },
+                                callback);
+        }
+        
+        public void requestFolderMessagesRecent(FolderTreeItem folder, boolean flagsOnly, MailStoreRequestCallback callback) {
                 connectionHandler.addRequest(
                                 IncomingMailConnectionHandler.REQUEST_FOLDER_MESSAGES_RECENT,
-                                new Object[] { folder, new Boolean(flagsOnly) });
-        }
-        
-        public void requestMessage(MessageToken messageToken) {
-                connectionHandler.addRequest(IncomingMailConnectionHandler.REQUEST_MESSAGE, new Object[] { messageToken });
-        }
-
-        public void requestMessageParts(MessageToken messageToken, MimeMessagePart[] messageParts) {
-                connectionHandler.addRequest(IncomingMailConnectionHandler.REQUEST_MESSAGE_PARTS, new Object[] { messageToken, messageParts });
-        }
-        
-        public void requestMessageDelete(MessageToken messageToken, MessageFlags messageFlags) {
-                connectionHandler.addRequest(IncomingMailConnectionHandler.REQUEST_MESSAGE_DELETE, new Object[] { messageToken, messageFlags });
-        }
-
-        public void requestMessageUndelete(MessageToken messageToken, MessageFlags messageFlags) {
+                                new Object[] { folder, new Boolean(flagsOnly) },
+                                callback);
+        }
+        
+        public void requestMessage(MessageToken messageToken, MailStoreRequestCallback callback) {
+                connectionHandler.addRequest(IncomingMailConnectionHandler.REQUEST_MESSAGE, new Object[] { messageToken }, callback);
+        }
+
+        public void requestMessageParts(MessageToken messageToken, MimeMessagePart[] messageParts, MailStoreRequestCallback callback) {
+                connectionHandler.addRequest(IncomingMailConnectionHandler.REQUEST_MESSAGE_PARTS, new Object[] { messageToken, messageParts }, callback);
+        }
+        
+        public void requestMessageDelete(MessageToken messageToken, MessageFlags messageFlags, MailStoreRequestCallback callback) {
+                connectionHandler.addRequest(IncomingMailConnectionHandler.REQUEST_MESSAGE_DELETE, new Object[] { messageToken, messageFlags }, callback);
+        }
+
+        public void requestMessageUndelete(MessageToken messageToken, MessageFlags messageFlags, MailStoreRequestCallback callback) {
                 if(!client.hasUndelete()) {
                         throw new UnsupportedOperationException();
                 }
-                connectionHandler.addRequest(IncomingMailConnectionHandler.REQUEST_MESSAGE_UNDELETE, new Object[] { messageToken, messageFlags });
-        }
-
-        public void requestMessageAnswered(MessageToken messageToken, MessageFlags messageFlags) {
+                connectionHandler.addRequest(IncomingMailConnectionHandler.REQUEST_MESSAGE_UNDELETE, new Object[] { messageToken, messageFlags }, callback);
+        }
+
+        public void requestMessageAnswered(MessageToken messageToken, MessageFlags messageFlags, MailStoreRequestCallback callback) {
                 if(!this.hasFlags()) {
                         throw new UnsupportedOperationException();
                 }
-                connectionHandler.addRequest(IncomingMailConnectionHandler.REQUEST_MESSAGE_ANSWERED, new Object[] { messageToken, messageFlags });
-        }
-
-        public void requestMessageAppend(FolderTreeItem folder, String rawMessage, MessageFlags initialFlags) {
+                connectionHandler.addRequest(IncomingMailConnectionHandler.REQUEST_MESSAGE_ANSWERED, new Object[] { messageToken, messageFlags }, callback);
+        }
+
+        public void requestMessageAppend(FolderTreeItem folder, String rawMessage, MessageFlags initialFlags, MailStoreRequestCallback callback) {
                 if(!this.hasAppend()) {
                         throw new UnsupportedOperationException();
                 }
-                connectionHandler.addRequest(IncomingMailConnectionHandler.REQUEST_MESSAGE_APPEND, new Object[] { folder, rawMessage, initialFlags });
-        }
-        
-        public void requestMessageCopy(MessageToken messageToken, FolderTreeItem destinationFolder) {
+                connectionHandler.addRequest(IncomingMailConnectionHandler.REQUEST_MESSAGE_APPEND, new Object[] { folder, rawMessage, initialFlags }, callback);
+        }
+        
+        public void requestMessageCopy(MessageToken messageToken, FolderTreeItem destinationFolder, MailStoreRequestCallback callback) {
                 if(!this.hasCopy()) {
                         throw new UnsupportedOperationException();
                 }
-                connectionHandler.addRequest(IncomingMailConnectionHandler.REQUEST_MESSAGE_COPY, new Object[] { messageToken, destinationFolder });
-        }
-        
-        private void connectionHandler_mailConnectionRequestComplete(int type, Object result) {
+                connectionHandler.addRequest(IncomingMailConnectionHandler.REQUEST_MESSAGE_COPY, new Object[] { messageToken, destinationFolder }, callback);
+        }
+        
+        private void connectionHandler_mailConnectionRequestComplete(int type, Object result, Object tag) {
+        MailStoreRequestCallback callback;
+        if(tag instanceof MailStoreRequestCallback) {
+            callback = (MailStoreRequestCallback)tag;
+        }
+        else {
+            callback = null;
+        }
+            
                 Object[] results;
                 switch(type) {
                 case IncomingMailConnectionHandler.REQUEST_FOLDER_TREE:
-                    fireMailStoreRequestComplete(RequestEvent.TYPE_FOLDER_TREE);
+                    if(callback != null) { callback.mailStoreRequestComplete(); }
                         fireFolderTreeUpdated((FolderTreeItem)result);
                         break;
                 case IncomingMailConnectionHandler.REQUEST_FOLDER_EXPUNGE:
-                    fireMailStoreRequestComplete(RequestEvent.TYPE_FOLDER_EXPUNGE);
+            if(callback != null) { callback.mailStoreRequestComplete(); }
                     fireFolderExpunged((FolderTreeItem)result);
                     break;
                 case IncomingMailConnectionHandler.REQUEST_FOLDER_STATUS:
-                    fireMailStoreRequestComplete(RequestEvent.TYPE_FOLDER_STATUS);
+            if(callback != null) { callback.mailStoreRequestComplete(); }
                         FolderTreeItem[] folders = (FolderTreeItem[])result;
                         for(int i=0; i<folders.length; i++) {
@@ -210 +221 @@
                         break;
                 case IncomingMailConnectionHandler.REQUEST_FOLDER_MESSAGES_RANGE:
-                    fireMailStoreRequestComplete(RequestEvent.TYPE_FOLDER_MESSAGES_RANGE);
+            if(callback != null) { callback.mailStoreRequestComplete(); }
             results = (Object[])result;
             fireFolderMessagesAvailable((FolderTreeItem)results[0], (FolderMessage[])results[1], false);
                     break;
                 case IncomingMailConnectionHandler.REQUEST_FOLDER_MESSAGES_SET:
-                    fireMailStoreRequestComplete(RequestEvent.TYPE_FOLDER_MESSAGES_SET);
+            if(callback != null) { callback.mailStoreRequestComplete(); }
                         results = (Object[])result;
                         fireFolderMessagesAvailable((FolderTreeItem)results[0], (FolderMessage[])results[1], false);
                         break;
                 case IncomingMailConnectionHandler.REQUEST_FOLDER_MESSAGES_RECENT:
-                    fireMailStoreRequestComplete(RequestEvent.TYPE_FOLDER_MESSAGES_RECENT);
+            if(callback != null) { callback.mailStoreRequestComplete(); }
                         results = (Object[])result;
                         fireFolderMessagesAvailable((FolderTreeItem)results[0], (FolderMessage[])results[1], ((Boolean)results[2]).booleanValue());
                         break;
                 case IncomingMailConnectionHandler.REQUEST_MESSAGE:
-                    fireMailStoreRequestComplete(RequestEvent.TYPE_MESSAGE);
+            if(callback != null) { callback.mailStoreRequestComplete(); }
                         results = (Object[])result;
                         fireMessageAvailable((MessageToken)results[0], (MimeMessagePart)results[1], (MimeMessageContent[])results[2], null);
                         break;
                 case IncomingMailConnectionHandler.REQUEST_MESSAGE_PARTS:
-                    fireMailStoreRequestComplete(RequestEvent.TYPE_MESSAGE_PARTS);
+            if(callback != null) { callback.mailStoreRequestComplete(); }
                         results = (Object[])result;
                         fireMessageContentAvailable((MessageToken)results[0], (MimeMessageContent[])results[1]);
                         break;
                 case IncomingMailConnectionHandler.REQUEST_MESSAGE_DELETE:
-                    fireMailStoreRequestComplete(RequestEvent.TYPE_MESSAGE_DELETE);
+            if(callback != null) { callback.mailStoreRequestComplete(); }
                         results = (Object[])result;
                         fireMessageDeleted((MessageToken)results[0], (MessageFlags)results[1]);
                         break;
                 case IncomingMailConnectionHandler.REQUEST_MESSAGE_UNDELETE:
-                    fireMailStoreRequestComplete(RequestEvent.TYPE_MESSAGE_UNDELETE);
+            if(callback != null) { callback.mailStoreRequestComplete(); }
                         results = (Object[])result;
                         fireMessageUndeleted((MessageToken)results[0], (MessageFlags)results[1]);
                         break;
                 case IncomingMailConnectionHandler.REQUEST_MESSAGE_ANSWERED:
-                    fireMailStoreRequestComplete(RequestEvent.TYPE_MESSAGE_ANSWERED);
+            if(callback != null) { callback.mailStoreRequestComplete(); }
                         results = (Object[])result;
                         fireMessageFlagsChanged((MessageToken)results[0], (MessageFlags)results[1]);
                         break;
                 case IncomingMailConnectionHandler.REQUEST_MESSAGE_APPEND:
-                    fireMailStoreRequestComplete(RequestEvent.TYPE_MESSAGE_APPEND);
+            if(callback != null) { callback.mailStoreRequestComplete(); }
                         results = (Object[])result;
                         fireFolderMessagesAvailable((FolderTreeItem)results[0], (FolderMessage[])results[1], false);
                         break;
                 case IncomingMailConnectionHandler.REQUEST_MESSAGE_COPY:
-                    fireMailStoreRequestComplete(RequestEvent.TYPE_MESSAGE_COPY);
-                        break;
-                }
-        }
-        
-        private void connectionHandler_mailConnectionRequestFailed(int type, Object[] params, Throwable exception) {
-        switch(type) {
-        case IncomingMailConnectionHandler.REQUEST_FOLDER_TREE:
-            fireMailStoreRequestFailed(RequestEvent.TYPE_FOLDER_TREE, params, exception);
-            break;
-        case IncomingMailConnectionHandler.REQUEST_FOLDER_EXPUNGE:
-            fireMailStoreRequestFailed(RequestEvent.TYPE_FOLDER_EXPUNGE, params, exception);
-            break;
-        case IncomingMailConnectionHandler.REQUEST_FOLDER_STATUS:
-            fireMailStoreRequestFailed(RequestEvent.TYPE_FOLDER_STATUS, params, exception);
-            break;
-        case IncomingMailConnectionHandler.REQUEST_FOLDER_MESSAGES_RANGE:
-            fireMailStoreRequestFailed(RequestEvent.TYPE_FOLDER_MESSAGES_RANGE, params, exception);
-            break;
-        case IncomingMailConnectionHandler.REQUEST_FOLDER_MESSAGES_SET:
-            fireMailStoreRequestFailed(RequestEvent.TYPE_FOLDER_MESSAGES_SET, params, exception);
-            break;
-        case IncomingMailConnectionHandler.REQUEST_FOLDER_MESSAGES_RECENT:
-            fireMailStoreRequestFailed(RequestEvent.TYPE_FOLDER_MESSAGES_RECENT, params, exception);
-            break;
-        case IncomingMailConnectionHandler.REQUEST_MESSAGE:
-            fireMailStoreRequestFailed(RequestEvent.TYPE_MESSAGE, params, exception);
-            break;
-        case IncomingMailConnectionHandler.REQUEST_MESSAGE_PARTS:
-            fireMailStoreRequestFailed(RequestEvent.TYPE_MESSAGE_PARTS, params, exception);
-            break;
-        case IncomingMailConnectionHandler.REQUEST_MESSAGE_DELETE:
-            fireMailStoreRequestFailed(RequestEvent.TYPE_MESSAGE_DELETE, params, exception);
-            break;
-        case IncomingMailConnectionHandler.REQUEST_MESSAGE_UNDELETE:
-            fireMailStoreRequestFailed(RequestEvent.TYPE_MESSAGE_UNDELETE, params, exception);
-            break;
-        case IncomingMailConnectionHandler.REQUEST_MESSAGE_ANSWERED:
-            fireMailStoreRequestFailed(RequestEvent.TYPE_MESSAGE_ANSWERED, params, exception);
-            break;
-        case IncomingMailConnectionHandler.REQUEST_MESSAGE_APPEND:
-            fireMailStoreRequestFailed(RequestEvent.TYPE_MESSAGE_APPEND, params, exception);
-            break;
-        case IncomingMailConnectionHandler.REQUEST_MESSAGE_COPY:
-            fireMailStoreRequestFailed(RequestEvent.TYPE_MESSAGE_COPY, params, exception);
-            break;
-        }
+            if(callback != null) { callback.mailStoreRequestComplete(); }
+                        break;
+                }
+        }
+        
+        private void connectionHandler_mailConnectionRequestFailed(int type, Object tag, Throwable exception) {
+        MailStoreRequestCallback callback;
+        if(tag instanceof MailStoreRequestCallback) {
+            callback = (MailStoreRequestCallback)tag;
+        }
+        else {
+            callback = null;
+        }
+        
+        if(callback != null) { callback.mailStoreRequestFailed(exception); }
         }
 }

trunk/LogicMail/src/org/logicprobe/LogicMail/mail/OutgoingMailConnectionHandler.java

@@ -44 +44 @@
          * @param type Type identifier for the request.
          * @param params Parameters for the request.
+         * @param tag Tag reference to pass along with the request
      * @throws IOException on I/O errors
      * @throws MailException on protocol errors
          */
-        protected void handleRequest(int type, Object[] params) throws IOException, MailException {
+        protected void handleRequest(int type, Object[] params, Object tag) throws IOException, MailException {
                 if(connectionTimerTask != null) {
                         connectionTimerTask.cancel();
@@ -55 +56 @@
                 case REQUEST_SEND_MESSAGE:
                         handleRequestSendMessage(
-                                        (MessageEnvelope)params[0], (Message)params[1]);
+                                        (MessageEnvelope)params[0], (Message)params[1], tag);
                         break;
                 }
@@ -94 +95 @@
         }
         
-        private void handleRequestSendMessage(MessageEnvelope envelope, Message message) throws IOException, MailException {
+        private void handleRequestSendMessage(MessageEnvelope envelope, Message message, Object tag) throws IOException, MailException {
                 showStatus(resources.getString(LogicMailResource.MAILCONNECTION_REQUEST_SEND_MESSAGE));
                 String messageSource = outgoingClient.sendMessage(envelope, message);
@@ -100 +101 @@
                 MailConnectionHandlerListener listener = getListener();
                 if(messageSource != null && messageSource.length() > 0 && listener != null) {
-                        listener.mailConnectionRequestComplete(REQUEST_SEND_MESSAGE, new Object[] { envelope, message, messageSource });
+                        listener.mailConnectionRequestComplete(REQUEST_SEND_MESSAGE, new Object[] { envelope, message, messageSource }, tag);
                 }
         }

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

@@ -43 +43 @@
 import org.logicprobe.LogicMail.mail.MessageToken;
 import org.logicprobe.LogicMail.mail.NetworkMailStore;
-import org.logicprobe.LogicMail.mail.RequestEvent;
 import org.logicprobe.LogicMail.message.FolderMessage;
 import org.logicprobe.LogicMail.message.Message;
@@ -54 +53 @@
 import java.util.Hashtable;
 import java.util.Vector;
-
 
 /**
@@ -116 +114 @@
 
         this.mailStore.addMailStoreListener(new MailStoreListener() {
-            public void mailStoreRequestComplete(RequestEvent e) {
-            }
-            public void mailStoreRequestFailed(RequestEvent e) {
-            }
             public void folderTreeUpdated(FolderEvent e) {
                 mailStore_FolderTreeUpdated(e);

trunk/LogicMailTests/src/org/logicprobe/LogicMail/mail/NetworkMailStoreTest.java

@@ -63 +63 @@
         private FakeIncomingMailClient fakeIncomingMailClient;
 
-        private RequestEvent eventMailStoreRequestCompleted;
-    private RequestEvent eventMailStoreRequestFailed;
         private FolderEvent eventFolderTreeUpdated;
         private Vector eventFolderMessagesAvailable = new Vector();
@@ -86 +84 @@
 
         instance.addMailStoreListener(new MailStoreListener() {
-            public void mailStoreRequestComplete(RequestEvent e) {
-                eventMailStoreRequestCompleted = e;
-            }
-            public void mailStoreRequestFailed(RequestEvent e) {
-                eventMailStoreRequestFailed = e;
-            }
                         public void folderTreeUpdated(FolderEvent e) {
                                 eventFolderTreeUpdated = e;
@@ -182 +174 @@
     public void testRequestFolderTree() {
         fakeIncomingMailClient.folderTree = new FolderTreeItem("INBOX", "INBOX", ".");
-        instance.requestFolderTree();
-        instance.shutdown(true);
-        
-        assertNotNull(eventMailStoreRequestCompleted);
-        assertEquals(RequestEvent.TYPE_FOLDER_TREE, eventMailStoreRequestCompleted.getType());
-        assertNull(eventMailStoreRequestFailed);
+        TestCallback callback = new TestCallback();
+        instance.requestFolderTree(callback);
+        instance.shutdown(true);
+
+        assertTrue(callback.completed);
+        assertTrue(!callback.failed);
+        assertNull(callback.exception);
         
         assertNotNull(eventFolderTreeUpdated);
@@ -197 +190 @@
         FolderTreeItem folder = new FolderTreeItem("INBOX", "INBOX", ".");
         folder.setMsgCount(0);
-        instance.requestFolderStatus(new FolderTreeItem[] { folder });
-        instance.shutdown(true);
-        
-        assertNotNull(eventMailStoreRequestCompleted);
-        assertEquals(RequestEvent.TYPE_FOLDER_STATUS, eventMailStoreRequestCompleted.getType());
-        assertNull(eventMailStoreRequestFailed);
+        TestCallback callback = new TestCallback();
+        instance.requestFolderStatus(new FolderTreeItem[] { folder }, callback);
+        instance.shutdown(true);
+        
+        assertTrue(callback.completed);
+        assertTrue(!callback.failed);
+        assertNull(callback.exception);
         
         assertNotNull(eventFolderStatusChanged);
@@ -215 +209 @@
         };
         FolderTreeItem folder = new FolderTreeItem("INBOX", "INBOX", ".");
-        instance.requestFolderMessagesRange(folder, 42, 43);
-        instance.shutdown(true);
-        
-        assertNotNull(eventMailStoreRequestCompleted);
-        assertEquals(RequestEvent.TYPE_FOLDER_MESSAGES_RANGE, eventMailStoreRequestCompleted.getType());
-        assertNull(eventMailStoreRequestFailed);
+        TestCallback callback = new TestCallback();
+        instance.requestFolderMessagesRange(folder, 42, 43, callback);
+        instance.shutdown(true);
+        
+        assertTrue(callback.completed);
+        assertTrue(!callback.failed);
+        assertNull(callback.exception);
         
         // Cannot assume the number of events that will be fired,
@@ -263 +258 @@
         fakeIncomingMailClient.message.putContent(part, content);
         FakeMessageToken messageToken = new FakeMessageToken(1);
-        instance.requestMessage(messageToken);
-        instance.shutdown(true);
-        
-        assertNotNull(eventMailStoreRequestCompleted);
-        assertEquals(RequestEvent.TYPE_MESSAGE, eventMailStoreRequestCompleted.getType());
-        assertNull(eventMailStoreRequestFailed);
+        TestCallback callback = new TestCallback();
+        instance.requestMessage(messageToken, callback);
+        instance.shutdown(true);
+        
+        assertTrue(callback.completed);
+        assertTrue(!callback.failed);
+        assertNull(callback.exception);
         
         assertNotNull(eventMessageAvailable);
@@ -288 +284 @@
         MessageFlags messageFlags = new MessageFlags();
         messageFlags.setDeleted(false);
-        instance.requestMessageDelete(messageToken, messageFlags);
-        instance.shutdown(true);
-        
-        assertNotNull(eventMailStoreRequestCompleted);
-        assertEquals(RequestEvent.TYPE_MESSAGE_DELETE, eventMailStoreRequestCompleted.getType());
-        assertNull(eventMailStoreRequestFailed);
+        TestCallback callback = new TestCallback();
+        instance.requestMessageDelete(messageToken, messageFlags, callback);
+        instance.shutdown(true);
+        
+        assertTrue(callback.completed);
+        assertTrue(!callback.failed);
+        assertNull(callback.exception);
         
         assertNotNull(eventMessageDeleted);
@@ -310 +307 @@
         MessageFlags messageFlags = new MessageFlags();
         messageFlags.setDeleted(true);
-        instance.requestMessageUndelete(messageToken, messageFlags);
-        instance.shutdown(true);
-        
-        assertNotNull(eventMailStoreRequestCompleted);
-        assertEquals(RequestEvent.TYPE_MESSAGE_UNDELETE, eventMailStoreRequestCompleted.getType());
-        assertNull(eventMailStoreRequestFailed);
+        TestCallback callback = new TestCallback();
+        instance.requestMessageUndelete(messageToken, messageFlags, callback);
+        instance.shutdown(true);
+        
+        assertTrue(callback.completed);
+        assertTrue(!callback.failed);
+        assertNull(callback.exception);
         
         assertNotNull(eventMessageUndeleted);
@@ -455 +453 @@
         public boolean isLoadable() { return true; }
         }
+        
+        private class TestCallback implements MailStoreRequestCallback {
+            public boolean completed;
+            public boolean failed;
+            public Throwable exception;
+            
+        public void mailStoreRequestComplete() {
+            this.completed = true;
+        }
+
+        public void mailStoreRequestFailed(Throwable exception) {
+            this.failed = true;
+            this.exception = exception;
+        }
+        }
 }

trunk/LogicMailTests/src/org/logicprobe/LogicMail/model/AccountNodeTest.java

@@ -35 +35 @@
 import org.logicprobe.LogicMail.mail.AbstractMailStore;
 import org.logicprobe.LogicMail.mail.FolderTreeItem;
+import org.logicprobe.LogicMail.mail.MailStoreRequestCallback;
 import org.logicprobe.LogicMail.mail.MessageToken;
 import org.logicprobe.LogicMail.message.MessageFlags;
@@ -240 +241 @@
                 }
 
-                public void requestFolderTree() {
+                public void requestFolderTree(MailStoreRequestCallback callback) {
                         fireFolderTreeUpdated(rootFolder);
                 }
                 
-                public void requestFolderStatus(FolderTreeItem[] folders) {
+                public void requestFolderStatus(FolderTreeItem[] folders, MailStoreRequestCallback callback) {
                         fireFolderStatusChanged(statusUpdatedRootFolder);
                 }
                 
-                public void requestMessage(MessageToken messageToken) { }
-                public void requestMessageParts(MessageToken messageToken, MimeMessagePart[] messageParts) { }
-                public void requestMessageAnswered(MessageToken messageToken, MessageFlags messageFlags) { }
-                public void requestMessageDelete(MessageToken messageToken, MessageFlags messageFlags) { }
-                public void requestMessageUndelete(MessageToken messageToken, MessageFlags messageFlags) { }
+                public void requestMessage(MessageToken messageToken, MailStoreRequestCallback callback) { }
+                public void requestMessageParts(MessageToken messageToken, MimeMessagePart[] messageParts, MailStoreRequestCallback callback) { }
+                public void requestMessageAnswered(MessageToken messageToken, MessageFlags messageFlags, MailStoreRequestCallback callback) { }
+                public void requestMessageDelete(MessageToken messageToken, MessageFlags messageFlags, MailStoreRequestCallback callback) { }
+                public void requestMessageUndelete(MessageToken messageToken, MessageFlags messageFlags, MailStoreRequestCallback callback) { }
                 public void shutdown(boolean wait) { }
-                public void requestFolderMessagesRange(FolderTreeItem folder, int firstIndex, int lastIndex) { }
-                public void requestFolderMessagesRecent(FolderTreeItem folder) { }
-                public void requestMessageAppend(FolderTreeItem folder, String rawMessage, MessageFlags initialFlags) { }
-                public void requestMessageCopy(MessageToken messageToken, FolderTreeItem destinationFolder) { }
-                public void requestFolderMessagesRecent(FolderTreeItem folder, boolean flagsOnly) { }
-                public void requestFolderMessagesSet(FolderTreeItem folder, MessageToken[] messageTokens) { }
-        public void requestFolderExpunge(FolderTreeItem folder) { }
+                public void requestFolderMessagesRange(FolderTreeItem folder, int firstIndex, int lastIndex, MailStoreRequestCallback callback) { }
+                public void requestFolderMessagesRecent(FolderTreeItem folder, MailStoreRequestCallback callback) { }
+                public void requestMessageAppend(FolderTreeItem folder, String rawMessage, MessageFlags initialFlags, MailStoreRequestCallback callback) { }
+                public void requestMessageCopy(MessageToken messageToken, FolderTreeItem destinationFolder, MailStoreRequestCallback callback) { }
+                public void requestFolderMessagesRecent(FolderTreeItem folder, boolean flagsOnly, MailStoreRequestCallback callback) { }
+                public void requestFolderMessagesSet(FolderTreeItem folder, MessageToken[] messageTokens, MailStoreRequestCallback callback) { }
+        public void requestFolderExpunge(FolderTreeItem folder, MailStoreRequestCallback callback) { }
     }
 }