diff options
| author | Sebastien Pouliot <sebastien@ximian.com> | 2010-05-16 19:42:56 +0400 |
|---|---|---|
| committer | Sebastien Pouliot <sebastien@ximian.com> | 2010-05-16 19:42:56 +0400 |
| commit | 6dd3ab39b2d4beb8ab191ec5cbae87fd0f340370 (patch) | |
| tree | 8824758d909f4a0c59d5693b2e29033593aa1398 | |
| parent | 7374f12a2cc94fd3db8523c8053f7e08ac1349a2 (diff) | |
2010-05-16 Sebastien Pouliot <sebastien@ximian.com>
* DeserializeOptionalFieldRule.cs: Apply AvoidRepetitiveCallsTo
PropertiesRule.
* MarkAllNonSerializableFieldsRule.cs: Fix typo
svn path=/trunk/mono-tools/; revision=157401
3 files changed, 12 insertions, 3 deletions
diff --git a/gendarme/rules/Gendarme.Rules.Serialization/ChangeLog b/gendarme/rules/Gendarme.Rules.Serialization/ChangeLog index 5614eb64..594a0dac 100644 --- a/gendarme/rules/Gendarme.Rules.Serialization/ChangeLog +++ b/gendarme/rules/Gendarme.Rules.Serialization/ChangeLog @@ -1,3 +1,9 @@ +2010-05-16 Sebastien Pouliot <sebastien@ximian.com> + + * DeserializeOptionalFieldRule.cs: Apply AvoidRepetitiveCallsTo + PropertiesRule. + * MarkAllNonSerializableFieldsRule.cs: Fix typo + 2009-08-19 Jesse Jones <jesjones@mindspring.com> * DeserializeOptionalFieldRule.cs: Edited the rule description. diff --git a/gendarme/rules/Gendarme.Rules.Serialization/DeserializeOptionalFieldRule.cs b/gendarme/rules/Gendarme.Rules.Serialization/DeserializeOptionalFieldRule.cs index bd186655..39ad6694 100644 --- a/gendarme/rules/Gendarme.Rules.Serialization/DeserializeOptionalFieldRule.cs +++ b/gendarme/rules/Gendarme.Rules.Serialization/DeserializeOptionalFieldRule.cs @@ -119,10 +119,13 @@ namespace Gendarme.Rules.Serialization { foreach (MethodDefinition method in type.Methods) { if (!method.HasCustomAttributes) continue; - if (method.CustomAttributes.ContainsType (OnDeserializedAttribute)) + + CustomAttributeCollection cac = method.CustomAttributes; + if (cac.ContainsType (OnDeserializedAttribute)) deserialized_candidate = true; - if (method.CustomAttributes.ContainsType (OnDeserializingAttribute)) + if (cac.ContainsType (OnDeserializingAttribute)) deserializing_candidate = true; + if (deserialized_candidate && deserializing_candidate) break; } diff --git a/gendarme/rules/Gendarme.Rules.Serialization/MarkAllNonSerializableFieldsRule.cs b/gendarme/rules/Gendarme.Rules.Serialization/MarkAllNonSerializableFieldsRule.cs index 26d309a4..75d3a89c 100644 --- a/gendarme/rules/Gendarme.Rules.Serialization/MarkAllNonSerializableFieldsRule.cs +++ b/gendarme/rules/Gendarme.Rules.Serialization/MarkAllNonSerializableFieldsRule.cs @@ -74,7 +74,7 @@ namespace Gendarme.Rules.Serialization { public RuleResult CheckType (TypeDefinition type) { - // if type is not serializable or has not any fields or does bot implements a custom serialization + // if type is not serializable or has not any fields or does not implements a custom serialization if (!type.IsSerializable || !type.HasFields || type.Implements ("System.Runtime.Serialization.ISerializable")) return RuleResult.DoesNotApply; |