@@ -40,7 +40,9 @@ public Type ElementType
4040 get
4141 {
4242 if ( element_type == null )
43+ {
4344 return typeof ( JsonData ) ;
45+ }
4446
4547 return element_type ;
4648 }
@@ -75,7 +77,9 @@ public Type ElementType
7577 get
7678 {
7779 if ( element_type == null )
80+ {
7881 return typeof ( JsonData ) ;
82+ }
7983
8084 return element_type ;
8185 }
@@ -176,27 +180,37 @@ static JsonMapper()
176180 private static void AddArrayMetadata ( Type type )
177181 {
178182 if ( array_metadata . ContainsKey ( type ) )
183+ {
179184 return ;
185+ }
180186
181187 ArrayMetadata data = new ArrayMetadata ( ) ;
182188
183189 data . IsArray = type . IsArray ;
184190
185191 if ( type . GetInterface ( "System.Collections.IList" ) != null )
192+ {
186193 data . IsList = true ;
194+ }
187195
188196 foreach ( PropertyInfo p_info in type . GetProperties ( ) )
189197 {
190198 if ( p_info . Name != "Item" )
199+ {
191200 continue ;
201+ }
192202
193203 ParameterInfo [ ] parameters = p_info . GetIndexParameters ( ) ;
194204
195205 if ( parameters . Length != 1 )
206+ {
196207 continue ;
208+ }
197209
198210 if ( parameters [ 0 ] . ParameterType == typeof ( int ) )
211+ {
199212 data . ElementType = p_info . PropertyType ;
213+ }
200214 }
201215
202216 lock ( array_metadata_lock )
@@ -215,12 +229,16 @@ private static void AddArrayMetadata(Type type)
215229 private static void AddObjectMetadata ( Type type )
216230 {
217231 if ( object_metadata . ContainsKey ( type ) )
232+ {
218233 return ;
234+ }
219235
220236 ObjectMetadata data = new ObjectMetadata ( ) ;
221237
222238 if ( type . GetInterface ( "System.Collections.IDictionary" ) != null )
239+ {
223240 data . IsDictionary = true ;
241+ }
224242
225243 data . Properties = new Dictionary < string , PropertyMetadata > ( ) ;
226244
@@ -231,10 +249,14 @@ private static void AddObjectMetadata(Type type)
231249 ParameterInfo [ ] parameters = p_info . GetIndexParameters ( ) ;
232250
233251 if ( parameters . Length != 1 )
252+ {
234253 continue ;
254+ }
235255
236256 if ( parameters [ 0 ] . ParameterType == typeof ( string ) )
257+ {
237258 data . ElementType = p_info . PropertyType ;
259+ }
238260
239261 continue ;
240262 }
@@ -272,14 +294,18 @@ private static void AddObjectMetadata(Type type)
272294 private static void AddTypeProperties ( Type type )
273295 {
274296 if ( type_properties . ContainsKey ( type ) )
297+ {
275298 return ;
299+ }
276300
277301 IList < PropertyMetadata > props = new List < PropertyMetadata > ( ) ;
278302
279303 foreach ( PropertyInfo p_info in type . GetProperties ( ) )
280304 {
281305 if ( p_info . Name == "Item" )
306+ {
282307 continue ;
308+ }
283309
284310 PropertyMetadata p_data = new PropertyMetadata ( ) ;
285311 p_data . Info = p_info ;
@@ -314,10 +340,14 @@ private static MethodInfo GetConvOp(Type t1, Type t2)
314340 lock ( conv_ops_lock )
315341 {
316342 if ( ! conv_ops . ContainsKey ( t1 ) )
343+ {
317344 conv_ops . Add ( t1 , new Dictionary < Type , MethodInfo > ( ) ) ;
345+ }
318346
319347 if ( conv_ops [ t1 ] . ContainsKey ( t2 ) )
348+ {
320349 return conv_ops [ t1 ] [ t2 ] ;
350+ }
321351 }
322352
323353 MethodInfo op = t1 . GetMethod (
@@ -343,7 +373,9 @@ private static object ReadValue(Type inst_type, JsonReader reader)
343373 reader . Read ( ) ;
344374
345375 if ( reader . Token == JsonToken . ArrayEnd )
376+ {
346377 return null ;
378+ }
347379
348380 Type underlying_type = Nullable . GetUnderlyingType ( inst_type ) ;
349381 Type value_type = underlying_type ?? inst_type ;
@@ -418,8 +450,10 @@ private static object ReadValue(Type inst_type, JsonReader reader)
418450 MethodInfo conv_op = GetConvOp ( value_type , json_type ) ;
419451
420452 if ( conv_op != null )
453+ {
421454 return conv_op . Invoke ( null ,
422455 new object [ ] { reader . Value } ) ;
456+ }
423457
424458 // No luck
425459 throw new JsonException ( String . Format (
@@ -436,9 +470,11 @@ private static object ReadValue(Type inst_type, JsonReader reader)
436470 ArrayMetadata t_data = array_metadata [ inst_type ] ;
437471
438472 if ( ! t_data . IsArray && ! t_data . IsList )
473+ {
439474 throw new JsonException ( String . Format (
440475 "Type {0} can't act as an array" ,
441476 inst_type ) ) ;
477+ }
442478
443479 IList list ;
444480 Type elem_type ;
@@ -469,10 +505,14 @@ private static object ReadValue(Type inst_type, JsonReader reader)
469505 instance = Array . CreateInstance ( elem_type , n ) ;
470506
471507 for ( int i = 0 ; i < n ; i ++ )
508+ {
472509 ( ( Array ) instance ) . SetValue ( list [ i ] , i ) ;
510+ }
473511 }
474512 else
513+ {
475514 instance = list ;
515+ }
476516
477517 }
478518 else if ( reader . Token == JsonToken . ObjectStart )
@@ -487,7 +527,9 @@ private static object ReadValue(Type inst_type, JsonReader reader)
487527 reader . Read ( ) ;
488528
489529 if ( reader . Token == JsonToken . ObjectEnd )
530+ {
490531 break ;
532+ }
491533
492534 string property = ( string ) reader . Value ;
493535
@@ -507,12 +549,16 @@ private static object ReadValue(Type inst_type, JsonReader reader)
507549 ( PropertyInfo ) prop_data . Info ;
508550
509551 if ( p_info . CanWrite )
552+ {
510553 p_info . SetValue (
511554 instance ,
512555 ReadValue ( prop_data . Type , reader ) ,
513556 null ) ;
557+ }
514558 else
559+ {
515560 ReadValue ( prop_data . Type , reader ) ;
561+ }
516562 }
517563
518564 }
@@ -610,7 +656,9 @@ private static IJsonWrapper ReadValue(WrapperFactory factory,
610656 reader . Read ( ) ;
611657
612658 if ( reader . Token == JsonToken . ObjectEnd )
659+ {
613660 break ;
661+ }
614662
615663 string property = ( string ) reader . Value ;
616664
@@ -832,9 +880,13 @@ private static void WriteValue(object obj, JsonWriter writer,
832880 if ( obj is IJsonWrapper )
833881 {
834882 if ( writer_is_private )
883+ {
835884 writer . TextWriter . Write ( ( ( IJsonWrapper ) obj ) . ToJson ( ) ) ;
885+ }
836886 else
887+ {
837888 ( ( IJsonWrapper ) obj ) . ToJson ( writer ) ;
889+ }
838890
839891 return ;
840892 }
@@ -880,7 +932,9 @@ private static void WriteValue(object obj, JsonWriter writer,
880932 writer . WriteArrayStart ( ) ;
881933
882934 foreach ( object elem in ( Array ) obj )
935+ {
883936 WriteValue ( elem , writer , writer_is_private , depth + 1 ) ;
937+ }
884938
885939 writer . WriteArrayEnd ( ) ;
886940
@@ -891,7 +945,9 @@ private static void WriteValue(object obj, JsonWriter writer,
891945 {
892946 writer . WriteArrayStart ( ) ;
893947 foreach ( object elem in ( IList ) obj )
948+ {
894949 WriteValue ( elem , writer , writer_is_private , depth + 1 ) ;
950+ }
895951 writer . WriteArrayEnd ( ) ;
896952
897953 return ;
@@ -954,9 +1010,13 @@ private static void WriteValue(object obj, JsonWriter writer,
9541010 if ( e_type == typeof ( long )
9551011 || e_type == typeof ( uint )
9561012 || e_type == typeof ( ulong ) )
1013+ {
9571014 writer . Write ( ( ulong ) obj ) ;
1015+ }
9581016 else
1017+ {
9591018 writer . Write ( ( int ) obj ) ;
1019+ }
9601020
9611021 return ;
9621022 }
0 commit comments