Changeset 627

Timestamp:

02/02/10 18:13:26 (2 years ago)

Author:

octorian

Message:

Added significant change data to mail settings events.

Location:

trunk

Files:

• LogicMail/src/org/logicprobe/LogicMail/conf/AccountConfig.java (modified) (11 diffs)
• LogicMail/src/org/logicprobe/LogicMail/conf/ConnectionConfig.java (modified) (12 diffs)
• LogicMail/src/org/logicprobe/LogicMail/conf/GlobalConfig.java (modified) (19 diffs)
• LogicMail/src/org/logicprobe/LogicMail/conf/IdentityConfig.java (modified) (11 diffs)
• LogicMail/src/org/logicprobe/LogicMail/conf/ImapConfig.java (modified) (6 diffs)
• LogicMail/src/org/logicprobe/LogicMail/conf/MailSettings.java (modified) (16 diffs)
• LogicMail/src/org/logicprobe/LogicMail/conf/MailSettingsEvent.java (modified) (3 diffs)
• LogicMail/src/org/logicprobe/LogicMail/conf/MailSettingsListener.java (modified) (1 diff)
• LogicMail/src/org/logicprobe/LogicMail/conf/OutgoingConfig.java (modified) (3 diffs)
• LogicMail/src/org/logicprobe/LogicMail/conf/PopConfig.java (modified) (2 diffs)
• LogicMail/src/org/logicprobe/LogicMail/model/MailManager.java (modified) (1 diff)
• LogicMailTests/src/org/logicprobe/LogicMail/conf/GlobalConfigTest.java (modified) (4 diffs)

trunk/LogicMail/src/org/logicprobe/LogicMail/conf/AccountConfig.java

@@ -55 +55 @@
     private MailboxNode draftMailbox;
     private long draftMailboxId;
+    
+    /** Account identity configuration selection. */
+    public static final int CHANGE_TYPE_IDENTITY = 0x0100;
+    /** Account outgoing configuration selection. */
+    public static final int CHANGE_TYPE_OUTGOING = 0x0200;
+    /** Account special mailbox settings */
+    public static final int CHANGE_TYPE_MAILBOXES = 0x0400;
+    /** Account download limit settings. */
+    public static final int CHANGE_TYPE_LIMITS = 0x0800;
+    /** Account prompts for user actions. */
+    public static final int CHANGE_TYPE_PROMPTS = 0x1000;
+    /** Account prompts for user actions. */
+    public static final int CHANGE_TYPE_ADVANCED = 0x2000;
 
     /**
@@ -112 +125 @@
      */
     public void setServerUser(String serverUser) {
-        this.serverUser = serverUser;
+        if(!this.serverUser.equals(serverUser)) {
+            this.serverUser = serverUser;
+            changeType |= CHANGE_TYPE_CONNECTION;
+        }
     }
     
@@ -130 +146 @@
      */
     public void setServerPass(String serverPass) {
-        this.serverPass = serverPass;
+        if(!this.serverPass.equals(serverPass)) {
+            this.serverPass = serverPass;
+            changeType |= CHANGE_TYPE_CONNECTION;
+        }
     }
 
@@ -151 +170 @@
      */
     public void setIdentityConfig(IdentityConfig identityConfig) {
-        if(identityConfig == null) {
-            this.identityConfig = null;
-            this.identityConfigId = -1L;
-        }
-        else {
-            this.identityConfig = identityConfig;
-            this.identityConfigId = identityConfig.getUniqueId();
+        if(this.identityConfig != identityConfig) {
+            if(identityConfig == null) {
+                this.identityConfig = null;
+                this.identityConfigId = -1L;
+            }
+            else {
+                if(this.identityConfig != identityConfig) {
+                }
+                this.identityConfig = identityConfig;
+                this.identityConfigId = identityConfig.getUniqueId();
+            }
+            changeType |= CHANGE_TYPE_IDENTITY;
         }
     }
@@ -179 +203 @@
      */
     public void setOutgoingConfig(OutgoingConfig outgoingConfig) {
-        if(outgoingConfig == null) {
-            this.outgoingConfig = null;
-            this.outgoingConfigId = -1L;
-        }
-        else {
-            this.outgoingConfig = outgoingConfig;
-            this.outgoingConfigId = outgoingConfig.getUniqueId();
+        if(this.outgoingConfig != outgoingConfig) {
+            if(outgoingConfig == null) {
+                this.outgoingConfig = null;
+                this.outgoingConfigId = -1L;
+            }
+            else {
+                this.outgoingConfig = outgoingConfig;
+                this.outgoingConfigId = outgoingConfig.getUniqueId();
+            }
+            changeType |= CHANGE_TYPE_OUTGOING;
         }
     }
@@ -218 +245 @@
      */
     public void setSentMailbox(MailboxNode sentMailbox) {
-        if(sentMailbox == null) {
-            this.sentMailbox = null;
-            this.sentMailboxId = -1L;
-        }
-        else {
-            this.sentMailbox = sentMailbox;
-            this.sentMailboxId = sentMailbox.getUniqueId();
+        if(this.sentMailbox != sentMailbox) {
+            if(sentMailbox == null) {
+                this.sentMailbox = null;
+                this.sentMailboxId = -1L;
+            }
+            else {
+                this.sentMailbox = sentMailbox;
+                this.sentMailboxId = sentMailbox.getUniqueId();
+            }
+            changeType |= CHANGE_TYPE_MAILBOXES;
         }
     }
@@ -257 +287 @@
      */
     public void setDraftMailbox(MailboxNode draftMailbox) {
-        if(draftMailbox == null) {
-            this.draftMailbox = null;
-            this.draftMailboxId = -1L;
-        }
-        else {
-            this.draftMailbox = draftMailbox;
-            this.draftMailboxId = draftMailbox.getUniqueId();
+        if(this.draftMailbox != draftMailbox) {
+            if(draftMailbox == null) {
+                this.draftMailbox = null;
+                this.draftMailboxId = -1L;
+            }
+            else {
+                this.draftMailbox = draftMailbox;
+                this.draftMailboxId = draftMailbox.getUniqueId();
+            }
+            changeType |= CHANGE_TYPE_MAILBOXES;
         }
     }
@@ -312 +345 @@
 
         value = table.get("account_serverUser");
-        if(value != null && value instanceof String) {
+        if(value instanceof String) {
             serverUser = (String)value;
         }
         value = table.get("account_serverPass");
-        if(value != null && value instanceof String) {
+        if(value instanceof String) {
             serverPass = (String)value;
         }
         value = table.get("account_identityConfigId");
-        if(value != null && value instanceof Long) {
+        if(value instanceof Long) {
             identityConfigId = ((Long)value).longValue();
         }
@@ -328 +361 @@
         identityConfig = null;
         value = table.get("account_outgoingConfigId");
-        if(value != null && value instanceof Long) {
+        if(value instanceof Long) {
             outgoingConfigId = ((Long)value).longValue();
         }
@@ -337 +370 @@
 
         value = table.get("account_sentMailboxId");
-        if(value != null && value instanceof Long) {
+        if(value instanceof Long) {
                 sentMailboxId = ((Long)value).longValue();
         }
@@ -345 +378 @@
         
         value = table.get("account_draftMailboxId");
-        if(value != null && value instanceof Long) {
+        if(value instanceof Long) {
                 draftMailboxId = ((Long)value).longValue();
         }

trunk/LogicMail/src/org/logicprobe/LogicMail/conf/ConnectionConfig.java

@@ -47 +47 @@
 public abstract class ConnectionConfig implements Serializable {
     private long uniqueId;
+    protected int changeType;
     private String acctName;
     private String serverName;
@@ -54 +55 @@
     private boolean enableWiFi;
 
+    /** Configuration name change. */
+    public static final int CHANGE_TYPE_NAME = 0x01;
+    /** Server and network settings. */
+    public static final int CHANGE_TYPE_CONNECTION = 0x02;
+    
     /** Use the transport specified in the global configuration */
     public static final int TRANSPORT_GLOBAL = 0;
@@ -107 +113 @@
         transportType = TRANSPORT_GLOBAL;
         enableWiFi = false;
+        changeType = 0;
     }
 
@@ -124 +131 @@
      */
     public void setAcctName(String acctName) {
-        this.acctName = acctName;
+        if(!this.acctName.equals(acctName)) {
+            this.acctName = acctName;
+            changeType |= CHANGE_TYPE_NAME;
+        }
     }
     
@@ -142 +152 @@
      */
     public void setServerName(String serverName) {
-        this.serverName = serverName;
+        if(!this.serverName.equals(serverName)) {
+            this.serverName = serverName;
+            changeType |= CHANGE_TYPE_CONNECTION;
+        }
     }
 
@@ -160 +173 @@
      */
     public void setServerSecurity(int serverSecurity) {
-        this.serverSecurity = serverSecurity;
+        if(this.serverSecurity != serverSecurity) {
+            this.serverSecurity = serverSecurity;
+            changeType |= CHANGE_TYPE_CONNECTION;
+        }
     }
     
@@ -178 +194 @@
      */
     public void setServerPort(int serverPort) {
-        this.serverPort = serverPort;
+        if(this.serverPort != serverPort) {
+            this.serverPort = serverPort;
+            changeType |= CHANGE_TYPE_CONNECTION;
+        }
     }
 
@@ -196 +215 @@
      */
     public void setTransportType(int transportType) {
-        this.transportType = transportType;
+        if(this.transportType != transportType) {
+            this.transportType = transportType;
+            changeType |= CHANGE_TYPE_CONNECTION;
+        }
     }
     
@@ -214 +236 @@
      */
     public void setEnableWiFi(boolean enableWiFi) {
-        this.enableWiFi = enableWiFi;
+        if(this.enableWiFi != enableWiFi) {
+            this.enableWiFi = enableWiFi;
+            changeType |= CHANGE_TYPE_CONNECTION;
+        }
     }
     
@@ -225 +250 @@
         writeConfigItems(table);
         table.serialize(output);
+        changeType = 0;
     }
 
@@ -236 +262 @@
         table.deserialize(input);
         readConfigItems(table);
+        changeType = 0;
     }
     
@@ -296 +323 @@
         return uniqueId;
     }
+
+    /**
+     * Checks if this object has changed since it was last saved.
+     * 
+     * @return the change type, if applicable
+     */
+    public int getChangeType() {
+        return changeType;
+    }
 }

trunk/LogicMail/src/org/logicprobe/LogicMail/conf/GlobalConfig.java

@@ -48 +48 @@
 public class GlobalConfig implements Serializable {
     private long uniqueId;
+    private int changeType;
+    
+    /** Global network settings. */
+    public static final int CHANGE_TYPE_NETWORK = 0x01;
+    /** Global other settings. */
+    public static final int CHANGE_TYPE_OTHER = 0x02;
 
     /** Prefer plain text display for messages */
@@ -114 +120 @@
         this.localHostname = "";
         this.localDataLocation = "";
+        changeType = 0;
     }
 
@@ -122 +129 @@
      */
     public void setLanguageCode(String languageCode) {
-        this.languageCode = languageCode;
+        if(!this.languageCode.equals(languageCode)) {
+            this.languageCode = languageCode;
+            changeType |= CHANGE_TYPE_OTHER;
+        }
     }
 
@@ -140 +150 @@
      */
     public void setUnicodeNormalization(boolean unicodeNormalization) {
-        this.unicodeNormalization = unicodeNormalization;
+        if(this.unicodeNormalization != unicodeNormalization) {
+            this.unicodeNormalization = unicodeNormalization;
+            changeType |= CHANGE_TYPE_OTHER;
+        }
     }
 
@@ -158 +171 @@
      */
     public void setMessageDisplayFormat(int messageDisplayFormat) {
-        this.messageDisplayFormat = messageDisplayFormat;
+        if(this.messageDisplayFormat != messageDisplayFormat) {
+            this.messageDisplayFormat = messageDisplayFormat;
+            changeType |= CHANGE_TYPE_OTHER;
+        }
     }
 
@@ -176 +192 @@
      */
     public void setRetMsgCount(int retMsgCount) {
-        this.retMsgCount = retMsgCount;
+        if(this.retMsgCount != retMsgCount) {
+            this.retMsgCount = retMsgCount;
+            changeType |= CHANGE_TYPE_OTHER;
+        }
     }
 
@@ -194 +213 @@
      */
     public void setDispOrder(boolean dispOrder) {
-        this.dispOrder = dispOrder;
+        if(this.dispOrder != dispOrder) {
+            this.dispOrder = dispOrder;
+            changeType |= CHANGE_TYPE_OTHER;
+        }
     }
 
@@ -212 +234 @@
      */
     public void setLocalDataLocation(String localDataLocation) {
-        this.localDataLocation = validateLocalDataLocation(localDataLocation);
+        if(!this.localDataLocation.equals(localDataLocation)) {
+            this.localDataLocation = validateLocalDataLocation(localDataLocation);
+            changeType |= CHANGE_TYPE_OTHER;
+        }
     }
 
@@ -229 +254 @@
         return localDataLocation;
     }
-    
+
     /**
      * Gets the preferred network transport type.
@@ -238 +263 @@
         return transportType;
     }
-    
+
     /**
      * Sets the preferred network transport type.
@@ -245 +270 @@
      */
     public void setTransportType(int transportType) {
-        this.transportType = transportType;
-    }
-    
+        if(this.transportType != transportType) {
+            this.transportType = transportType;
+            changeType |= CHANGE_TYPE_NETWORK;
+        }
+    }
+
     /**
      * Gets whether to use WiFi if available.
@@ -256 +284 @@
         return enableWiFi;
     }
-    
+
     /**
      * Sets whether to use WiFi if available.
@@ -263 +291 @@
      */
     public void setEnableWiFi(boolean enableWiFi) {
-        this.enableWiFi = enableWiFi;
+        if(this.enableWiFi != enableWiFi) {
+            this.enableWiFi = enableWiFi;
+            changeType |= CHANGE_TYPE_NETWORK;
+        }
     }
 
@@ -281 +312 @@
      */
     public void setConnDebug(boolean connDebug) {
-        this.connDebug = connDebug;
+        if(this.connDebug != connDebug) {
+            this.connDebug = connDebug;
+            changeType |= CHANGE_TYPE_OTHER;
+        }
     }
 
@@ -299 +333 @@
      */
     public void setHideDeletedMsg(boolean hideDeletedMsg) {
-        this.hideDeletedMsg = hideDeletedMsg;
+        if(this.hideDeletedMsg != hideDeletedMsg) {
+            this.hideDeletedMsg = hideDeletedMsg;
+            changeType |= CHANGE_TYPE_OTHER;
+        }
     }
 
@@ -317 +354 @@
      */
     public void setLocalHostname(String localHostname) {
-        this.localHostname = localHostname;
+        if(!this.localDataLocation.equals(localHostname)) {
+            this.localHostname = localHostname;
+            changeType |= CHANGE_TYPE_OTHER;
+        }
     }
 
@@ -341 +381 @@
 
         table.serialize(output);
+        changeType = 0;
     }
 
@@ -405 +446 @@
             localHostname = (String) value;
         }
+        changeType = 0;
     }
 
@@ -412 +454 @@
     public long getUniqueId() {
         return uniqueId;
+    }
+
+    /**
+     * Checks if this object has changed since it was last saved.
+     * 
+     * @return the change type, if applicable
+     */
+    public int getChangeType() {
+        return changeType;
     }
 

trunk/LogicMail/src/org/logicprobe/LogicMail/conf/IdentityConfig.java

@@ -44 +44 @@
 public class IdentityConfig implements Serializable {
     private long uniqueId;
+    private int changeType;
     private String identityName;
     private String fullName;
@@ -49 +50 @@
     private String replyToAddress;
     private String msgSignature;
+    
+    /** Identity changed. */
+    public static final int IDENTITY_CHANGED = 0x01;
     
     /**
@@ -80 +84 @@
         replyToAddress = "";
         msgSignature = "";
+        changeType = 0;
     }
 
@@ -104 +109 @@
      */
     public void setIdentityName(String identityName) {
-        this.identityName = identityName;
+        if(!this.identityName.equals(identityName)) {
+            this.identityName = identityName;
+            changeType |= IDENTITY_CHANGED;
+        }
     }
 
@@ -122 +130 @@
      */
     public void setFullName(String fullName) {
-        this.fullName = fullName;
+        if(!this.fullName.equals(fullName)) {
+            this.fullName = fullName;
+            changeType |= IDENTITY_CHANGED;
+        }
     }
 
@@ -140 +151 @@
      */
     public void setEmailAddress(String emailAddress) {
-        this.emailAddress = emailAddress;
+        if(!this.emailAddress.equals(emailAddress)) {
+            this.emailAddress = emailAddress;
+            changeType |= IDENTITY_CHANGED;
+        }
     }
 
@@ -158 +172 @@
      */
     public void setReplyToAddress(String replyToAddress) {
-        this.replyToAddress = replyToAddress;
+        if(!this.replyToAddress.equals(replyToAddress)) {
+            this.replyToAddress = replyToAddress;
+            changeType |= IDENTITY_CHANGED;
+        }
     }
 
@@ -176 +193 @@
      */
     public void setMsgSignature(String msgSignature) {
-        this.msgSignature = msgSignature;
+        if(!this.msgSignature.equals(msgSignature)) {
+            this.msgSignature = msgSignature;
+            changeType |= IDENTITY_CHANGED;
+        }
     }
     
@@ -194 +214 @@
         
         table.serialize(output);
+        changeType = 0;
     }
 
@@ -208 +229 @@
 
         value = table.get("identity_identityName");
-        if(value != null && value instanceof String) {
+        if(value instanceof String) {
             identityName = (String)value;
         }
         value = table.get("identity_fullName");
-        if(value != null && value instanceof String) {
+        if(value instanceof String) {
             fullName = (String)value;
         }
         value = table.get("identity_emailAddress");
-        if(value != null && value instanceof String) {
+        if(value instanceof String) {
             emailAddress = (String)value;
         }
         value = table.get("identity_replyToAddress");
-        if(value != null && value instanceof String) {
+        if(value instanceof String) {
             replyToAddress = (String)value;
         }
         value = table.get("identity_msgSignature");
-        if(value != null && value instanceof String) {
+        if(value instanceof String) {
             msgSignature = (String)value;
         }
+        changeType = 0;
     }
 
@@ -235 +257 @@
         return uniqueId;
     }
+
+    /**
+     * Checks if this object has changed since it was last saved.
+     * 
+     * @return the change type, if applicable
+     */
+    public int getChangeType() {
+        return changeType;
+    }
 }

trunk/LogicMail/src/org/logicprobe/LogicMail/conf/ImapConfig.java

@@ -97 +97 @@
      */
     public void setFolderPrefix(String folderPrefix) {
-        this.folderPrefix = folderPrefix;
+        if(!this.folderPrefix.equals(folderPrefix)) {
+            this.folderPrefix = folderPrefix;
+            changeType |= CHANGE_TYPE_ADVANCED;
+        }
     }
 
@@ -115 +118 @@
      */
     public void setMaxMessageSize(int maxMessageSize) {
-        this.maxMessageSize = maxMessageSize;
+        if(this.maxMessageSize != maxMessageSize) {
+            this.maxMessageSize = maxMessageSize;
+            changeType |= CHANGE_TYPE_LIMITS;
+        }
     }
 
@@ -133 +139 @@
      */
     public void setMaxFolderDepth(int maxFolderDepth) {
-        this.maxFolderDepth = maxFolderDepth;
+        if(this.maxFolderDepth != maxFolderDepth) {
+            this.maxFolderDepth = maxFolderDepth;
+            changeType |= CHANGE_TYPE_LIMITS;
+        }
     }
 
@@ -151 +160 @@
      */
     public void setOnlySubscribedFolders(boolean onlySubscribedFolders) {
-        this.onlySubscribedFolders = onlySubscribedFolders;
+        if(this.onlySubscribedFolders != onlySubscribedFolders) {
+            this.onlySubscribedFolders = onlySubscribedFolders;
+            changeType |= CHANGE_TYPE_ADVANCED;
+        }
     }
 
@@ -178 +190 @@
 
         value = table.get("account_imap_folderPrefix");
-        if(value != null && value instanceof String) {
+        if(value instanceof String) {
             folderPrefix = (String)value;
             if(folderPrefix.length() == 0) {
@@ -185 +197 @@
         }
         value = table.get("account_imap_maxMessageSize");
-        if ((value != null) && value instanceof Integer) {
+        if (value instanceof Integer) {
             maxMessageSize = ((Integer) value).intValue();
         }
 
         value = table.get("account_imap_maxFolderDepth");
-        if ((value != null) && value instanceof Integer) {
+        if (value instanceof Integer) {
             maxFolderDepth = ((Integer) value).intValue();
         }
         value = table.get("account_imap_onlySubscribedFolders");
-        if(value != null && value instanceof Boolean) {
+        if(value instanceof Boolean) {
             onlySubscribedFolders = ((Boolean)value).booleanValue();
         }

trunk/LogicMail/src/org/logicprobe/LogicMail/conf/MailSettings.java

@@ -51 +51 @@
     private Vector outgoingConfigs;
     private DataStore configStore;
+    private boolean isIdentityListDirty;
+    private boolean isAccountListDirty;
+    private boolean isOutgoingListDirty;
     
     private static String GLOBAL_CONFIG = "global_config";
@@ -116 +119 @@
      */
     public void addIdentityConfig(IdentityConfig identityConfig) {
+        isIdentityListDirty = true;
         identityConfigs.addElement(identityConfig);
     }
@@ -126 +130 @@
      */
     public void insertIdentityConfigAt(IdentityConfig identityConfig, int index) {
+        isIdentityListDirty = true;
         identityConfigs.insertElementAt(identityConfig, index);
     }
@@ -143 +148 @@
      */
     public void removeIdentityConfig(int index) {
+        isIdentityListDirty = true;
         identityConfigs.removeElementAt(index);
     }
@@ -164 +170 @@
      */
     public void addAccountConfig(AccountConfig accountConfig) {
+        isAccountListDirty = true;
         accountConfigs.addElement(accountConfig);
     }
@@ -174 +181 @@
      */
     public void insertAccountConfigAt(AccountConfig accountConfig, int index) {
+        isAccountListDirty = true;
         accountConfigs.insertElementAt(accountConfig, index);
     }
@@ -191 +199 @@
      */
     public void removeAccountConfig(int index) {
+        isAccountListDirty = true;
         accountConfigs.removeElementAt(index);
     }
@@ -235 +244 @@
      */
     public void addOutgoingConfig(OutgoingConfig outgoingConfig) {
+        isOutgoingListDirty = true;
         outgoingConfigs.addElement(outgoingConfig);
     }
@@ -245 +255 @@
      */
     public void insertOutgoingConfigAt(OutgoingConfig outgoingConfig, int index) {
+        isOutgoingListDirty = true;
         outgoingConfigs.insertElementAt(outgoingConfig, index);
     }
@@ -262 +273 @@
      */
     public void removeOutgoingConfig(int index) {
+        isOutgoingListDirty = true;
         outgoingConfigs.removeElementAt(index);
     }
@@ -277 +289 @@
      */
     public void saveSettings() {
+        MailSettingsEvent e = new MailSettingsEvent(this);
+        e.setGlobalChange(globalConfig.getChangeType());
+        int listChangeType = 0;
+        if(isIdentityListDirty) { listChangeType |= MailSettingsEvent.LIST_CHANGED_IDENTITY; }
+        if(isAccountListDirty) { listChangeType |= MailSettingsEvent.LIST_CHANGED_ACCOUNT; }
+        if(isOutgoingListDirty) { listChangeType |= MailSettingsEvent.LIST_CHANGED_OUTGOING; }
+        e.setListChange(listChangeType);
+        
         SerializableVector identityConfigIds = new SerializableVector();
         SerializableVector accountConfigIds = new SerializableVector();
         SerializableVector outgoingConfigIds = new SerializableVector();
-
+        
         configStore.putNamedObject(GLOBAL_CONFIG, globalConfig);
         configStore.putNamedObject(IDENTITY_CONFIGS, identityConfigIds);
@@ -292 +312 @@
             identityConfigIds.addElement(new Long(config.getUniqueId()));
             configStore.putObject(config);
+            e.setConfigChange(config, config.getChangeType());
         }
 
@@ -299 +320 @@
             accountConfigIds.addElement(new Long(config.getUniqueId()));
             configStore.putObject(config);
+            e.setConfigChange(config, config.getChangeType());
         }
 
@@ -306 +328 @@
             outgoingConfigIds.addElement(new Long(config.getUniqueId()));
             configStore.putObject(config);
+            e.setConfigChange(config, config.getChangeType());
         }
 
         configStore.save();
-        fireMailSettingsSaved();
+        fireMailSettingsSaved(e);
+        
+        isIdentityListDirty = false;
+        isAccountListDirty = false;
+        isOutgoingListDirty = false;
     }
         
@@ -379 +406 @@
             }
         }
+        isIdentityListDirty = false;
+        isAccountListDirty = false;
+        isOutgoingListDirty = false;
     }
     
@@ -414 +444 @@
      * the mail settings have been saved. 
      */
-    protected void fireMailSettingsSaved() {
+    protected void fireMailSettingsSaved(MailSettingsEvent e) {
         Object[] listeners = listenerList.getListeners(MailSettingsListener.class);
-        MailSettingsEvent e = null;
         for(int i=0; i<listeners.length; i++) {
-            if(e == null) {
-                e = new MailSettingsEvent(this);
-            }
             ((MailSettingsListener)listeners[i]).mailSettingsSaved(e);
         }

trunk/LogicMail/src/org/logicprobe/LogicMail/conf/MailSettingsEvent.java

@@ -1 +1 @@
 /*-
- * Copyright (c) 2008, Derek Konigsberg
+ * Copyright (c) 2010, Derek Konigsberg
  * All rights reserved.
  *
@@ -32 +32 @@
 package org.logicprobe.LogicMail.conf;
 
+import net.rim.device.api.util.LongIntHashtable;
+
 import org.logicprobe.LogicMail.util.EventObject;
+import org.logicprobe.LogicMail.util.Serializable;
 
 /**
@@ -38 +41 @@
  */
 public class MailSettingsEvent extends EventObject {
-        public MailSettingsEvent(Object source) {
-                super(source);
-        }
+    private int globalChangeType;
+    private int listChangeType;
+    private LongIntHashtable configChangeMap;
+
+    /** Identity list changed. */
+    public static final int LIST_CHANGED_IDENTITY = 0x01;
+    /** Account list changed. */
+    public static final int LIST_CHANGED_ACCOUNT = 0x02;
+    /** Outgoing server list changed. */
+    public static final int LIST_CHANGED_OUTGOING = 0x04;
+    
+    public MailSettingsEvent(Object source) {
+        super(source);
+    }
+    
+    void setGlobalChange(int changeType) {
+        this.globalChangeType = changeType;
+    }
+    
+    public int getGlobalChange() {
+        return globalChangeType;
+    }
+    
+    void setListChange(int changeType) {
+        this.listChangeType = changeType;
+    }
+    
+    public int getListChange() {
+        return listChangeType;
+    }
+    
+    void setConfigChange(Serializable configObject, int changeType) {
+        if(configChangeMap == null) {
+            configChangeMap = new LongIntHashtable();
+        }
+        configChangeMap.put(configObject.getUniqueId(), changeType);
+    }
+    
+    public int getConfigChange(Serializable configObject) {
+        if(configChangeMap == null) {
+            return 0;
+        }
+        else {
+            return configChangeMap.get(configObject.getUniqueId());
+        }
+    }
 }

trunk/LogicMail/src/org/logicprobe/LogicMail/conf/MailSettingsListener.java

@@ -43 +43 @@
          * @param e Save event data.
          */
-        public void mailSettingsSaved(MailSettingsEvent e);
+        void mailSettingsSaved(MailSettingsEvent e);
 }

trunk/LogicMail/src/org/logicprobe/LogicMail/conf/OutgoingConfig.java

@@ -95 +95 @@
      */
     public void setUseAuth(int useAuth) {
-        this.useAuth = useAuth;
+        if(this.useAuth != useAuth) {
+            this.useAuth = useAuth;
+            changeType |= CHANGE_TYPE_CONNECTION;
+        }
     }
 
@@ -113 +116 @@
      */
     public void setServerUser(String serverUser) {
-        this.serverUser = serverUser;
+        if(!this.serverUser.equals(serverUser)) {
+            this.serverUser = serverUser;
+            changeType |= CHANGE_TYPE_CONNECTION;
+        }
     }
 
@@ -131 +137 @@
      */
     public void setServerPass(String serverPass) {
-        this.serverPass = serverPass;
+        if(!this.serverPass.equals(serverPass)) {
+            this.serverPass = serverPass;
+            changeType |= CHANGE_TYPE_CONNECTION;
+        }
     }
     

trunk/LogicMail/src/org/logicprobe/LogicMail/conf/PopConfig.java

@@ -90 +90 @@
      */
     public void setMaxMessageLines(int maxMessageLines) {
-        this.maxMessageLines = maxMessageLines;
+        if(this.maxMessageLines != maxMessageLines) {
+            this.maxMessageLines = maxMessageLines;
+            changeType |= CHANGE_TYPE_LIMITS;
+        }
     }
 
@@ -108 +111 @@
         Object value;
         value = table.get("account_pop_maxMessageLines");
-        if ((value != null) && value instanceof Integer) {
+        if (value instanceof Integer) {
                 maxMessageLines = ((Integer) value).intValue();
         }

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

@@ -68 +68 @@
 
                 // Make sure the initial configuration is loaded
-                mailSettings_MailSettingsSaved(new MailSettingsEvent(this));
+                mailSettings_MailSettingsSaved(null);
                 
                 // Register a listener for configuration changes

trunk/LogicMailTests/src/org/logicprobe/LogicMail/conf/GlobalConfigTest.java

@@ -62 +62 @@
     }
     
+    class StubOutputStream extends OutputStream {
+        public StubOutputStream() {
+            super();
+        }
+        public void write(int b) throws IOException {
+        }
+        public int[] getBuffer() {
+            return null;
+        }
+    }
+    
     class TestInputStream extends InputStream {
         private int[] buffer;
@@ -74 +85 @@
         }
     }
+    
     
     public GlobalConfigTest() {
@@ -128 +140 @@
         }
     }
+
+    public void testChangeType() {
+        DataOutputStream stubOutput = new DataOutputStream(new StubOutputStream());
+        
+        GlobalConfig instance = new GlobalConfig();
+        assertEquals(0, instance.getChangeType());
+        
+        instance.setLanguageCode(instance.getLanguageCode());
+        assertEquals(0, instance.getChangeType());
+        instance.setLanguageCode("en_US");
+        assertEquals(GlobalConfig.CHANGE_TYPE_OTHER, instance.getChangeType());
+        try { instance.serialize(stubOutput); } catch (IOException e) { }
+        assertEquals(0, instance.getChangeType());
+        
+        instance.setEnableWiFi(instance.getEnableWiFi());
+        assertEquals(0, instance.getChangeType());
+        instance.setEnableWiFi(!instance.getEnableWiFi());
+        assertEquals(GlobalConfig.CHANGE_TYPE_NETWORK, instance.getChangeType());
+        try { instance.serialize(stubOutput); } catch (IOException e) { }
+        assertEquals(0, instance.getChangeType());
+    }
     
     public Test suite() {
@@ -136 +169 @@
         suite.addTest(new GlobalConfigTest("serialization", new TestMethod()
         { public void run(TestCase tc) {((GlobalConfigTest)tc).testSerialization(); } }));
+        suite.addTest(new GlobalConfigTest("changeType", new TestMethod()
+        { public void run(TestCase tc) {((GlobalConfigTest)tc).testChangeType(); } }));
 
         return suite;