Changeset 1772 for branches/eraser6/CodeReview/Eraser/Settings.cs

Timestamp:

2/8/2010 8:25:51 AM (2 years ago)

Author:

lowjoel

Message:

Allow all IDisposable patterns to be reentrant. Addresses #275: Code Review

File:

• branches/eraser6/CodeReview/Eraser/Settings.cs (modified) (6 diffs)

branches/eraser6/CodeReview/Eraser/Settings.cs

@@ -49 +49 @@
             public RegistrySettings(Guid pluginId, RegistryKey key)
             {
-                this.pluginID = pluginId;
-                this.key = key;
+                this.PluginID = pluginId;
+                this.Key = key;
             }
 
@@ -68 +68 @@
             private void Dispose(bool disposing)
             {
+                if (Key == null)
+                    return;
+
                 if (disposing)
-                    key.Close();
+                    Key.Close();
+                Key = null;
             }
 
@@ -79 +83 @@
                 {
                     //Get the raw registry value
-                    object rawResult = key.GetValue(setting, null);
+                    object rawResult = Key.GetValue(setting, null);
 
                     //Check if it is a serialised object
@@ -92 +96 @@
                             catch (SerializationException)
                             {
-                                key.DeleteValue(setting);
+                                Key.DeleteValue(setting);
                                 MessageBox.Show(S._("Could not load the setting {0}\\{1} for " +
-                                        "plugin {2}. The setting has been lost.", key, setting,
-                                        pluginID.ToString()),
+                                        "plugin {2}. The setting has been lost.", Key, setting,
+                                        PluginID.ToString()),
                                     S._("Eraser"), MessageBoxButtons.OK, MessageBoxIcon.Error,
                                     MessageBoxDefaultButton.Button1,
@@ -113 +117 @@
                     if (value == null)
                     {
-                        key.DeleteValue(setting);
+                        Key.DeleteValue(setting);
                     }
                     else
                     {
                         if (value is bool)
-                            key.SetValue(setting, value, RegistryValueKind.DWord);
+                            Key.SetValue(setting, value, RegistryValueKind.DWord);
                         else if ((value is int) || (value is uint))
-                            key.SetValue(setting, value, RegistryValueKind.DWord);
+                            Key.SetValue(setting, value, RegistryValueKind.DWord);
                         else if ((value is long) || (value is ulong))
-                            key.SetValue(setting, value, RegistryValueKind.QWord);
+                            Key.SetValue(setting, value, RegistryValueKind.QWord);
                         else if (value is string)
-                            key.SetValue(setting, value, RegistryValueKind.String);
+                            Key.SetValue(setting, value, RegistryValueKind.String);
                         else
                             using (MemoryStream stream = new MemoryStream())
                             {
                                 new BinaryFormatter().Serialize(stream, value);
-                                key.SetValue(setting, stream.ToArray(), RegistryValueKind.Binary);
+                                Key.SetValue(setting, stream.ToArray(), RegistryValueKind.Binary);
                             }
                     }
@@ -138 +142 @@
             /// The GUID of the plugin whose settings this object is storing.
             /// </summary>
-            private Guid pluginID;
+            private Guid PluginID;
 
             /// <summary>
             /// The registry key where the data is stored.
             /// </summary>
-            private RegistryKey key;
+            private RegistryKey Key;
         }