-Fixed various schema generation bugs

-Renamed MemberHandler delegate to ObjectConstructor
This commit is contained in:
JamesNK
2010-02-05 23:14:06 +00:00
parent 35cd765fd7
commit 42bf89940d
24 changed files with 326 additions and 48 deletions
@@ -41,7 +41,7 @@ namespace Newtonsoft.Json.Serialization
private readonly Type _genericCollectionDefinitionType;
private Type _genericWrapperType;
private MemberHandler<object> _genericWrapperCreator;
private MethodCaller<object> _genericWrapperCreator;
/// <summary>
/// Initializes a new instance of the <see cref="JsonDictionaryContract"/> class.
@@ -69,10 +69,6 @@ namespace Newtonsoft.Json.Serialization
{
CreatedType = ReflectionUtils.MakeGenericType(typeof(Dictionary<,>), keyType, valueType);
}
else
{
CreatedType = underlyingType;
}
}
internal IWrappedDictionary CreateWrapper(object dictionary)
@@ -86,7 +82,7 @@ namespace Newtonsoft.Json.Serialization
ConstructorInfo genericWrapperConstructor = _genericWrapperType.GetConstructor(new[] { _genericCollectionDefinitionType });
#if !PocketPC && !SILVERLIGHT
_genericWrapperCreator = LateBoundDelegateFactory.CreateMethodHandler(genericWrapperConstructor);
_genericWrapperCreator = LateBoundDelegateFactory.CreateMethodCall(genericWrapperConstructor);
#else
_genericWrapperCreator = (target, args) => genericWrapperConstructor.Invoke(new[] { args[0] });
#endif