From 977bc303682dc049f9136b5fb252a11370ce3ba2 Mon Sep 17 00:00:00 2001 From: BrandonLWhite Date: Sat, 13 Sep 2014 18:14:06 -0500 Subject: [PATCH] Changed naming of JsonConverterAttribute.ConverterArgs to "ConverterParameters" for consistency. --- Src/Newtonsoft.Json/JsonConverterAttribute.cs | 8 ++++---- Src/Newtonsoft.Json/Serialization/JsonTypeReflector.cs | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Src/Newtonsoft.Json/JsonConverterAttribute.cs b/Src/Newtonsoft.Json/JsonConverterAttribute.cs index 2d6d34e9..f3897801 100644 --- a/Src/Newtonsoft.Json/JsonConverterAttribute.cs +++ b/Src/Newtonsoft.Json/JsonConverterAttribute.cs @@ -50,7 +50,7 @@ namespace Newtonsoft.Json /// The parameter list to use when constructing the JsonConverter described by ConverterType. /// If null, the default constructor is used. /// - public object[] ConverterArgs { get; private set; } + public object[] ConverterParameters { get; private set; } /// /// Initializes a new instance of the class. @@ -68,11 +68,11 @@ namespace Newtonsoft.Json /// Initializes a new instance of the class. /// /// Type of the converter. - /// Parameter list to use when constructing the JsonConverter. Can be null. - public JsonConverterAttribute(Type converterType, params object[] converterArgs) + /// Parameter list to use when constructing the JsonConverter. Can be null. + public JsonConverterAttribute(Type converterType, params object[] converterParameters) : this(converterType) { - ConverterArgs = converterArgs; + ConverterParameters = converterParameters; } } } \ No newline at end of file diff --git a/Src/Newtonsoft.Json/Serialization/JsonTypeReflector.cs b/Src/Newtonsoft.Json/Serialization/JsonTypeReflector.cs index 23069d44..a2fdf14d 100644 --- a/Src/Newtonsoft.Json/Serialization/JsonTypeReflector.cs +++ b/Src/Newtonsoft.Json/Serialization/JsonTypeReflector.cs @@ -155,7 +155,7 @@ namespace Newtonsoft.Json.Serialization { Func creator = JsonConverterCreatorCache.Get(converterAttribute.ConverterType); if (creator != null) - return creator(converterAttribute.ConverterArgs); + return creator(converterAttribute.ConverterParameters); } return null;