Renormalize

src/Umbraco.Web/Models/Mapping/ContentPropertyBasicConverter.cs

@@ -1,69 +1,69 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using AutoMapper;
-using Umbraco.Core;
-using Umbraco.Core.Logging;
-using Umbraco.Core.Models;
-using Umbraco.Core.PropertyEditors;
-using Umbraco.Core.Services;
-using Umbraco.Web.Composing;
-using Umbraco.Web.Models.ContentEditing;
-using ContentVariation = Umbraco.Core.Models.ContentVariation;
-
-namespace Umbraco.Web.Models.Mapping
-{
-    /// <summary>
-    /// Creates a base generic ContentPropertyBasic from a Property
-    /// </summary>
-    internal class ContentPropertyBasicConverter<TDestination> : ITypeConverter<Property, TDestination>
-        where TDestination : ContentPropertyBasic, new()
-    {
-        private readonly ILogger _logger;
-        private readonly PropertyEditorCollection _propertyEditors;
-        protected IDataTypeService DataTypeService { get; }
-
-        public ContentPropertyBasicConverter(IDataTypeService dataTypeService, ILogger logger, PropertyEditorCollection propertyEditors)
-        {
-            _logger = logger;
-            _propertyEditors = propertyEditors;
-            DataTypeService = dataTypeService;
-        }
-
-        /// <summary>
-        /// Assigns the PropertyEditor, Id, Alias and Value to the property
-        /// </summary>
-        /// <returns></returns>
-        public virtual TDestination Convert(Property property, TDestination dest, ResolutionContext context)
-        {
-            var editor = _propertyEditors[property.PropertyType.PropertyEditorAlias];
-            if (editor == null)
-            {
-                _logger.Error<ContentPropertyBasicConverter<TDestination>>(
-                    "No property editor found, converting to a Label",
-                    new NullReferenceException("The property editor with alias " + property.PropertyType.PropertyEditorAlias + " does not exist"));
-
-                editor = _propertyEditors[Constants.PropertyEditors.Aliases.NoEdit];
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using AutoMapper;
+using Umbraco.Core;
+using Umbraco.Core.Logging;
+using Umbraco.Core.Models;
+using Umbraco.Core.PropertyEditors;
+using Umbraco.Core.Services;
+using Umbraco.Web.Composing;
+using Umbraco.Web.Models.ContentEditing;
+using ContentVariation = Umbraco.Core.Models.ContentVariation;
+
+namespace Umbraco.Web.Models.Mapping
+{
+    /// <summary>
+    /// Creates a base generic ContentPropertyBasic from a Property
+    /// </summary>
+    internal class ContentPropertyBasicConverter<TDestination> : ITypeConverter<Property, TDestination>
+        where TDestination : ContentPropertyBasic, new()
+    {
+        private readonly ILogger _logger;
+        private readonly PropertyEditorCollection _propertyEditors;
+        protected IDataTypeService DataTypeService { get; }
+
+        public ContentPropertyBasicConverter(IDataTypeService dataTypeService, ILogger logger, PropertyEditorCollection propertyEditors)
+        {
+            _logger = logger;
+            _propertyEditors = propertyEditors;
+            DataTypeService = dataTypeService;
+        }
+
+        /// <summary>
+        /// Assigns the PropertyEditor, Id, Alias and Value to the property
+        /// </summary>
+        /// <returns></returns>
+        public virtual TDestination Convert(Property property, TDestination dest, ResolutionContext context)
+        {
+            var editor = _propertyEditors[property.PropertyType.PropertyEditorAlias];
+            if (editor == null)
+            {
+                _logger.Error<ContentPropertyBasicConverter<TDestination>>(
+                    "No property editor found, converting to a Label",
+                    new NullReferenceException("The property editor with alias " + property.PropertyType.PropertyEditorAlias + " does not exist"));
+
+                editor = _propertyEditors[Constants.PropertyEditors.Aliases.NoEdit];
+            }
+
+            var result = new TDestination
+                {
+                    Id = property.Id,
+                    Alias = property.Alias,
+                    PropertyEditor = editor,
+                    Editor = editor.Alias
+                };
+
+            // if there's a set of property aliases specified, we will check if the current property's value should be mapped.
+            // if it isn't one of the ones specified in 'includeProperties', we will just return the result without mapping the Value.
+            if (context.Options.Items.ContainsKey("IncludeProperties"))
+            {
+                var includeProperties = context.Options.Items["IncludeProperties"] as IEnumerable<string>;
+                if (includeProperties != null && includeProperties.Contains(property.Alias) == false)
+                {
+                    return result;
+                }
             }
-
-            var result = new TDestination
-                {
-                    Id = property.Id,
-                    Alias = property.Alias,
-                    PropertyEditor = editor,
-                    Editor = editor.Alias
-                };
-
-            // if there's a set of property aliases specified, we will check if the current property's value should be mapped.
-            // if it isn't one of the ones specified in 'includeProperties', we will just return the result without mapping the Value.
-            if (context.Options.Items.ContainsKey("IncludeProperties"))
-            {
-                var includeProperties = context.Options.Items["IncludeProperties"] as IEnumerable<string>;
-                if (includeProperties != null && includeProperties.Contains(property.Alias) == false)
-                {
-                    return result;
-                }
-            }
 
             var culture = context.GetCulture();
 
@@ -73,10 +73,10 @@ namespace Umbraco.Web.Models.Mapping
 
             //set the culture to null if it's an invariant property type
             culture = !property.PropertyType.Variations.Has(ContentVariation.CultureNeutral) ? null : culture;
-
-            // if no 'IncludeProperties' were specified or this property is set to be included - we will map the value and return.
-            result.Value = editor.GetValueEditor().ToEditor(property, DataTypeService, culture);
-            return result;
-        }
-    }
-}
+
+            // if no 'IncludeProperties' were specified or this property is set to be included - we will map the value and return.
+            result.Value = editor.GetValueEditor().ToEditor(property, DataTypeService, culture);
+            return result;
+        }
+    }
+}