Fix the way Settings are now managed in GitExtensions

Author: pmiossec

GitTfsPlugin.cs

@@ -7,33 +7,9 @@
 
 namespace GitTfs.GitExtensions.Plugin
 {
-    public class GitTfsPlugin : IGitPlugin
+    public class GitTfsPlugin : GitPluginBase
     {
-        public IEnumerable<ISetting> GetSettings()
-        {
-            return new List<ISetting>();
-        }
-
-        public void Register(IGitUICommands gitUiCommands)
-        {
-            var existingKeys = Settings.GetAvailableSettings();
-
-            var settingsToAdd = from field in typeof(SettingKeys).GetFields(BindingFlags.Public | BindingFlags.Static)
-                                let key = (string)field.GetValue(null)
-                                where !existingKeys.Contains(key)
-                                select key;
-
-            foreach (var settingToAdd in settingsToAdd)
-            {
-                Settings.AddSetting(settingToAdd, string.Empty);
-            }
-        }
-
-        public void Unregister(IGitUICommands gitUiCommands)
-        {
-        }
-
-        public bool Execute(GitUIBaseEventArgs gitUiCommands)
+        public override bool Execute(GitUIBaseEventArgs gitUiCommands)
         {
             if (string.IsNullOrEmpty(gitUiCommands.GitModule.WorkingDir))
             {
@@ -62,15 +38,11 @@ private static IEnumerable<string> GetTfsRemotes(IGitUICommands commands)
                        : Enumerable.Empty<string>();
         }
 
-        public string Description
+        public override string Description
         {
-            get { return "git-tfs"; }
+            get { return "Git-Tfs"; }
         }
 
-        ISettingsSource IGitPlugin.Settings { get; set; }
-
-        public IGitPluginSettingsContainer Settings { get; set; }
-
         public SettingsContainer PluginSettings
         {
             get { return new SettingsContainer(Settings); }

SettingsContainer.cs

@@ -6,17 +6,17 @@ namespace GitTfs.GitExtensions.Plugin
 {
     public class SettingsContainer
     {
-        private readonly IGitPluginSettingsContainer _container;
+        private readonly ISettingsSource _container;
 
-        public SettingsContainer(IGitPluginSettingsContainer container)
+        public SettingsContainer(ISettingsSource container)
         {
             _container = container;
         }
 
         public string TfsRemote
         {
-            get { return _container.GetSetting(SettingKeys.TfsRemote); }
-            set { _container.SetSetting(SettingKeys.TfsRemote, value); }
+            get { return _container.GetValue(SettingKeys.TfsRemote, null , x => x); }
+            set { _container.SetValue(SettingKeys.TfsRemote, value, x => x); }
         }
 
         public PullSetting? PullSetting
@@ -40,17 +40,15 @@ public ShelveSettingsContainer ShelveSettings
             where T : struct
         {
             var type = typeof (T);
-            var value = _container.GetSetting(key);
-
-            return (from name in Enum.GetNames(type)
-                    where name == value
-                    select (T?) Enum.Parse(type, name)).FirstOrDefault();
+            return _container.GetValue(key, default(T), x => (from name in Enum.GetNames(type)
+                                                                   where name == x
+                                                                   select (T?) Enum.Parse(type, name)).FirstOrDefault());
         }
 
         private void SetEnumSettingValue<T>(string key, T? value)
             where T : struct
         {
-            _container.SetSetting(key, value.HasValue ? value.ToString() : string.Empty);
+            _container.SetValue(key, value, x => x.HasValue ? x.ToString() : string.Empty);
         }
     }
 }

ShelveSettingsContainer.cs

@@ -4,17 +4,17 @@ namespace GitTfs.GitExtensions.Plugin
 {
     public class ShelveSettingsContainer
     {
-        private readonly IGitPluginSettingsContainer _container;
+        private readonly ISettingsSource _container;
 
-        public ShelveSettingsContainer(IGitPluginSettingsContainer container)
+        public ShelveSettingsContainer(ISettingsSource container)
         {
             _container = container;
         }
 
         public string Name
         {
-            get { return _container.GetSetting(SettingKeys.ShelvesetName); }
-            set { _container.SetSetting(SettingKeys.ShelvesetName, value); }
+            get { return _container.GetValue(SettingKeys.ShelvesetName, string.Empty, x => x); }
+            set { _container.SetValue(SettingKeys.ShelvesetName, value, x => x); }
         }
 
         public bool Overwrite
@@ -26,7 +26,7 @@ public bool Overwrite
             }
             set
             {
-                _container.SetSetting(SettingKeys.OverwriteShelveset, value.ToString());
+                _container.SetValue(SettingKeys.OverwriteShelveset, value, x => x.ToString());
             }
         }
     }