Improve setttings.Get*List(), fixes #28

Author: jackbrookes

Assets/UXF/Scripts/Etc/Settings.cs

@@ -116,65 +116,121 @@ public void SetParent(ISettingsContainer parent)
 
         /// <summary>
         /// Get a boolean list setting value. If it is not found, the request will cascade upwards in each parent setting until one is found.
+        /// If the setting references a setting stored in the settings json file, a copy of the list will be returned. If it is a setting created with settings.SetValue(...), the original reference will be returned. 
         /// </summary>
         /// <param name="key">The key (name) of the setting.</param>
         public List<bool> GetBoolList(string key)
         {
-            return GetObjectList(key).Select(v => Convert.ToBoolean(v)).ToList();
+            try
+            {
+                return GetObjectList(key).Select(v => Convert.ToBoolean(v)).ToList();
+            }
+            catch (InvalidCastException)
+            {
+                return (List<bool>) Get(key);
+            }
         }
 
         /// <summary>
         /// Get a integer list setting value. If it is not found, the request will cascade upwards in each parent setting until one is found.
+        /// If the setting references a setting stored in the settings json file, a copy of the list will be returned. If it is a setting created with settings.SetValue(...), the original reference will be returned. 
         /// </summary>
         /// <param name="key">The key (name) of the setting.</param>
         public List<int> GetIntList(string key)
         {
-            return GetObjectList(key).Select(v => Convert.ToInt32(v)).ToList();
+            try
+            {
+                return GetObjectList(key).Select(v => Convert.ToInt32(v)).ToList();
+            }
+            catch (InvalidCastException)
+            {
+                return (List<int>) Get(key);
+            }
         }
 
         /// <summary>
         /// Get a float list setting value. If it is not found, the request will cascade upwards in each parent setting until one is found.
+        /// If the setting references a setting stored in the settings json file, a copy of the list will be returned. If it is a setting created with settings.SetValue(...), the original reference will be returned. 
         /// </summary>
         /// <param name="key">The key (name) of the setting.</param>
         public List<float> GetFloatList(string key)
         {
-            return GetObjectList(key).Select(v => Convert.ToSingle(v)).ToList();
+            try
+            {
+                return GetObjectList(key).Select(v => Convert.ToSingle(v)).ToList();
+            }
+            catch (InvalidCastException)
+            {
+                return (List<float>) Get(key);
+            }
         }
 
         /// <summary>
         /// Get a long list setting value. If it is not found, the request will cascade upwards in each parent setting until one is found.
+        /// If the setting references a setting stored in the settings json file, a copy of the list will be returned. If it is a setting created with settings.SetValue(...), the original reference will be returned. 
         /// </summary>
         /// <param name="key">The key (name) of the setting.</param>
         public List<long> GetLongList(string key)
         {
-            return GetObjectList(key).Select(v => Convert.ToInt64(v)).ToList();
+            try
+            {
+                return GetObjectList(key).Select(v => Convert.ToInt64(v)).ToList();
+            }
+            catch (InvalidCastException)
+            {
+                return (List<long>) Get(key);
+            }
         }
 
         /// <summary>
         /// Get a double list setting value. If it is not found, the request will cascade upwards in each parent setting until one is found.
+        /// If the setting references a setting stored in the settings json file, a copy of the list will be returned. If it is a setting created with settings.SetValue(...), the original reference will be returned. 
         /// </summary>
         /// <param name="key">The key (name) of the setting.</param>
         public List<double> GetDoubleList(string key)
         {
-            return GetObjectList(key).Select(v => Convert.ToDouble(v)).ToList();
+            try
+            {
+                return GetObjectList(key).Select(v => Convert.ToDouble(v)).ToList();
+            }
+            catch (InvalidCastException)
+            {
+                return (List<double>) Get(key);
+            }
         }
 
         /// <summary>
         /// Get a string list setting value. If it is not found, the request will cascade upwards in each parent setting until one is found.
+        /// If the setting references a setting stored in the settings json file, a copy of the list will be returned. If it is a setting created with settings.SetValue(...), the original reference will be returned. 
         /// </summary>
         /// <param name="key">The key (name) of the setting.</param>
         public List<string> GetStringList(string key)
         {
-            return GetObjectList(key).Select(v => Convert.ToString(v)).ToList();
+            try
+            {
+                return GetObjectList(key).Select(v => Convert.ToString(v)).ToList();
+            }
+            catch (InvalidCastException)
+            {
+                return (List<string>) Get(key);
+            }
         }
 
         /// <summary>
-        /// Get a dictionary list setting value. If it is not found, the request will cascade upwards in each parent setting until one is found.
+        /// Get a Dictionary<string, object> list setting value. If it is not found, the request will cascade upwards in each parent setting until one is found.
+        /// If the setting references a setting stored in the settings json file, a copy of the list will be returned. If it is a setting created with settings.SetValue(...), the original reference will be returned. 
         /// </summary>
         /// <param name="key">The key (name) of the setting.</param>
         public List<Dictionary<string, object>> GetDictList(string key)
         {
-            return GetObjectList(key).Select(v => (Dictionary<string, object>) v).ToList();
+            try
+            {
+                return GetObjectList(key).Select(v => (Dictionary<string, object>) v).ToList();
+            }
+            catch (InvalidCastException)
+            {
+                return (List<Dictionary<string, object>>) Get(key);
+            }
         }
 
         /// <summary>

Assets/UXF/Scripts/Tests/Editor/TestSettings.cs

@@ -54,7 +54,7 @@ public void DictToSettings()
 			var deserializedList = new List<double>() { 1.44, 2, 3 };
 			var deserializedIntList = new List<double>() { 1, 2, 3 };
 			var deserializedDoubleList = new List<double>() { 1.44, 2.44, 3.44 };
-			var deserializedFloatList = new List<double>() { 1.44f, 2.44f, 3.44f };
+			var deserializedFloatList = new List<float>() { 1.44f, 2.44f, 3.44f };
 			var deserializedObject = new Dictionary<string, object>()
 			{
 				{ "key1", "value1" },
@@ -94,6 +94,31 @@ public void GetSetSettings()
 			Assert.Throws<KeyNotFoundException>(() => settings.GetObject("key3"));
 		}
 
+		[Test]
+		public void CastListSettings()
+		{
+			var createdObjectList = new List<object>() { null, 1, "hello" };
+			var createdIntList = new List<int>() { 1, 2, 3 };
+			var createdDoubleList = new List<double>() { 1.44, 2.44, 3.44 };
+			var createdFloatList = new List<float>() { 1.44f, 2.44f, 3.44f };
+			var createdBoolList = new List<bool>() { false, true, false };
+
+			Settings settings = new Settings(new Dictionary<string, object>()
+			{
+				{ "object_list", createdObjectList }, 
+				{ "int_list", createdIntList }, 
+				{ "double_list", createdDoubleList }, 
+				{ "float_list", createdFloatList },
+				{ "bool_list", createdBoolList }
+			});
+
+			Assert.AreEqual(settings.GetObjectList("object_list"), createdObjectList);
+			Assert.AreEqual(settings.GetIntList("int_list"), createdIntList);
+			Assert.AreEqual(settings.GetDoubleList("double_list"), createdDoubleList);
+			Assert.AreEqual(settings.GetFloatList("float_list"), createdFloatList);
+			Assert.AreEqual(settings.GetBoolList("bool_list"), createdBoolList);
+		}
+
 		[Test]
 		public void CascadeSettings()
 		{

ProjectSettings/ProjectVersion.txt

@@ -1 +1 @@
-m_EditorVersion: 2017.4.36f1
+m_EditorVersion: 2017.4.40f1