AMT-Cheif
/
Stylet
mirror of https://github.com/AMT-Cheif/Stylet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Change Stringable<T> to a struct, to avoid nullity issues

This commit is contained in:
Antony Male 2014-08-02 17:59:22 +01:00
parent 9532f3eca1
commit 2d44237ef4
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Samples/Stylet.Samples.ModelValidation/Pages/UserViewModel.cs
View File

@ -58,8 +58,8 @@ namespace Stylet.Samples.ModelValidation.Pages
RuleFor(x => x.Email).NotEmpty().EmailAddress();
RuleFor(x => x.Password).NotEmpty().Matches("[0-9]").WithMessage("{PropertyName} must contain a number");
RuleFor(x => x.PasswordConfirmation).Equal(s => s.Password).WithMessage("{PropertyName} should match Password");
RuleFor(x => x.Age).Must(x => x != null && x.IsValid).WithMessage("{PropertyName} must be a valid number");
When(x => x.Age != null && x.Age.IsValid, () =>
RuleFor(x => x.Age).Must(x => x.IsValid).WithMessage("{PropertyName} must be a valid number");
When(x => x.Age.IsValid, () =>
{
RuleFor(x => x.Age.Value).GreaterThan(0).WithName("Age");
});

16
Samples/Stylet.Samples.ModelValidation/Stringable.cs
View File

@ -20,9 +20,9 @@ namespace Stylet.Samples.ModelValidation
///
/// This type has an associated TypeConverter, StringableConverter, which will be used by WPF to convert this Stringable{T} to and from a string.
/// </remarks>
// I would make this a struct, but it will have to be boxed to go through the TypeConverter, so there's no point
// If this is a struct, we avoid null issues
[TypeConverter(typeof(StringableConverter))]
public class Stringable<T> : IEquatable<Stringable<T>>
public struct Stringable<T> : IEquatable<Stringable<T>>
{
private readonly string _stringValue;
@ -104,20 +104,18 @@ namespace Stylet.Samples.ModelValidation
public override bool Equals(object obj)
{
return base.Equals(obj as Stringable<T>);
if (!(obj is Stringable<T>))
return false;
return base.Equals((Stringable<T>)obj);
}
public bool Equals(Stringable<T> other)
{
return other != null && EqualityComparer<T>.Default.Equals(this.Value, other.Value) && this.StringValue == other.StringValue;
return EqualityComparer<T>.Default.Equals(this.Value, other.Value) && this.StringValue == other.StringValue;
}
public static bool operator ==(Stringable<T> o1, Stringable<T> o2)
{
if (Object.ReferenceEquals(o1, o2))
return true;
if ((object)o1 == null || (object)o2 == null)
return false;
return o1.Equals(o2);
}
@ -161,7 +159,7 @@ namespace Stylet.Samples.ModelValidation
// WPF instantiates us once, then uses us lots, so the overhead of doing this here is worth it
var fromMethod = type.GetMethod("FromString", BindingFlags.Static | BindingFlags.Public);
var param = Expression.Parameter(typeof(string));
this.generator = Expression.Lambda<Func<string, object>>(Expression.Call(fromMethod, param), param).Compile();
this.generator = Expression.Lambda<Func<string, object>>(Expression.TypeAs(Expression.Call(fromMethod, param), typeof(object)), param).Compile();
}
public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)