Merge pull request #185 from ManuelHu/feature/set

Settings erweitert
OctoAwesome · Nov 24, 2016 · 811b2d1 · 811b2d1
2 parents 17b2c1c + 3b8028c
commit 811b2d1
Show file tree

Hide file tree

Showing 8 changed files with 155 additions and 117 deletions.
diff --git a/OctoAwesome/OctoAwesome.Client/Controls/OptionsOptionControl.cs b/OctoAwesome/OctoAwesome.Client/Controls/OptionsOptionControl.cs
@@ -64,7 +64,7 @@ public OptionsOptionControl(ScreenComponent manager, OptionsScreen optionsScreen
 
             Checkbox disablePersistence = new Checkbox(manager)
             {
-                Checked = bool.Parse(settings.Get<string>("DisablePersistence")),
+                Checked = settings.Get("DisablePersistence", false),
                 HookBrush = new TextureBrush(manager.Game.Assets.LoadTexture(typeof(ScreenComponent), "iconCheck_brown"), TextureBrushMode.Stretch),
             };
             disablePersistence.CheckedChanged += (state) => SetPersistence(state);
@@ -110,7 +110,7 @@ public OptionsOptionControl(ScreenComponent manager, OptionsScreen optionsScreen
 
             Checkbox enableFullscreen = new Checkbox(manager)
             {
-                Checked = bool.Parse(settings.Get<string>("EnableFullscreen")),
+                Checked = settings.Get<bool>("EnableFullscreen"),
                 HookBrush = new TextureBrush(manager.Game.Assets.LoadTexture(typeof(ScreenComponent), "iconCheck_brown"), TextureBrushMode.Stretch),
             };
             enableFullscreen.CheckedChanged += (state) => SetFullscreen(state);

diff --git a/OctoAwesome/OctoAwesome.Client/OctoGame.cs b/OctoAwesome/OctoAwesome.Client/OctoGame.cs
@@ -53,15 +53,11 @@ public OctoGame()
 
             //TargetElapsedTime = new TimeSpan(0, 0, 0, 0, 15);
 
-            int width = 1080, height = 720;
-            if (Settings.KeyExists("Width"))
-                width = Settings.Get<int>("Width");
-            if (Settings.KeyExists("Height"))
-               height = Settings.Get<int>("Height");            
+            int width = Settings.Get("Width", 1080);
+            int height = Settings.Get("Height", 720);
             Window.ClientSize = new Size(width, height);
 
-            if (Settings.KeyExists("EnableFullscreen") && Settings.Get<bool>("EnableFullscreen"))
-                Window.Fullscreen = true;
+            Window.Fullscreen = Settings.Get("EnableFullscreen", false);
 
             if (Settings.KeyExists("Viewrange"))
             {

diff --git a/OctoAwesome/OctoAwesome.Client/Screens/LoadScreen.cs b/OctoAwesome/OctoAwesome.Client/Screens/LoadScreen.cs
@@ -135,8 +135,7 @@ public LoadScreen(ScreenComponent manager) : base(manager)
             if (levelList.Items.Count >= 1)
                 levelList.SelectedItem = levelList.Items[0];
 
-            if (settings.KeyExists("LastUniverse") && settings.Get<string>("LastUniverse") != null
-                && settings.Get<string>("LastUniverse") != "")
+            if (settings.Get<string>("LastUniverse") != null)
             {
                 var lastlevel =  levelList.Items.FirstOrDefault(u => u.Id == Guid.Parse(settings.Get<string>("LastUniverse")));
                 if (lastlevel != null)

diff --git a/OctoAwesome/OctoAwesome.Runtime/ResourceManager.cs b/OctoAwesome/OctoAwesome.Runtime/ResourceManager.cs
@@ -59,7 +59,7 @@ private ResourceManager()
 
             planets = new Dictionary<int, IPlanet>();
 
-            bool.TryParse(Settings.Get<string>("DisablePersistence"), out disablePersistence);
+            disablePersistence = Settings.Get("DisablePersistence", false);
         }
 
         /// <summary>

diff --git a/OctoAwesome/OctoAwesome.Tests/OctoAwesome.Tests.csproj b/OctoAwesome/OctoAwesome.Tests/OctoAwesome.Tests.csproj
@@ -5,7 +5,7 @@
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{7E2C82CC-CCC7-4837-9662-9850092BDC3B}</ProjectGuid>
+    <ProjectGuid>{0468B67C-E076-4B19-833C-382513606A5A}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>OctoAwesome.Tests</RootNamespace>

diff --git a/OctoAwesome/OctoAwesome.Tests/SettingsManagerTests.cs b/OctoAwesome/OctoAwesome.Tests/SettingsManagerTests.cs
@@ -1,74 +1,90 @@
-using System;
-using System.Linq;
-using System.Linq.Expressions;
-using Xunit;
-
-namespace OctoAwesome.Tests
-{
-
-    public class SettingsManagerTests
-    {
-        [Fact]
-        public void ReadWrite()
-        {
-            Settings settings = new Settings(true);
-
-            string[] testArray = new string[] {"foo", "bar"};
-            settings.Set("foo", testArray);
-
-            string[] newArray = settings.GetArray<string>("foo");
-
-            Assert.True(testArray.SequenceEqual(newArray));
-
-
-            int[] testArrayInt = new int[] { 3,5,333,456,3457};
-            settings.Set("fooInt", testArrayInt);
-
-            int[] newArrayInt = settings.GetArray<int>("fooInt");
-
-            Assert.True(testArray.SequenceEqual(newArray));
-
-
-            bool[] testArrayBool = new bool[] { true, false};
-            settings.Set("fooBool", testArrayBool);
-
-            bool[] newArrayBool = settings.GetArray<bool>("fooBool");
-
-            Assert.True(testArray.SequenceEqual(newArray));
-
-
-            String inputString = "randomStringWith§$%&/()=Charakters";
-            settings.Set("inputString", inputString);
-
-
-            Assert.Equal(inputString, settings.Get<string>("inputString"));
-
-
-            int inputInt = new Random().Next();
-            settings.Set("inputInt", inputInt);
-
-            Assert.Equal(inputInt, settings.Get<int>("inputInt"));
-
-
-            bool inputBool = true;
-            settings.Set("inputBool", inputBool);
-
-            Assert.Equal(inputBool, settings.Get<bool>("inputBool"));
-
-
-
-
-
-        }
-
-        [Fact]
-        public void NullTest()
-        {
-
-            Settings settings = new Settings(true);
-
-            int test = settings.Get<int>("foobarnotset");
-            Assert.Equal(0,test);
-        }
-    }
-}
+using System;
+using System.Linq;
+using System.Linq.Expressions;
+using Xunit;
+
+namespace OctoAwesome.Tests
+{
+    public class SettingsManagerTests
+    {
+        [Fact]
+        public void ReadWrite()
+        {
+            Settings settings = new Settings(true);
+
+            string[] testArray = new string[] { "foo", "bar" };
+            settings.Set("foo", testArray);
+
+            string[] newArray = settings.GetArray<string>("foo");
+
+            Assert.True(testArray.SequenceEqual(newArray));
+
+
+            int[] testArrayInt = new int[] { 3, 5, 333, 456, 3457 };
+            settings.Set("fooInt", testArrayInt);
+
+            int[] newArrayInt = settings.GetArray<int>("fooInt");
+
+            Assert.True(testArray.SequenceEqual(newArray));
+
+
+            bool[] testArrayBool = new bool[] { true, false };
+            settings.Set("fooBool", testArrayBool);
+
+            bool[] newArrayBool = settings.GetArray<bool>("fooBool");
+
+            Assert.True(testArray.SequenceEqual(newArray));
+
+
+            String inputString = "randomStringWith§$%&/()=Charakters";
+            settings.Set("inputString", inputString);
+
+
+            Assert.Equal(inputString, settings.Get<string>("inputString"));
+
+
+            int inputInt = new Random().Next();
+            settings.Set("inputInt", inputInt);
+
+            Assert.Equal(inputInt, settings.Get<int>("inputInt"));
+
+
+            bool inputBool = true;
+            settings.Set("inputBool", inputBool);
+
+            Assert.Equal(inputBool, settings.Get<bool>("inputBool"));
+        }
+
+        [Fact]
+        public void UnsetTest()
+        {
+            Settings settings = new Settings(true);
+
+            int testInt = settings.Get<int>("foobarnotset");
+            Assert.Equal(0, testInt);
+
+            string testString = settings.Get<string>("foobarnotset");
+            Assert.Equal(null, testString);
+
+            int testIntDefault = settings.Get("foobarnotset", 42);
+            Assert.Equal(42, testIntDefault);
+
+            string testStringDefault = settings.Get("foobarnotset", "ABC");
+            Assert.Equal("ABC", testStringDefault);
+        }
+
+        [Fact]
+        public void DeleteTest()
+        {
+            Settings settings = new Settings(true);
+
+            settings.Set("test", 1);
+            int test1 = settings.Get<int>("test");
+            Assert.Equal(1, test1);
+
+            settings.Delete("test");
+            int test2 = settings.Get<int>("test");
+            Assert.Equal(0, test2);
+        }
+    }
+}
diff --git a/OctoAwesome/OctoAwesome/ISettings.cs b/OctoAwesome/OctoAwesome/ISettings.cs
@@ -1,5 +1,8 @@
 namespace OctoAwesome
 {
+    /// <summary>
+    /// Interface zur Verwaltung der Anwendungseinstellungen
+    /// </summary>
     public interface ISettings
     {
         /// <summary>
@@ -9,6 +12,14 @@ public interface ISettings
         /// <returns>Der Wert der Einstellung.</returns>
         T Get<T>(string key);
 
+        /// <summary>
+        /// Gibt den Wert einer Einstellung zurück.
+        /// </summary>
+        /// <param name="key">Der Schlüssel der Einstellung.</param>
+        /// <param name="defaultValue">Default-Wert, der zurückgegeben wird, wenn der key nicht vorhanden ist.</param>
+        /// <returns>Der Wert der Einstellung oder der Default-Wert.</returns>
+        T Get<T>(string key, T defaultValue);
+
         /// <summary>
         /// Gibt das Array einer Einstellung zurück
         /// </summary>
@@ -65,5 +76,11 @@ public interface ISettings
         /// <param name="key">Der Schlüssel der Einstellung.</param>
         /// <param name="values">Der Wert der Einstellung.</param>
         void Set(string key, bool[] values);
+
+        /// <summary>
+        /// Löscht eine Eigenschaft aus den Einstellungen
+        /// </summary>
+        /// <param name="key">Der Schlüssel der Einstellung</param>
+        void Delete(string key);
     }
 }