From ee3e3787a89aade305fbe41a1aecf321370aa732 Mon Sep 17 00:00:00 2001 From: leekelleher Date: Sat, 10 Nov 2012 21:41:40 +0000 Subject: [PATCH] PropertyEditorConverters - reusing TryConvertTo, removing duplicate code. --- .../DatePickerPropertyEditorValueConverter.cs | 11 +---------- .../YesNoPropertyEditorValueConverter.cs | 13 +------------ 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/src/Umbraco.Core/PropertyEditors/DatePickerPropertyEditorValueConverter.cs b/src/Umbraco.Core/PropertyEditors/DatePickerPropertyEditorValueConverter.cs index 9c1f72e473..5d437f5d91 100644 --- a/src/Umbraco.Core/PropertyEditors/DatePickerPropertyEditorValueConverter.cs +++ b/src/Umbraco.Core/PropertyEditors/DatePickerPropertyEditorValueConverter.cs @@ -21,16 +21,7 @@ namespace Umbraco.Core.PropertyEditors /// public Attempt ConvertPropertyValue(object value) { - if (value == null) return new Attempt(false, null); - //if its already a DateTime - if (TypeHelper.IsTypeAssignableFrom(value)) - return new Attempt(true, value); - //convert to string - var asString = Convert.ToString(value); - DateTime dt; - return DateTime.TryParse(asString, out dt) - ? new Attempt(true, dt) - : new Attempt(false, null); + return value.TryConvertTo(typeof(DateTime)); } } } \ No newline at end of file diff --git a/src/Umbraco.Core/PropertyEditors/YesNoPropertyEditorValueConverter.cs b/src/Umbraco.Core/PropertyEditors/YesNoPropertyEditorValueConverter.cs index b44b00c882..3cac051c94 100644 --- a/src/Umbraco.Core/PropertyEditors/YesNoPropertyEditorValueConverter.cs +++ b/src/Umbraco.Core/PropertyEditors/YesNoPropertyEditorValueConverter.cs @@ -16,18 +16,7 @@ namespace Umbraco.Core.PropertyEditors /// public Attempt ConvertPropertyValue(object value) { - if (value == null) return new Attempt(false, null); - //if its already a bool - if (TypeHelper.IsTypeAssignableFrom(value)) - return new Attempt(true, value); - //convert to string - var asString = Convert.ToString(value); - bool asBool; - return bool.TryParse(asString, out asBool) - ? new Attempt(true, asBool) - : bool.TryParse(asString.Replace("1", "true").Replace("0", "false"), out asBool) //convert 0 or 1 to true or false - ? new Attempt(true, asBool) - : new Attempt(false, null); + return value.TryConvertTo(typeof(bool)); } } } \ No newline at end of file