wasSharpNET – Diff between revs 11 and 27

Subversion Repositories:
Rev:
Show entire file – Regard whitespace
Rev 11 Rev 27
Line 29... Line 29...
29   29  
30 foreach (var fi in @object.GetType().GetFields(BindingFlags.Instance | BindingFlags.Public)) 30 foreach (var fi in @object.GetType().GetFields(BindingFlags.Instance | BindingFlags.Public))
31 { 31 {
32 if (fi.FieldType.FullName.Split('.', '+') 32 if (fi.FieldType.FullName.Split('.', '+')
33 .Contains(@namespace, StringComparer.OrdinalIgnoreCase)) -  
34 { 33 .Contains(@namespace, StringComparer.OrdinalIgnoreCase))
35 foreach (var sf in wasGetFields(fi.GetValue(@object), @namespace)) -  
36 { 34 foreach (var sf in wasGetFields(fi.GetValue(@object), @namespace))
37 yield return sf; -  
38 } -  
39 } 35 yield return sf;
40 yield return new KeyValuePair<FieldInfo, object>(fi, @object); 36 yield return new KeyValuePair<FieldInfo, object>(fi, @object);
41 } 37 }
Line 42... Line 38...
42 } 38 }
Line 65... Line 61...
65 if (getMethod.ReturnType.IsArray) 61 if (getMethod.ReturnType.IsArray)
66 { 62 {
67 var array = (Array)getMethod.Invoke(@object, null); 63 var array = (Array) getMethod.Invoke(@object, null);
68 foreach (var sp in 64 foreach (var sp in
69 array.Cast<object>().SelectMany(element => wasGetProperties(element, @namespace))) 65 array.Cast<object>().SelectMany(element => wasGetProperties(element, @namespace)))
70 { -  
71 yield return sp; 66 yield return sp;
72 } 67 }
73 } -  
74 foreach ( 68 foreach (
75 var sp in 69 var sp in
76 wasGetProperties(pi.GetValue(@object, null), @namespace)) 70 wasGetProperties(pi.GetValue(@object, null), @namespace))
77 { -  
78 yield return sp; 71 yield return sp;
79 } 72 }
80 } -  
81 yield return new KeyValuePair<PropertyInfo, object>(pi, @object); 73 yield return new KeyValuePair<PropertyInfo, object>(pi, @object);
82 } 74 }
83 } 75 }
Line 84... Line 76...
84   76  
Line 120... Line 112...
120 /// <returns>the value of the field or property</returns> 112 /// <returns>the value of the field or property</returns>
121 public static object wasGetInfoValue<T>(T info, object value) 113 public static object wasGetInfoValue<T>(T info, object value)
122 { 114 {
123 var fi = (object)info as FieldInfo; 115 var fi = (object) info as FieldInfo;
124 if (fi != null) 116 if (fi != null)
125 { -  
126 return fi.GetValue(value); 117 return fi.GetValue(value);
127 } -  
128 var pi = (object)info as PropertyInfo; 118 var pi = (object) info as PropertyInfo;
129 if (pi != null) 119 if (pi != null)
130 { 120 {
131 if (pi.GetIndexParameters().Any()) 121 if (pi.GetIndexParameters().Any())
132 { -  
133 return value; 122 return value;
134 } -  
135 return pi.GetValue(value, null); 123 return pi.GetValue(value, null);
136 } 124 }
137 return null; 125 return null;
138 } 126 }
139 } 127 }