Changeset 701 for trunk/LogicMail/src/org/logicprobe

Timestamp:

09/06/10 13:19:28 (17 months ago)

Author:

octorian

Message:

Refactoring to separate AccountNode into Local and Network subclasses

Location:

trunk/LogicMail/src/org/logicprobe/LogicMail

Files:

• model/AccountNode.java (modified) (18 diffs)
• model/LocalAccountNode.java (added)
• model/MailFileManager.java (modified) (1 diff)
• model/MailManager.java (modified) (7 diffs)
• model/MailRootNode.java (modified) (6 diffs)
• model/MailboxNode.java (modified) (2 diffs)
• model/MessageNode.java (modified) (2 diffs)
• model/MessageNodeReader.java (modified) (1 diff)
• model/MessageNodeWriter.java (modified) (2 diffs)
• model/NetworkAccountNode.java (added)
• model/OutboxMailboxNode.java (modified) (1 diff)
• ui/AccountConfigScreen.java (modified) (2 diffs)
• ui/AccountConfigWizard.java (modified) (2 diffs)
• ui/CompositionScreen.java (modified) (6 diffs)
• ui/MailHomeScreen.java (modified) (8 diffs)
• ui/MailboxScreen.java (modified) (3 diffs)
• ui/MessageActions.java (modified) (9 diffs)
• ui/MessageScreen.java (modified) (4 diffs)
• ui/NavigationController.java (modified) (6 diffs)
• ui/NotificationHandler.java (modified) (5 diffs)
• ui/ScreenFactory.java (modified) (2 diffs)
• ui/ScreenFactoryBB42.java (modified) (4 diffs)
• ui/StandardScreen.java (modified) (2 diffs)

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

@@ -31 +31 @@
 package org.logicprobe.LogicMail.model;
 
-import org.logicprobe.LogicMail.conf.AccountConfig;
-import org.logicprobe.LogicMail.mail.AbstractMailSender;
 import org.logicprobe.LogicMail.mail.AbstractMailStore;
 import org.logicprobe.LogicMail.mail.FolderEvent;
@@ -42 +40 @@
 import org.logicprobe.LogicMail.mail.MessageListener;
 import org.logicprobe.LogicMail.mail.MessageToken;
-import org.logicprobe.LogicMail.mail.NetworkMailStore;
 import org.logicprobe.LogicMail.message.FolderMessage;
-import org.logicprobe.LogicMail.message.Message;
-import org.logicprobe.LogicMail.message.MessageEnvelope;
-import org.logicprobe.LogicMail.util.DataStore;
-import org.logicprobe.LogicMail.util.DataStoreFactory;
 import org.logicprobe.LogicMail.util.EventListenerList;
 
@@ -62 +55 @@
  * be implemented.
  */
-public class AccountNode implements Node {
+public abstract class AccountNode implements Node {
     public final static int STATUS_LOCAL = 0;
     public final static int STATUS_OFFLINE = 1;
     public final static int STATUS_ONLINE = 2;
     private AbstractMailStore mailStore;
-    private boolean usePersistedState;
-    private AbstractMailSender mailSender;
     private MailRootNode parent;
     private MailboxNode rootMailbox;
@@ -74 +65 @@
     private Object rootMailboxLock = new Object();
     private EventListenerList listenerList = new EventListenerList();
-    private AccountConfig accountConfig;
-    private int status;
-    private boolean shutdown = false;
     
-    /** Map of folders to message to fetch for them. */
+    protected int status;
+   
+    /** Map of folders to messages to fetch for them. */
     private Hashtable folderMessagesToFetch;
     
@@ -85 +75 @@
      *
      * @param accountConfig Account configuration.
-     * @param loadState True to load the stored account state, false to construct fresh
-     */
-    AccountNode(AbstractMailStore mailStore) {
-        this(mailStore, true);
-    }
-    
-    /**
-     * Construct a new node for a network account.
-     *
-     * @param accountConfig Account configuration.
-     * @param usePersistedState True to use persisted account state, false otherwise
-     */
-    AccountNode(AbstractMailStore mailStore, boolean usePersistedState) {
+     */
+    protected AccountNode(AbstractMailStore mailStore) {
         this.rootMailbox = null;
         this.pathMailboxMap = new Hashtable();
@@ -103 +82 @@
 
         this.mailStore = mailStore;
-        this.usePersistedState = usePersistedState;
-
-        if (!mailStore.isLocal() && mailStore instanceof NetworkMailStore) {
-            this.accountConfig = ((NetworkMailStore) mailStore).getAccountConfig();
-            this.status = STATUS_OFFLINE;
-        } else {
-            this.status = STATUS_LOCAL;
-        }
-
+
+        addMailStoreListeners();
+    }
+
+    private void addMailStoreListeners() {
         this.mailStore.addMailStoreListener(new MailStoreListener() {
             public void folderTreeUpdated(FolderEvent e) {
@@ -149 +124 @@
             }
         });
-
-        if (!mailStore.hasFolders()) {
-            // Create the fake INBOX node for non-folder-capable mail stores
-            this.rootMailbox = new MailboxNode(new FolderTreeItem("", "", ""),
-                    false,
-                    -1);
-            this.rootMailbox.setParentAccount(this);
-
-            MailboxNode inboxNode = new MailboxNode(new FolderTreeItem(
-                    "INBOX", "INBOX", "", true), false, MailboxNode.TYPE_INBOX);
-            inboxNode.setParentAccount(this);
-            this.rootMailbox.addMailbox(inboxNode);
-            pathMailboxMap.put("INBOX", inboxNode);
-        }
-
-        // Load any saved tree data
-        if(usePersistedState) { load(); }
     }
 
@@ -172 +130 @@
     }
 
-    /**
-     * Gets the mail sender associated with this account.
-     *
-     * @return The mail sender.
-     */
-    AbstractMailSender getMailSender() {
-        return this.mailSender;
-    }
-
-    /**
-     * Sets the mail sender associated with this account.
-     * This is not set in the constructor since it can change
-     * whenever account configuration changes.
-     *
-     * @param mailSender The mail sender.
-     */
-    void setMailSender(AbstractMailSender mailSender) {
-        if ((this.mailSender != null) && (mailSender == null)) {
-            this.mailSender = null;
-        } else if ((this.mailSender != null) &&
-                (this.mailSender != mailSender)) {
-            this.mailSender = mailSender;
-        } else if ((this.mailSender == null) && (mailSender != null)) {
-            this.mailSender = mailSender;
-        }
-    }
-
-    /**
-     * Returns whether this account has a mail sender associated with it.
-     *
-     * @return True if mail can be sent, false otherwise.
-     */
-    public boolean hasMailSender() {
-        return (this.mailSender != null);
-    }
-
-    /**
-     * Returns whether this account has an identity associated with it.
-     * 
-     * @return True if an identity is configured, false otherwise.
-     */
-    public boolean hasIdentity() {
-        return this.accountConfig.getIdentityConfig() != null;
-    }
-    
     /**
      * Sets the root node which is the parent of this account.
@@ -250 +163 @@
 
     /**
-     * Gets the name of this account.
-     *
-     * @return The name.
-     */
-    public String toString() {
-        if (accountConfig != null) {
-            return this.accountConfig.toString();
-        } else {
-            return "Local Folders";
-        }
-    }
-
-    /**
-     * Gets the account configuration.
-     *
-     * @return The account configuration, or null for local accounts.
-     */
-    public AccountConfig getAccountConfig() {
-        return this.accountConfig;
-    }
-
-    /**
      * Gets the mail store associated with this account.
      *
@@ -289 +180 @@
             this.status = status;
 
-            if ((this.status == STATUS_OFFLINE) && !shutdown &&
-                    mailStore instanceof NetworkMailStore) {
-                ((NetworkMailStore) mailStore).restart();
-            }
-
             fireAccountStatusChanged(AccountNodeEvent.TYPE_CONNECTION);
         }
@@ -305 +191 @@
     public int getStatus() {
         return this.status;
-    }
-
-    /**
-     * Requests that this account be disconnected.
-     * <p>
-     * This method is only valid for the <tt>STATUS_ONLINE<tt>
-     * status, and will do nothing in any other state.
-     * </p>
-     *
-     * @param shutdown True if the application is closing, false if the mail store should be usable again.
-     */
-    public void requestDisconnect(boolean shutdown) {
-        if ((status == STATUS_ONLINE) && mailStore instanceof NetworkMailStore) {
-            ((NetworkMailStore) mailStore).shutdown(false);
-            this.shutdown = shutdown;
-        }
     }
 
@@ -380 +250 @@
 
         mailStore.requestFolderStatus(folders);
-    }
-
-    /**
-     * Sends a message from this account.
-     *
-     * @param envelope Envelope of the message to send
-     * @param message Message to send.
-     */
-    public void sendMessage(MessageEnvelope envelope, Message message) {
-        if (mailSender != null) {
-                // Construct an outgoing message node
-                FolderMessage outgoingFolderMessage = new FolderMessage(null, envelope, -1, -1);
-                outgoingFolderMessage.setSeen(false);
-                outgoingFolderMessage.setRecent(true);
-                OutgoingMessageNode outgoingMessage =
-                        new OutgoingMessageNode(
-                                        outgoingFolderMessage,
-                                        this, mailSender);
-                
-                outgoingMessage.setMessageStructure(message.getStructure());
-                outgoingMessage.putMessageContent(message.getAllContent());
-                MailManager.getInstance().getOutboxMailboxNode().addMessage(outgoingMessage);
-        }
-    }
-
-    /**
-     * Sends a reply message from this account.
-     *
-     * @param envelope Envelope of the message to send
-     * @param message Message to send.
-     * @param originalMessageNode Message node this was in reply to.
-     */
-    public void sendMessageReply(MessageEnvelope envelope, Message message,
-            MessageNode originalMessageNode) {
-        sendMessageReplyImpl(envelope, message, originalMessageNode,
-                OutgoingMessageNode.REPLY_ANSWERED);
-    }
-    
-    /**
-     * Sends a forwarded message from this account.
-     *
-     * @param envelope Envelope of the message to send
-     * @param message Message to send.
-     * @param originalMessageNode Message node this was in reply to.
-     */
-    public void sendMessageForwarded(MessageEnvelope envelope, Message message,
-            MessageNode originalMessageNode) {
-        sendMessageReplyImpl(envelope, message, originalMessageNode,
-                OutgoingMessageNode.REPLY_FORWARDED);
-    }
-    
-    private void sendMessageReplyImpl(MessageEnvelope envelope, Message message,
-        MessageNode originalMessageNode, int replyType) {
-        if (mailSender != null) {
-                // Construct an outgoing message node
-                FolderMessage outgoingFolderMessage = new FolderMessage(null, envelope, -1, -1);
-                outgoingFolderMessage.setSeen(false);
-                outgoingFolderMessage.setRecent(true);
-                OutgoingMessageNode outgoingMessage =
-                        new OutgoingMessageNode(
-                                        outgoingFolderMessage,
-                                        this, mailSender, originalMessageNode, replyType);
-                outgoingMessage.setMessageStructure(message.getStructure());
-                outgoingMessage.putMessageContent(message.getAllContent());
-                MailManager.getInstance().getOutboxMailboxNode().addMessage(outgoingMessage);
-        }
     }
 
@@ -477 +281 @@
 
                     if (folderPathMap.containsKey(path)) {
-                        mailboxNode.setFolderTreeItem((FolderTreeItem) folderPathMap.get(
-                                path));
+                        mailboxNode.setFolderTreeItem((FolderTreeItem) folderPathMap.get(path));
                         remainingMailboxMap.put(path, mailboxNode);
                     }
@@ -491 +294 @@
         }
 
-        if(usePersistedState) { save(); }
+        save();
         fireAccountStatusChanged(AccountNodeEvent.TYPE_MAILBOX_TREE);
     }
@@ -578 +381 @@
             mailboxFolder.setUnseenCount(currentFolder.getUnseenCount());
             mailboxNode.updateUnseenFolderTreeItem();
-            mailboxNode.fireMailboxStatusChanged(MailboxNodeEvent.TYPE_STATUS,
-                null);
+            mailboxNode.fireMailboxStatusChanged(MailboxNodeEvent.TYPE_STATUS, null);
         }
 
@@ -779 +581 @@
      * @return Mailbox type
      */
-    private int getMailboxType(FolderTreeItem folderTreeItem) {
-        int mailboxType = MailboxNode.TYPE_NORMAL;
+    protected int getMailboxType(FolderTreeItem folderTreeItem) {
+        int mailboxType;
         if (folderTreeItem.getPath().equalsIgnoreCase("INBOX")) {
                 mailboxType = MailboxNode.TYPE_INBOX;
         }
-        else if(status == STATUS_LOCAL) {
-                String path = folderTreeItem.getPath();
-            if (path.equalsIgnoreCase("Outbox")) {
-                mailboxType = MailboxNode.TYPE_OUTBOX;
-            }
-            else if (path.equalsIgnoreCase("Drafts")) {
-                mailboxType = MailboxNode.TYPE_DRAFTS;
-            }
-            else if (path.equalsIgnoreCase("Sent")) {
-                mailboxType = MailboxNode.TYPE_SENT;
-            }
-            else if (path.equalsIgnoreCase("Trash")) {
-                mailboxType = MailboxNode.TYPE_TRASH;
-            }
+        else {
+            mailboxType = MailboxNode.TYPE_NORMAL;
         }
         return mailboxType;
@@ -853 +643 @@
      * Saves the mailbox tree to persistent storage.
      */
-    private void save() {
-        DataStore connectionCache = DataStoreFactory.getConnectionCacheStore();
-
-        if(mailStore.isLocal()) {
-            connectionCache.putNamedObject("LocalMailStore", rootMailbox);
-        }
-        else {
-            connectionCache.putNamedObject(Long.toString(accountConfig.getUniqueId()), rootMailbox);
-        }
-        connectionCache.save();
-    }
+    abstract void save();
 
     /**
      * Loads the mailbox tree from persistent storage.
      */
-    private void load() {
-        DataStore connectionCache = DataStoreFactory.getConnectionCacheStore();
-        
-        Object loadedObject;
-        if(mailStore.isLocal()) {
-                loadedObject = connectionCache.getNamedObject("LocalMailStore");
-                
-        }
-        else {
-                loadedObject = connectionCache.getNamedObject(Long.toString(accountConfig.getUniqueId()));
-        }
-        
-        if (loadedObject instanceof MailboxNode) {
-            synchronized (rootMailboxLock) {
-                this.rootMailbox = (MailboxNode) loadedObject;
-                this.rootMailbox.setParentAccount(this);
-                prepareDeserializedMailboxNode(rootMailbox);
-            }
-        }
-    }
+    abstract void load();
 
     /**
@@ -898 +659 @@
      * </p>
      */
-    public void removeSavedData() {
-        if (!mailStore.isLocal()) {
-            DataStore connectionCache = DataStoreFactory.getConnectionCacheStore();
-            connectionCache.removeNamedObject(Long.toString(accountConfig.getUniqueId()));
-            
-            // This will only exist on certain account types, but this is the
-            // easiest place from which to clean it up.
-            connectionCache.removeNamedObject(Long.toString(accountConfig.getUniqueId()) + "_INBOX");
-            
-            connectionCache.save();
-        }
-    }
-
+    protected void removeSavedData() {
+        // Default empty implementation
+    }
+
+    /**
+     * Sets the top-level mailbox contained within this account.
+     * This method should only be called by subclasses when loading saved
+     * account data.
+     */
+    protected void setRootMailbox(MailboxNode mailboxNode) {
+        synchronized (rootMailboxLock) {
+            this.rootMailbox = mailboxNode;
+            prepareDeserializedMailboxNode(rootMailbox);
+        }
+    }
+    
     /**
      * Traverses the deserialized mailbox nodes, populates any necessary

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

@@ -333 +333 @@
             else {
                 accountUid = StringParser.toHexString(
-                                mailboxNode.getParentAccount().getAccountConfig().getUniqueId()).toLowerCase();
+                                ((NetworkAccountNode)mailboxNode.getParentAccount()).getAccountConfig().getUniqueId()).toLowerCase();
                 mailboxUid = StringParser.toHexString(
                                 mailboxNode.getUniqueId()).toLowerCase();

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

@@ -46 +46 @@
 import org.logicprobe.LogicMail.mail.MailFactory;
 import org.logicprobe.LogicMail.mail.NetworkMailSender;
+import org.logicprobe.LogicMail.mail.NetworkMailStore;
 import org.logicprobe.LogicMail.util.EventListenerList;
 
@@ -125 +126 @@
                 });
                 
-                // Refresh data from local account nodes
-                AccountNode[] accounts = mailRootNode.getAccounts();
-                for(int i=0; i<accounts.length; i++) {
-                        if(accounts[i].getStatus() == AccountNode.STATUS_LOCAL) {
-                                accounts[i].refreshMailboxes();
-                                accounts[i].refreshMailboxStatus();
-                        }
-                }
+                // Refresh data from local account node
+                LocalAccountNode localAccount = mailRootNode.getLocalAccount();
+                localAccount.refreshMailboxes();
+                localAccount.refreshMailboxStatus();
 
                 MailboxNode[] localMailboxes = mailRootNode.getLocalAccount().getRootMailbox().getMailboxes();
@@ -208 +205 @@
                 // if an account already exists, and only creating new nodes
                 // for new accounts.
-                AccountNode[] existingAccounts = mailRootNode.getAccounts();
+                NetworkAccountNode[] existingAccounts = mailRootNode.getNetworkAccounts();
                 Vector newAccounts = new Vector();
-                
-                // Prepopulate the new account list with the local accounts
-                for(int i=0; i < existingAccounts.length; i++) {
-                        if(existingAccounts[i].getStatus() == AccountNode.STATUS_LOCAL) {
-                                newAccounts.addElement(existingAccounts[i]);
-                        }
-                }
                 
                 int num = mailSettings.getNumAccounts();
@@ -231 +221 @@
                         }
                         if(!accountExists) {
-                                AccountNode newAccountNode = new AccountNode(MailFactory.createMailStore(accountConfig));
+                                AccountNode newAccountNode = new NetworkAccountNode((NetworkMailStore) MailFactory.createMailStore(accountConfig));
+                                newAccountNode.load();
                                 newAccounts.addElement(newAccountNode);
                         }
@@ -244 +235 @@
                 num = newAccounts.size();
                 for(int i=0; i<num; i++) {
-                        mailRootNode.addAccount((AccountNode)newAccounts.elementAt(i));
+                        mailRootNode.addAccount((NetworkAccountNode)newAccounts.elementAt(i));
                 }
                 
@@ -266 +257 @@
                 // Get the newly updated account list, and determine whether
                 // we need to update any mail senders.
-                existingAccounts = mailRootNode.getAccounts();
+                existingAccounts = mailRootNode.getNetworkAccounts();
                 for(int i=0; i<existingAccounts.length; i++) {
-                        if(existingAccounts[i].getStatus() != AccountNode.STATUS_LOCAL) {
-                                AbstractMailSender mailSender = existingAccounts[i].getMailSender();
-                                OutgoingConfig outgoingConfig = existingAccounts[i].getAccountConfig().getOutgoingConfig();
-                                if(outgoingConfig == null) {
-                                        if(mailSender != null) {
-                                                mailSender.shutdown(false);
-                                        }
-                                        existingAccounts[i].setMailSender(null);
+                    NetworkAccountNode networkAccount = existingAccounts[i];
+                        AbstractMailSender mailSender = networkAccount.getMailSender();
+                        OutgoingConfig outgoingConfig = networkAccount.getAccountConfig().getOutgoingConfig();
+                        if(outgoingConfig == null) {
+                                if(mailSender != null) {
+                                        mailSender.shutdown(false);
                                 }
-                                else if((mailSender instanceof NetworkMailSender
-                                       &&((NetworkMailSender)mailSender).getOutgoingConfig() != outgoingConfig)) {
-                                        mailSender.shutdown(false);
-                                        existingAccounts[i].setMailSender(MailFactory.createMailSender(existingAccounts[i].getAccountConfig().getOutgoingConfig()));
-                                }
-                                else if(mailSender == null) {
-                                        existingAccounts[i].setMailSender(MailFactory.createMailSender(existingAccounts[i].getAccountConfig().getOutgoingConfig()));
-                                }
+                                networkAccount.setMailSender(null);
+                        }
+                        else if((mailSender instanceof NetworkMailSender
+                               &&((NetworkMailSender)mailSender).getOutgoingConfig() != outgoingConfig)) {
+                                mailSender.shutdown(false);
+                                networkAccount.setMailSender(MailFactory.createMailSender(networkAccount.getAccountConfig().getOutgoingConfig()));
+                        }
+                        else if(mailSender == null) {
+                            networkAccount.setMailSender(MailFactory.createMailSender(networkAccount.getAccountConfig().getOutgoingConfig()));
                         }
                 }
@@ -302 +292 @@
         private void mailConnectionManager_MailConnectionStateChanged(MailConnectionStateEvent e) {
                 // Find the account node associated with this event
-                AccountNode[] accounts = mailRootNode.getAccounts();
-                AccountNode matchingAccount = null;
-                for(int i=0; i<accounts.length; i++) {
-                        if(e.getConnectionConfig().equals(accounts[i].getAccountConfig())) {
-                                matchingAccount = accounts[i];
-                                break;
-                        }
-                }
+                AccountNode matchingAccount = mailRootNode.findAccountForConfig(
+                        (AccountConfig)e.getConnectionConfig());
                 
                 // Update account state

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

@@ -33 +33 @@
 import java.util.Vector;
 
+import org.logicprobe.LogicMail.conf.AccountConfig;
+import org.logicprobe.LogicMail.mail.LocalMailStore;
 import org.logicprobe.LogicMail.mail.MailFactory;
 
@@ -41 +43 @@
  */
 public class MailRootNode implements Node {
-        private Vector accounts;
+    private LocalAccountNode localAccountNode;
+        private final Vector networkAccounts;
         private AccountNode[] accountsArray;
-        private AccountNode localAccountNode;
+        private NetworkAccountNode[] networkAccountsArray;
+        private final Object accountsLock = new Object();
         
         public MailRootNode() {
-                this.accounts = new Vector();
+                this.networkAccounts = new Vector();
 
-                // Add the local mail store
-                localAccountNode = new AccountNode(MailFactory.createLocalMailStore());
-                accounts.addElement(localAccountNode);
+                // Add the local mail store account
+                localAccountNode = new LocalAccountNode((LocalMailStore) MailFactory.createLocalMailStore());
+                localAccountNode.load();
         }
         
@@ -70 +74 @@
                 // temporary snapshot array is kept.  It is only recreated if the
                 // accounts vector is modified.
-                synchronized(accounts) {
+                synchronized(accountsLock) {
                         if(accountsArray == null) {
-                                int size = accounts.size();
-                                accountsArray = new AccountNode[size];
+                                int size = networkAccounts.size();
+                                accountsArray = new AccountNode[size + 1];
+                                accountsArray[0] = localAccountNode;
                                 for(int i=0; i<size; i++) {
-                                        accountsArray[i] = (AccountNode)accounts.elementAt(i);
+                                        accountsArray[i + 1] = (AccountNode)networkAccounts.elementAt(i);
                                 }
                         }
                 }
                 return accountsArray;
+        }
+        
+    /**
+     * Get the network accounts contained within the mail data model.
+     * This method returns an array that is a shallow copy of the
+     * live accounts list.  Since multiple calls to this method
+     * may return the same instance of that array, it should
+     * not be modified by callers.
+     *  
+     * @return Network account nodes.
+     */
+        public NetworkAccountNode[] getNetworkAccounts() {
+        // Since this method is used quite frequently, a reference to the
+        // temporary snapshot array is kept.  It is only recreated if the
+        // accounts vector is modified.
+        synchronized(accountsLock) {
+            if(networkAccountsArray == null) {
+                int size = networkAccounts.size();
+                networkAccountsArray = new NetworkAccountNode[size];
+                networkAccounts.copyInto(networkAccountsArray);
+            }
+        }
+        return networkAccountsArray;
+        }
+        
+        /**
+         * Find the account node matching the provided account configuration.
+         * This is a convenience method for a relatively common operation.
+         *
+         * @param accountConfig the account configuration
+         * @return the network account node, or null if none found
+         */
+        public NetworkAccountNode findAccountForConfig(AccountConfig accountConfig) {
+            NetworkAccountNode[] networkAccounts = getNetworkAccounts();
+            for(int i=0; i<networkAccounts.length; i++) {
+                if(accountConfig.equals(networkAccounts[i].getAccountConfig())) {
+                    return networkAccounts[i];
+                }
+            }
+            return null;
         }
         
@@ -87 +132 @@
          * @return Local account node.
          */
-        public AccountNode getLocalAccount() {
+        public LocalAccountNode getLocalAccount() {
                 return localAccountNode;
         }
         
         /**
-         * Adds an account to the mail data model.
+         * Adds a network account to the mail data model.
          * The account is appended to the end of the
          * live accounts list.
@@ -98 +143 @@
          * @param account The account to add.
          */
-        void addAccount(AccountNode account) {
-                synchronized(accounts) {
-                        if(!accounts.contains(account)) {
-                                accounts.addElement(account);
+        void addAccount(NetworkAccountNode account) {
+                synchronized(accountsLock) {
+                        if(!networkAccounts.contains(account)) {
+                            networkAccounts.addElement(account);
                                 accountsArray = null;
+                                networkAccountsArray = null;
                         }
                 }
@@ -108 +154 @@
         
         /**
-         * Removes an account from the mail data mode.
+         * Removes a network account from the mail data model.
          * 
          * @param account The account to remove
          */
-        void removeAccount(AccountNode account) {
-                synchronized(accounts) {
-                        if(accounts.contains(account)) {
-                                accounts.removeElement(account);
+        void removeAccount(NetworkAccountNode account) {
+                synchronized(accountsLock) {
+                        if(networkAccounts.contains(account)) {
+                            networkAccounts.removeElement(account);
                                 accountsArray = null;
+                                networkAccountsArray = null;
                         }
                 }

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

@@ -222 +222 @@
                 // will not be serialized, yet it still needs a way to be matched up
                 // with a local cache folder.
-                if(this.type == TYPE_INBOX && !this.parentAccount.hasFolders() && this.parentAccount.getAccountConfig() != null) {
-                    this.uniqueId = this.parentAccount.getAccountConfig().getUniqueId();
+                if(this.type == TYPE_INBOX && !this.parentAccount.hasFolders() && this.parentAccount instanceof NetworkAccountNode) {
+                    this.uniqueId = ((NetworkAccountNode)this.parentAccount).getAccountConfig().getUniqueId();
                 }
         }
@@ -1040 +1040 @@
         // Fetch messages stored in the cache
         synchronized(fetchLock) {
-            if(parentAccount.getAccountConfig() != null) {
+            if(parentAccount instanceof NetworkAccountNode) {
                 if(fetchThread == null || !fetchThread.isAlive()) {
                     synchronized(messages) {

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

@@ -278 +278 @@
                 if(parent != null
                                 && parent.getParentAccount() != null
-                                && parent.getParentAccount().getAccountConfig() != null) {
+                                && parent.getParentAccount() instanceof NetworkAccountNode) {
                         return true;
                 }
@@ -1131 +1131 @@
                                 int maxSize = Integer.MAX_VALUE;
                                 MimeMessagePart[] displayableParts = MimeMessagePartTransformer.getDisplayableParts(this.messageStructure);
-                                AccountConfig accountConfig = parent.getParentAccount().getAccountConfig();
-                                if(accountConfig instanceof ImapConfig) {
-                                        maxSize = ((ImapConfig)accountConfig).getMaxMessageSize();
+                                if(parent.getParentAccount() instanceof NetworkAccountNode) {
+                                AccountConfig accountConfig = ((NetworkAccountNode)parent.getParentAccount()).getAccountConfig();
+                                if(accountConfig instanceof ImapConfig) {
+                                        maxSize = ((ImapConfig)accountConfig).getMaxMessageSize();
+                                }
                                 }
                                 Vector partsToFetch = new Vector();

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

@@ -329 +329 @@
         // Resolve the accounts
         if(sendingAccountId != -1 || replyToAccountId != -1) {
-            AccountNode[] accounts = MailManager.getInstance().getMailRootNode().getAccounts();
+            NetworkAccountNode[] accounts = MailManager.getInstance().getMailRootNode().getNetworkAccounts();
             for(int i=0; i<accounts.length; i++) {
-                if(accounts[i].getAccountConfig() != null) {
-                    long accountId = accounts[i].getAccountConfig().getUniqueId();
-
-                    if(accountId == sendingAccountId) {
-                        messageNode.setSendingAccount(accounts[i]);
-                    }
-
-                    if(accountId == replyToAccountId) {
-                        replyToAccount = accounts[i];
-                    }
+                long accountId = accounts[i].getAccountConfig().getUniqueId();
+
+                if(accountId == sendingAccountId) {
+                    messageNode.setSendingAccount(accounts[i]);
+                }
+
+                if(accountId == replyToAccountId) {
+                    replyToAccount = accounts[i];
                 }
             }

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

@@ -189 +189 @@
                     table.put(HEADER_KEY_OUTGOING, Boolean.TRUE);
                     
-                    if(outgoingMessage.getSendingAccount() != null && outgoingMessage.getSendingAccount().getAccountConfig() != null) {
+                    if(outgoingMessage.getSendingAccount() != null && outgoingMessage.getSendingAccount() instanceof NetworkAccountNode) {
                         table.put(HEADER_KEY_OUTGOING_SENDING_ACCOUNT,
-                                new Long(outgoingMessage.getSendingAccount().getAccountConfig().getUniqueId()));
+                                new Long(((NetworkAccountNode)outgoingMessage.getSendingAccount()).getAccountConfig().getUniqueId()));
                     }
                     if(outgoingMessage.getMailSender() != null && outgoingMessage.getMailSender() instanceof NetworkMailSender) {
@@ -203 +203 @@
                     if(outgoingMessage.getReplyToAccount() != null) {
                     AccountNode replyToAccount = outgoingMessage.getReplyToAccount();
-                    if(replyToAccount.getAccountConfig() != null) {
-                        table.put(HEADER_KEY_OUTGOING_REPLYTO_ACCOUNT, new Long(replyToAccount.getAccountConfig().getUniqueId()));
+                    if(replyToAccount instanceof NetworkAccountNode) {
+                        table.put(HEADER_KEY_OUTGOING_REPLYTO_ACCOUNT, new Long(((NetworkAccountNode)replyToAccount).getAccountConfig().getUniqueId()));
                     }
                     }

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

@@ -339 +339 @@
             // Store to the Sent folder
             if(outgoingMessageNode.getSendingAccount() != null) {
-                AccountConfig sendingAccountConfig = outgoingMessageNode.getSendingAccount().getAccountConfig();
+                AccountConfig sendingAccountConfig = ((NetworkAccountNode)outgoingMessageNode.getSendingAccount()).getAccountConfig();
 
                 // Append to the Sent message folder, if available

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

@@ -60 +60 @@
 import org.logicprobe.LogicMail.model.MailManager;
 import org.logicprobe.LogicMail.model.MailboxNode;
+import org.logicprobe.LogicMail.model.NetworkAccountNode;
 
 /**
@@ -453 +454 @@
         for(int i=0; i<accountNodes.length; i++) {
             if(accountNodes[i].getStatus() == AccountNode.STATUS_LOCAL ||
-                    accountNodes[i].getAccountConfig() == accountConfig) {
+                    ((NetworkAccountNode)accountNodes[i]).getAccountConfig() == accountConfig) {
                 accountNodeVector.addElement(accountNodes[i]);
             }

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

@@ -9 +9 @@
 import org.logicprobe.LogicMail.conf.IdentityConfig;
 import org.logicprobe.LogicMail.conf.OutgoingConfig;
-import org.logicprobe.LogicMail.model.AccountNode;
 import org.logicprobe.LogicMail.model.MailManager;
+import org.logicprobe.LogicMail.model.NetworkAccountNode;
 
 import net.rim.device.api.ui.Field;
@@ -568 +568 @@
         
         // Find the newly created account, and trigger a folder refresh (if applicable)
-        AccountNode[] accounts = MailManager.getInstance().getMailRootNode().getAccounts();
-        for(int i=0; i<accounts.length; i++) {
-            if(accounts[i].getAccountConfig() == accountConfig) {
-                if(accounts[i].hasFolders()) {
-                    accounts[i].refreshMailboxes();
-                }
-                break;
-            }
+        NetworkAccountNode newAccount = MailManager.getInstance().getMailRootNode().findAccountForConfig(accountConfig);
+        if(newAccount != null && newAccount.hasFolders()) {
+            newAccount.refreshMailboxes();
         }
     }

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

@@ -78 +78 @@
 import org.logicprobe.LogicMail.message.UnsupportedContentException;
 import org.logicprobe.LogicMail.message.VideoPart;
-import org.logicprobe.LogicMail.model.AccountNode;
 import org.logicprobe.LogicMail.model.Address;
 import org.logicprobe.LogicMail.model.MailboxNode;
@@ -84 +83 @@
 import org.logicprobe.LogicMail.model.MessageNodeEvent;
 import org.logicprobe.LogicMail.model.MessageNodeListener;
+import org.logicprobe.LogicMail.model.NetworkAccountNode;
 import org.logicprobe.LogicMail.util.EventObjectRunnable;
 import org.logicprobe.LogicMail.util.UnicodeNormalizer;
@@ -100 +100 @@
     private String initialRecipient;
     private MessageNode sourceMessageNode;
-    private AccountNode accountNode;
+    private NetworkAccountNode accountNode;
     private AccountConfig accountConfig;
     private UnicodeNormalizer unicodeNormalizer;
@@ -170 +170 @@
      * @param accountNode Account node
      */
-    public CompositionScreen(AccountNode accountNode) {
+    public CompositionScreen(NetworkAccountNode accountNode) {
         this.accountNode = accountNode;
         this.accountConfig = accountNode.getAccountConfig();
@@ -185 +185 @@
      * @param recipient Message recipient address to pre-populate the "To" field with
      */
-    public CompositionScreen(AccountNode accountNode, String recipient) {
+    public CompositionScreen(NetworkAccountNode accountNode, String recipient) {
         this(accountNode);
         this.initialRecipient = recipient;
@@ -200 +200 @@
      */
     public CompositionScreen(
-                AccountNode accountNode,
+            NetworkAccountNode accountNode,
                 MessageNode messageNode,
                 int composeType) {

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

@@ -63 +63 @@
 import org.logicprobe.LogicMail.model.MailboxNodeListener;
 import org.logicprobe.LogicMail.model.MessageNode;
+import org.logicprobe.LogicMail.model.NetworkAccountNode;
 import org.logicprobe.LogicMail.model.Node;
 import org.logicprobe.LogicMail.model.OutboxMailboxNode;
@@ -383 +384 @@
         AccountNode accountNode = getAccountForTreeNode(treeNode);
 
-        if(accountNode != null) {
-            accountNode.requestDisconnect(false);
+        if(accountNode instanceof NetworkAccountNode) {
+            ((NetworkAccountNode)accountNode).requestDisconnect(false);
         }
     }
@@ -391 +392 @@
         AccountNode accountNode = getAccountForTreeNode(treeNode);
 
-        if(accountNode != null && accountNode.getAccountConfig() != null) {
-            navigationController.displayComposition(accountNode);
+        if(accountNode instanceof NetworkAccountNode) {
+            navigationController.displayComposition((NetworkAccountNode)accountNode);
         }
     }
@@ -468 +469 @@
             firstVisible = false;
             // Check to see if there are no configured accounts
-            if(mailRootNode.getAccounts().length <= 1) {
+            if(mailRootNode.getNetworkAccounts().length == 0) {
                 navigationController.displayAccountConfigurationWizard();
             }
@@ -481 +482 @@
         if(treeNode.node instanceof MailboxNode) {
             menu.add(selectFolderItem);
-            if(((MailboxNode)treeNode.node).getParentAccount().hasMailSender()) {
+            AccountNode parentAccount = ((MailboxNode)treeNode.node).getParentAccount();
+            if(parentAccount instanceof NetworkAccountNode && ((NetworkAccountNode)parentAccount).hasMailSender()) {
                 menu.add(compositionItem);
             }
@@ -497 +499 @@
                 menu.add(refreshFoldersItem);
             }
-            if(accountNode.hasMailSender()) {
+            if(accountNode instanceof NetworkAccountNode && ((NetworkAccountNode)accountNode).hasMailSender()) {
                 menu.add(compositionItem);
             }
@@ -592 +594 @@
             // Check whether we can enable composition
             MailHomeTreeNode treeNode = (MailHomeTreeNode)treeField.getCookie(curNode);
-            if(treeNode.node instanceof AccountNode) {
-                if(((AccountNode)treeNode.node).hasMailSender()) {
+            if(treeNode.node instanceof NetworkAccountNode) {
+                if(((NetworkAccountNode)treeNode.node).hasMailSender()) {
                     enableCompose = true;
                 }
@@ -601 +603 @@
             }
             else if(treeNode.node instanceof MailboxNode) {
-                if(((MailboxNode)treeNode.node).getParentAccount().hasMailSender()) {
+                AccountNode parentAccount = ((MailboxNode)treeNode.node).getParentAccount();
+                if(parentAccount instanceof NetworkAccountNode && ((NetworkAccountNode)parentAccount).hasMailSender()) {
                     enableCompose = true;
                 }

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

@@ -62 +62 @@
 import org.logicprobe.LogicMail.model.MessageNodeEvent;
 import org.logicprobe.LogicMail.model.MessageNodeListener;
+import org.logicprobe.LogicMail.model.NetworkAccountNode;
 import org.logicprobe.LogicMail.util.EventObjectRunnable;
 
@@ -194 +195 @@
         }
         
-        composeEnabled = mailboxNode.getParentAccount().hasMailSender();
+        composeEnabled = (mailboxNode.getParentAccount() instanceof NetworkAccountNode)
+            && ((NetworkAccountNode)mailboxNode.getParentAccount()).hasMailSender();
         ((StandardScreen)screen).setShortcutEnabled(SHORTCUT_COMPOSE, composeEnabled);
         
@@ -267 +269 @@
             compositionItem = new MenuItem(resources, LogicMailResource.MENUITEM_COMPOSE_EMAIL, 400100, 2000) {
                 public void run() {
-                        navigationController.displayComposition(mailboxNode.getParentAccount());
+                        navigationController.displayComposition((NetworkAccountNode)mailboxNode.getParentAccount());
                 }
             };

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

@@ -52 +52 @@
 import org.logicprobe.LogicMail.model.MessageNodeEvent;
 import org.logicprobe.LogicMail.model.MessageNodeListener;
+import org.logicprobe.LogicMail.model.NetworkAccountNode;
 import org.logicprobe.LogicMail.model.OutgoingMessageNode;
 
@@ -191 +192 @@
         
         if(!unloaded) {
-            if(accountNode.hasMailSender()) {
-                menu.add(replyItem);
-                if(accountNode.hasIdentity()) {
-                    menu.add(replyAllItem);
+            if(accountNode instanceof NetworkAccountNode) {
+                NetworkAccountNode networkAccount = (NetworkAccountNode)accountNode;
+                if(networkAccount.hasMailSender()) {
+                    menu.add(replyItem);
+                    if(networkAccount.hasIdentity()) {
+                        menu.add(replyAllItem);
+                    }
+                    menu.add(forwardItem);
                 }
-                menu.add(forwardItem);
             }
         }
@@ -264 +268 @@
         // configured as their drafts folder, and have a mail sender
         Vector matchingAccounts = new Vector();
-        AccountNode[] accounts = MailManager.getInstance().getMailRootNode().getAccounts();
+        NetworkAccountNode[] accounts = MailManager.getInstance().getMailRootNode().getNetworkAccounts();
 
         for(int i=0; i<accounts.length; i++) {
             if(accounts[i].hasMailSender()) {
                         AccountConfig accountConfig = accounts[i].getAccountConfig();
-                        if(accountConfig != null) {
-                                if(accountConfig.getDraftMailbox() == messageNode.getParent()) {
-                                        matchingAccounts.addElement(accounts[i]);
-                                }
-                        }
+                        if(accountConfig.getDraftMailbox() == messageNode.getParent()) {
+                                matchingAccounts.addElement(accounts[i]);
+                        }
             }
         }
@@ -282 +284 @@
         if(matchingAccounts.size() == 0) {
                 for(int i=0; i<accounts.length; i++) {
-                        if(accounts[i].hasMailSender() && accounts[i].getAccountConfig() != null) {
+                        if(accounts[i].hasMailSender()) {
                                 matchingAccounts.addElement(accounts[i]);
                         }
@@ -290 +292 @@
         // Select the account node that matches this mailbox, prompting the
         // user if necessary.
-        AccountNode account;
+        NetworkAccountNode account;
         int size = matchingAccounts.size();
         if(size > 1) {
-                AccountNode[] choices = new AccountNode[size];
+            NetworkAccountNode[] choices = new NetworkAccountNode[size];
                 matchingAccounts.copyInto(choices);
                 int result = Dialog.ask(
@@ -306 +308 @@
         }
         else if(size == 1) {
-                account = (AccountNode)matchingAccounts.elementAt(0);
+                account = (NetworkAccountNode)matchingAccounts.elementAt(0);
         }
         else {
@@ -371 +373 @@
     public void replyMessage(MessageNode messageNode) {
         if(messageNode.hasMessageContent()) {
-            navigationController.displayCompositionReply(messageNode.getParent().getParentAccount(), messageNode, false);
+            navigationController.displayCompositionReply((NetworkAccountNode)messageNode.getParent().getParentAccount(), messageNode, false);
         }
     }
@@ -382 +384 @@
     public void replyAllMessage(MessageNode messageNode) {
         if(messageNode.hasMessageContent()) {
-            navigationController.displayCompositionReply(messageNode.getParent().getParentAccount(), messageNode, true);
+            navigationController.displayCompositionReply((NetworkAccountNode)messageNode.getParent().getParentAccount(), messageNode, true);
         }
     }
@@ -393 +395 @@
     public void forwardMessage(MessageNode messageNode) {
         if(messageNode.hasMessageContent()) {
-            navigationController.displayCompositionForward(messageNode.getParent().getParentAccount(), messageNode);
+            navigationController.displayCompositionForward((NetworkAccountNode)messageNode.getParent().getParentAccount(), messageNode);
         }
     }

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

@@ -80 +80 @@
 import org.logicprobe.LogicMail.model.MessageNodeEvent;
 import org.logicprobe.LogicMail.model.MessageNodeListener;
+import org.logicprobe.LogicMail.model.NetworkAccountNode;
 import org.logicprobe.LogicMail.model.OutgoingMessageNode;
 import org.logicprobe.LogicMail.util.UnicodeNormalizer;
@@ -111 +112 @@
     {
         this.messageNode = messageNode;
-        this.accountConfig = messageNode.getParent().getParentAccount().getAccountConfig();
+        if(messageNode.getParent().getParentAccount() instanceof NetworkAccountNode) {
+            this.accountConfig = ((NetworkAccountNode)messageNode.getParent().getParentAccount()).getAccountConfig();
+        }
         
         if(MailSettings.getInstance().getGlobalConfig().getUnicodeNormalization()) {
@@ -304 +307 @@
             compositionItem = new MenuItem(resources, LogicMailResource.MENUITEM_COMPOSE_EMAIL, 400100, 2000) {
                 public void run() {
-                    navigationController.displayComposition(messageNode.getParent().getParentAccount());
+                    navigationController.displayComposition((NetworkAccountNode)messageNode.getParent().getParentAccount());
                 }
             };
@@ -630 +633 @@
                 if((context & BrowserFieldManager.ACTION_SEND_EMAIL) != 0) {
                         String address = ((BrowserFieldManager)field).getSelectedToken();
-                navigationController.displayComposition(messageNode.getParent().getParentAccount(), address);
+                navigationController.displayComposition((NetworkAccountNode)messageNode.getParent().getParentAccount(), address);
                 }
         }

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

@@ -43 +43 @@
 import org.logicprobe.LogicMail.mail.MailConnectionStateEvent;
 import org.logicprobe.LogicMail.mail.MailConnectionStatusEvent;
-import org.logicprobe.LogicMail.model.AccountNode;
 import org.logicprobe.LogicMail.model.MailManager;
 import org.logicprobe.LogicMail.model.MailRootNode;
 import org.logicprobe.LogicMail.model.MailboxNode;
 import org.logicprobe.LogicMail.model.MessageNode;
+import org.logicprobe.LogicMail.model.NetworkAccountNode;
 import org.logicprobe.LogicMail.util.EventObjectRunnable;
 
@@ -118 +118 @@
         }
         
-        public synchronized void displayComposition(AccountNode accountNode) {
+        public synchronized void displayComposition(NetworkAccountNode accountNode) {
                 StandardScreen screen = screenFactory.getCompositionScreen(this, accountNode);
         ScreenFactory.getInstance().attachScreenTransition(screen, ScreenFactory.TRANSITION_ZOOM);
@@ -124 +124 @@
         }
 
-        public synchronized void displayComposition(AccountNode accountNode, MessageNode messageNode) {
+        public synchronized void displayComposition(NetworkAccountNode accountNode, MessageNode messageNode) {
                 StandardScreen screen = screenFactory.getCompositionScreen(
                                 this,
@@ -133 +133 @@
         }
 
-        public void displayComposition(AccountNode accountNode, String address) {
+        public void displayComposition(NetworkAccountNode accountNode, String address) {
                 StandardScreen screen = screenFactory.getCompositionScreen(this, accountNode, address);
         ScreenFactory.getInstance().attachScreenTransition(screen, ScreenFactory.TRANSITION_ZOOM);
@@ -139 +139 @@
         }
         
-        public synchronized void displayCompositionReply(AccountNode accountNode, MessageNode messageNode, boolean replyAll) {
+        public synchronized void displayCompositionReply(NetworkAccountNode accountNode, MessageNode messageNode, boolean replyAll) {
                 StandardScreen screen = screenFactory.getCompositionReplyScreen(
                                 this,
@@ -149 +149 @@
         }
 
-        public synchronized void displayCompositionForward(AccountNode accountNode, MessageNode messageNode) {
+        public synchronized void displayCompositionForward(NetworkAccountNode accountNode, MessageNode messageNode) {
                 StandardScreen screen = screenFactory.getCompositionForwardScreen(
                                 this,

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

@@ -48 +48 @@
 import org.logicprobe.LogicMail.model.MailboxNodeListener;
 import org.logicprobe.LogicMail.model.MessageNode;
+import org.logicprobe.LogicMail.model.NetworkAccountNode;
 
 import net.rim.blackberry.api.homescreen.HomeScreen;
@@ -173 +174 @@
                 
                 // Subscribe to any new accounts
-                AccountNode[] accountNodes = MailManager.getInstance().getMailRootNode().getAccounts();
+                NetworkAccountNode[] accountNodes = MailManager.getInstance().getMailRootNode().getNetworkAccounts();
                 for(int i=0; i<accountNodes.length; i++) {
-                        if(accountNodes[i].getStatus() != AccountNode.STATUS_LOCAL) {
-                                updateAccountMap(accountNodes[i]);
-                                
-                                accountNodes[i].addAccountNodeListener(accountNodeListener);
-                                
-                                // Register the notification source, if necessary
-                                AccountConfig accountConfig = accountNodes[i].getAccountConfig();
-                                LogicMailEventSource eventSource = (LogicMailEventSource)eventSourceMap.get(accountConfig.getUniqueId());
-                                if(eventSource == null || !eventSource.getAccountName().equals(accountConfig.getAcctName())) {
-                                        eventSource =
-                                                new LogicMailEventSource(accountConfig.getAcctName(), accountConfig.getUniqueId());
-                        NotificationsManager.registerSource(
-                                        eventSource.getEventSourceId(),
-                                        eventSource,
-                                        NotificationsConstants.CASUAL);
-                        eventSourceMap.put(accountConfig.getUniqueId(), eventSource);
-                                }
+                        updateAccountMap(accountNodes[i]);
+                        
+                        accountNodes[i].addAccountNodeListener(accountNodeListener);
+                        
+                        // Register the notification source, if necessary
+                        AccountConfig accountConfig = ((NetworkAccountNode)accountNodes[i]).getAccountConfig();
+                        LogicMailEventSource eventSource = (LogicMailEventSource)eventSourceMap.get(accountConfig.getUniqueId());
+                        if(eventSource == null || !eventSource.getAccountName().equals(accountConfig.getAcctName())) {
+                                eventSource =
+                                        new LogicMailEventSource(accountConfig.getAcctName(), accountConfig.getUniqueId());
+                NotificationsManager.registerSource(
+                                eventSource.getEventSourceId(),
+                                eventSource,
+                                NotificationsConstants.CASUAL);
+                eventSourceMap.put(accountConfig.getUniqueId(), eventSource);
                         }
                 }
@@ -220 +219 @@
 
                         // Unregister the notification source
-                        long eventSourceKey = accountNode.getAccountConfig().getUniqueId();
+                        long eventSourceKey = ((NetworkAccountNode)accountNode).getAccountConfig().getUniqueId();
                         LogicMailEventSource eventSource = (LogicMailEventSource)eventSourceMap.get(eventSourceKey);
                         if(eventSource != null) {
@@ -264 +263 @@
          */
         private void notifyNewMessages(MailboxNode mailboxNode) {
-                long sourceId = AppInfo.GUID + mailboxNode.getParentAccount().getAccountConfig().getUniqueId();
+                long sourceId = AppInfo.GUID + ((NetworkAccountNode)mailboxNode.getParentAccount()).getAccountConfig().getUniqueId();
                 NotificationsManager.triggerImmediateEvent(sourceId, 0, this, null);
                 setAppIcon(true);
@@ -276 +275 @@
                 while(e.hasMoreElements()) {
                         AccountNode accountNode = (AccountNode)e.nextElement();
-                        long sourceId = AppInfo.GUID + accountNode.getAccountConfig().getUniqueId();
+                        long sourceId = AppInfo.GUID + ((NetworkAccountNode)accountNode).getAccountConfig().getUniqueId();
                         NotificationsManager.cancelImmediateEvent(sourceId, 0, this, null);
                 }

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

@@ -33 +33 @@
 import net.rim.device.api.ui.Screen;
 
-import org.logicprobe.LogicMail.model.AccountNode;
 import org.logicprobe.LogicMail.model.MailRootNode;
 import org.logicprobe.LogicMail.model.MailboxNode;
 import org.logicprobe.LogicMail.model.MessageNode;
+import org.logicprobe.LogicMail.model.NetworkAccountNode;
 import org.logicprobe.LogicMail.util.PlatformUtils;
 
@@ -81 +81 @@
     public abstract StandardScreen getMessageScreen(NavigationController navigationController, MessageNode messageNode);
 
-    public abstract StandardScreen getCompositionScreen(NavigationController navigationController, AccountNode accountNode);
+    public abstract StandardScreen getCompositionScreen(NavigationController navigationController, NetworkAccountNode accountNode);
 
-    public abstract StandardScreen getCompositionScreen(NavigationController navigationController, AccountNode accountNode, MessageNode messageNode);
+    public abstract StandardScreen getCompositionScreen(NavigationController navigationController, NetworkAccountNode accountNode, MessageNode messageNode);
 
-    public abstract StandardScreen getCompositionScreen(NavigationController navigationController, AccountNode accountNode, String address);
+    public abstract StandardScreen getCompositionScreen(NavigationController navigationController, NetworkAccountNode accountNode, String address);
 
-    public abstract StandardScreen getCompositionReplyScreen(NavigationController navigationController, AccountNode accountNode, MessageNode messageNode, boolean replyAll);
+    public abstract StandardScreen getCompositionReplyScreen(NavigationController navigationController, NetworkAccountNode accountNode, MessageNode messageNode, boolean replyAll);
 
-    public abstract StandardScreen getCompositionForwardScreen(NavigationController navigationController, AccountNode accountNode, MessageNode messageNode);
+    public abstract StandardScreen getCompositionForwardScreen(NavigationController navigationController, NetworkAccountNode accountNode, MessageNode messageNode);
     
     public abstract String showFilePicker();

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

@@ -34 +34 @@
 import net.rim.device.api.ui.component.Dialog;
 
-import org.logicprobe.LogicMail.model.AccountNode;
 import org.logicprobe.LogicMail.model.MailRootNode;
 import org.logicprobe.LogicMail.model.MailboxNode;
 import org.logicprobe.LogicMail.model.MessageNode;
+import org.logicprobe.LogicMail.model.NetworkAccountNode;
 
 public class ScreenFactoryBB42 extends ScreenFactory {
@@ -64 +64 @@
         }
 
-        public StandardScreen getCompositionScreen(NavigationController navigationController, AccountNode accountNode) {
+        public StandardScreen getCompositionScreen(NavigationController navigationController, NetworkAccountNode accountNode) {
                 return new StandardScreen(navigationController, new CompositionScreen(accountNode));
         }
         
-        public StandardScreen getCompositionScreen(NavigationController navigationController, AccountNode accountNode, MessageNode messageNode) {
+        public StandardScreen getCompositionScreen(NavigationController navigationController, NetworkAccountNode accountNode, MessageNode messageNode) {
                 return new StandardScreen(navigationController, new CompositionScreen(
                                 accountNode,
@@ -75 +75 @@
         }
         
-        public StandardScreen getCompositionScreen(NavigationController navigationController, AccountNode accountNode, String address) {
+        public StandardScreen getCompositionScreen(NavigationController navigationController, NetworkAccountNode accountNode, String address) {
                 return new StandardScreen(navigationController, new CompositionScreen(accountNode, address));
         }
         
-        public StandardScreen getCompositionReplyScreen(NavigationController navigationController, AccountNode accountNode, MessageNode messageNode, boolean replyAll) {
+        public StandardScreen getCompositionReplyScreen(NavigationController navigationController, NetworkAccountNode accountNode, MessageNode messageNode, boolean replyAll) {
                 return new StandardScreen(navigationController, new CompositionScreen(
                                 accountNode,
@@ -86 +86 @@
         }
         
-        public StandardScreen getCompositionForwardScreen(NavigationController navigationController, AccountNode accountNode, MessageNode messageNode) {
+        public StandardScreen getCompositionForwardScreen(NavigationController navigationController, NetworkAccountNode accountNode, MessageNode messageNode) {
                 return new StandardScreen(navigationController, new CompositionScreen(
                                 accountNode,

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

@@ -34 +34 @@
 import org.logicprobe.LogicMail.model.AccountNode;
 import org.logicprobe.LogicMail.model.MailManager;
+import org.logicprobe.LogicMail.model.NetworkAccountNode;
 
 import net.rim.device.api.i18n.ResourceBundle;
@@ -232 +233 @@
     public void tryShutdownApplication() {
         // Get all accounts
-        AccountNode[] accounts = MailManager.getInstance().getMailRootNode().getAccounts();
+        NetworkAccountNode[] accounts = MailManager.getInstance().getMailRootNode().getNetworkAccounts();
 
         // Find out of we still have an open connection