VAR/VAR.WebFormsCore
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

JSONParser: Fix static type conversion to incomplete types.

Browse Source
This commit is contained in:
Valeriano A.R.
2015-06-20 16:36:51 +02:00
parent b9e0999c38
commit 0871098ccc
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Scrummer/Code/JSON/JSONParser.cs
View File

@@ -53,7 +53,7 @@ namespace Scrummer.Code.JSON
return typeProperties; return typeProperties;
} }
private bool CompareToType(Dictionary<string, object> obj, Type type) private float CompareToType(Dictionary<string, object> obj, Type type)
{ {
PropertyInfo[] typeProperties = Type_GetProperties(type); PropertyInfo[] typeProperties = Type_GetProperties(type);
int count = 0; int count = 0;
@@ -64,7 +64,7 @@ namespace Scrummer.Code.JSON
count++; count++;
} }
} }
return (count == typeProperties.Length); return ((float)count / (float)typeProperties.Length);
} }
private object ConvertToType(Dictionary<string, object> obj, Type type) private object ConvertToType(Dictionary<string, object> obj, Type type)
@@ -83,13 +83,21 @@ namespace Scrummer.Code.JSON
private object TryConvertToTypes(Dictionary<string, object> obj) private object TryConvertToTypes(Dictionary<string, object> obj)
{ {
Type bestMatch = null;
float bestMatchFactor = 0.0f;
foreach (Type type in _knownTypes) foreach (Type type in _knownTypes)
{ {
if (CompareToType(obj, type)) float matchFactor = CompareToType(obj, type);
if (matchFactor > bestMatchFactor)
{ {
return ConvertToType(obj, type); bestMatch = type;
bestMatchFactor = matchFactor;
} }
} }
if (bestMatch != null)
{
return ConvertToType(obj, bestMatch);
}
return obj; return obj;
} }