InitializeAddInn now loads settings via a GeneralSettingsProvider instead

of directly from the PersistenceService.
Additionally, two small refactorings for improved readibility.

Author: MDoerner

RetailCoder.VBE/AutoSave/AutoSave.cs

@@ -36,20 +36,26 @@ public void ConfigServiceSettingsChanged(object sender, EventArgs e)
 
         private void _timer_Elapsed(object sender, ElapsedEventArgs e)
         {
-            var saveCommand = _vbe.CommandBars.FindControl(VbeSaveCommandId);
-            var activeProject = _vbe.ActiveVBProject;
-            var unsaved = _vbe
-                .VBProjects
-                .Where(project => !project.IsSaved && !string.IsNullOrEmpty(project.FileName));
+            SaveAllUnsavedProjects();
+        }
 
-            foreach (var project in unsaved)
+            private void SaveAllUnsavedProjects()
             {
-                _vbe.ActiveVBProject = project;
-                saveCommand.Execute();
+                var saveCommand = _vbe.CommandBars.FindControl(VbeSaveCommandId);
+                var activeProject = _vbe.ActiveVBProject;
+                var unsaved = _vbe
+                    .VBProjects
+                    .Where(project => !project.IsSaved && !string.IsNullOrEmpty(project.FileName));
+
+                foreach (var project in unsaved)
+                {
+                    _vbe.ActiveVBProject = project;
+                    saveCommand.Execute();
+                }
+
+                _vbe.ActiveVBProject = activeProject;
             }
 
-            _vbe.ActiveVBProject = activeProject;
-        }
 
         public void Dispose()
         {

RetailCoder.VBE/Extension.cs

@@ -143,14 +143,15 @@ private void InitializeAddIn()
                 return;
             }
 
-            var config = new XmlPersistanceService<GeneralSettings>
+            var configLoader = new XmlPersistanceService<GeneralSettings>
             {
                 FilePath =
                     Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
                         "Rubberduck", "rubberduck.config")
             };
-
-            var settings = config.Load(null);
+            var configProvider = new GeneralConfigProvider(configLoader);
+            
+            var settings = configProvider.Create();
             if (settings != null)
             {
                 try

Rubberduck.SettingsProvider/XmlPersistanceService.cs

@@ -37,14 +37,14 @@ public T Load(T toDeserialize)
 
             if (!File.Exists(FilePath))
             {
-                return (T)Convert.ChangeType(null, type);
+                return FailedLoadReturnValue();
             }
             var doc = GetConfigurationDoc(FilePath);
 
             var node = doc.Descendants().FirstOrDefault(e => e.Name.LocalName.Equals(type.Name));
             if (node == null)
             {
-                return (T)Convert.ChangeType(null, type);
+                return FailedLoadReturnValue();
             }
 
             using (var reader = node.CreateReader())
@@ -57,11 +57,17 @@ public T Load(T toDeserialize)
                 }
                 catch
                 {
-                    return (T)Convert.ChangeType(null, type);
+                    return FailedLoadReturnValue();
                 }
             }  
         }
 
+            private static T FailedLoadReturnValue()
+            {
+                return (T)Convert.ChangeType(null, typeof(T));
+            }
+
+
         public void Save(T toSerialize)
         {
             var doc = GetConfigurationDoc(FilePath);