Cleanup and C# 6

Author: abjerner

src/Skybrud.ImagePicker/Extensions/PublishedContentExtensions.cs

@@ -16,10 +16,10 @@ public static class PublishedContentExtensions {
         /// </summary>
         /// <param name="content">An instance of <see cref="IPublishedContent"/> to read the property from.</param>
         /// <param name="propertyAlias">The alias of the property.</param>
-        /// <returns>Returns an instance of <see cref="ImagePickerItem"/>.</returns>
+        /// <returns>An instance of <see cref="ImagePickerItem"/>.</returns>
         public static ImagePickerItem GetImagePickerItem(this IPublishedContent content, string propertyAlias) {
             var list = content.GetPropertyValue(propertyAlias) as ImagePickerList;
-            ImagePickerItem item = (list == null ? null : list.Items.FirstOrDefault());
+            ImagePickerItem item = list?.Items.FirstOrDefault();
             return item ?? new ImagePickerItem();
         }
 
@@ -28,9 +28,9 @@ public static ImagePickerItem GetImagePickerItem(this IPublishedContent content,
         /// </summary>
         /// <param name="content">An instance of <see cref="IPublishedContent"/> to read the property from.</param>
         /// <param name="propertyAlias">The alias of the property.</param>
-        /// <returns>Returns an instance of <see cref="ImagePickerList"/>.</returns>
+        /// <returns>An instance of <see cref="ImagePickerList"/>.</returns>
         public static ImagePickerList GetImagePickerList(this IPublishedContent content, string propertyAlias) {
-            return (content == null ? null : content.GetPropertyValue<ImagePickerList>(propertyAlias)) ?? new ImagePickerList();
+            return content?.GetPropertyValue<ImagePickerList>(propertyAlias) ?? new ImagePickerList();
         }
     }
 

src/Skybrud.ImagePicker/Grid/Config/GridEditorImagePickerConfig.cs

@@ -15,7 +15,7 @@ public class GridEditorImagePickerConfig : GridJsonObject, IGridEditorConfig {
         /// <summary>
         /// Gets a reference to the parent editor.
         /// </summary>
-        public GridEditor Editor { get; private set; }
+        public GridEditor Editor { get; }
 
         #endregion
 

src/Skybrud.ImagePicker/Grid/Config/GridEditorImagePickerTitleConfig.cs

@@ -14,7 +14,7 @@ public class GridEditorImagePickerTitleConfig : GridJsonObject {
         /// <summary>
         /// Gets whether the title of the image picker list should be shown.
         /// </summary>
-        public bool Show { get; private set; }
+        public bool Show { get; }
 
         #endregion
 

src/Skybrud.ImagePicker/Grid/Values/GridControlImagePickerValue.cs

@@ -15,7 +15,7 @@ public class GridControlImagePickerValue : ImagePickerList, IGridControlValue {
         /// <summary>
         /// Gets a reference to the parent control.
         /// </summary>
-        public GridControl Control { get; private set; }
+        public GridControl Control { get; }
 
         #endregion
 
@@ -34,6 +34,9 @@ protected GridControlImagePickerValue(GridControl control, JObject obj) : base(o
 
         #region Member methods
 
+        /// <summary>
+        /// Gets the searchable text for this image picker value.
+        /// </summary>
         public string GetSearchableText() {
 
             StringBuilder sb = new StringBuilder();

src/Skybrud.ImagePicker/ImagePickerImage.cs

@@ -16,7 +16,7 @@ public class ImagePickerImage {
         /// Gets a reference to the underlying instance of <see cref="IPublishedContent"/>.
         /// </summary>
         [JsonIgnore]
-        public IPublishedContent Image { get; private set; }
+        public IPublishedContent Image { get; }
 
         /// <summary>
         /// Gets the width of the image.
@@ -47,7 +47,7 @@ public class ImagePickerImage {
         #region Constructors
 
         /// <summary>
-        /// Initializes a new instance based on the specified <code>content</code>.
+        /// Initializes a new instance based on the specified <paramref name="content"/>.
         /// </summary>
         /// <param name="content">An instance of <see cref="IPublishedContent"/> representing the selected image.</param>
         protected ImagePickerImage(IPublishedContent content) {
@@ -88,17 +88,17 @@ public string GetCropUrl(int? width = null, int? height = null, string propertyA
         #region Static methods
 
         /// <summary>
-        /// Parses the specified <code>content</code> into an instance of <see cref="ImagePickerImage"/>.
+        /// Parses the specified <paramref name="content"/> into an instance of <see cref="ImagePickerImage"/>.
         /// </summary>
         /// <param name="content">The instance of <see cref="ImagePickerImage"/> to be parsed.</param>
         /// <returns>Returns an instance of <see cref="ImagePickerImage"/>, or <code>null</code> if
-        /// <code>content</code> is <code>null</code>.</returns>
+        /// <paramref name="content"/> is <code>null</code>.</returns>
         public static ImagePickerImage GetFromContent(IPublishedContent content) {
             return content == null ? null : new ImagePickerImage(content);
         }
 
         /// <summary>
-        /// Gets a reference to the image with the specified <code>imageId</code>.
+        /// Gets a reference to the image with the specified <paramref name="imageId"/>.
         /// </summary>
         /// <param name="imageId">The ID of the image..</param>
         /// <returns>Returns an instance of <see cref="ImagePickerImage"/>, or <code>null</code> if the image could not

src/Skybrud.ImagePicker/ImagePickerItem.cs

@@ -19,7 +19,7 @@ public class ImagePickerItem {
         /// Gets a reference to the <see cref="JObject"/> the item was parsed from.
         /// </summary>
         [JsonIgnore]
-        public JObject JObject { get; private set; }
+        public JObject JObject { get; }
 
         /// <summary>
         /// Gets a reference to the selected image.
@@ -31,9 +31,7 @@ public class ImagePickerItem {
         /// Gets whether an image has been selected for this item.
         /// </summary>
         [JsonIgnore]
-        public bool HasImage {
-            get { return Image != null; }
-        }
+        public bool HasImage => Image != null;
 
         /// <summary>
         /// Gets the title of this item.
@@ -45,9 +43,7 @@ public bool HasImage {
         /// Gets whether a title has been specified for this item.
         /// </summary>
         [JsonIgnore]
-        public bool HasTitle {
-            get { return !String.IsNullOrWhiteSpace(Title); }
-        }
+        public bool HasTitle => !String.IsNullOrWhiteSpace(Title);
 
         /// <summary>
         /// Gets the description of this item.
@@ -59,9 +55,7 @@ public bool HasTitle {
         /// Gets whether a description has been specified for this item.
         /// </summary>
         [JsonIgnore]
-        public bool HasDescription {
-            get { return !String.IsNullOrWhiteSpace(Description); }
-        }
+        public bool HasDescription => !String.IsNullOrWhiteSpace(Description);
 
         /// <summary>
         /// Gets a reference to the selected <see cref="LinkPickerItem"/>.
@@ -74,18 +68,14 @@ public bool HasDescription {
         /// Gets whether a valid link has been specified for this item.
         /// </summary>
         [JsonIgnore]
-        public bool HasLink {
-            get { return Link != null && Link.IsValid; }
-        }
+        public bool HasLink => Link != null && Link.IsValid;
 
         /// <summary>
         /// Gets whether the item is valid. Since an item can exist without a title, description or link, but must have
         /// an image, this property equals calling <see cref="HasImage"/>.
         /// </summary>
         [JsonIgnore]
-        public bool IsValid {
-            get { return HasImage; }
-        }
+        public bool IsValid => HasImage;
 
         #endregion
 
@@ -100,7 +90,8 @@ public ImagePickerItem() {
         }
 
         /// <summary>
-        /// Initializes a new image picker item based on the specified <code>image</code>, <code>title</code>, <code>description</code> and <code>link</code>.
+        /// Initializes a new image picker item based on the specified <paramref name="image"/>, <paramref name="title"/>,
+        /// <paramref name="description"/> and <paramref name="link"/>.
         /// </summary>
         /// <param name="image">An instance of <see cref="IPublishedContent"/> representing the selected image.</param>
         /// <param name="title">The title of the item.</param>
@@ -133,7 +124,7 @@ protected ImagePickerItem(JObject obj) {
         /// Parses the specified <see cref="JObject"/> into an instance of <see cref="ImagePickerItem"/>.
         /// </summary>
         /// <param name="obj">The instance of <see cref="JObject"/> to be parsed.</param>
-        /// <returns>Returns an instance of <see cref="ImagePickerItem"/>, or <code>null</code> if <code>obj</code> is
+        /// <returns>An instance of <see cref="ImagePickerItem"/>, or <code>null</code> if <code>obj</code> is
         /// <code>null</code>.</returns>
         public static ImagePickerItem Parse(JObject obj) {
             return obj == null ? null : new ImagePickerItem(obj);

src/Skybrud.ImagePicker/ImagePickerList.cs

@@ -17,7 +17,7 @@ public class ImagePickerList {
         /// Gets a reference to the <see cref="JObject"/> the list was parsed from.
         /// </summary>
         [JsonIgnore]
-        public JObject JObject { get; private set; }
+        public JObject JObject { get; }
 
         /// <summary>
         /// Gets the title of the list.
@@ -29,9 +29,7 @@ public class ImagePickerList {
         /// Gets whether a title has been specified for the list.
         /// </summary>
         [JsonIgnore]
-        public bool HasTitle {
-            get { return !String.IsNullOrWhiteSpace(Title); }
-        }
+        public bool HasTitle => !String.IsNullOrWhiteSpace(Title);
 
         /// <summary>
         /// Gets an array of all valid items of the list.
@@ -43,25 +41,19 @@ public bool HasTitle {
         /// Gets whether the list hs any valid items.
         /// </summary>
         [JsonIgnore]
-        public bool HasItems {
-            get { return Items != null && Items.Any(); }
-        }
+        public bool HasItems => Items != null && Items.Any();
 
         /// <summary>
         /// Gets the total amount of items in the list.
         /// </summary>
         [JsonProperty("count")]
-        public int Count {
-            get { return Items.Length; }
-        }
+        public int Count => Items.Length;
 
         /// <summary>
         /// Gets whether the image picker list is valid (alias of <see cref="HasItems"/>).
         /// </summary>
         [JsonIgnore]
-        public bool IsValid {
-            get { return HasItems; }
-        }
+        public bool IsValid => HasItems;
 
         #endregion
 
@@ -93,18 +85,19 @@ protected ImagePickerList(JObject obj) {
         /// Parses the specified <see cref="JObject"/> into an instance of <see cref="ImagePickerList"/>.
         /// </summary>
         /// <param name="obj">The instance of <see cref="JObject"/> to be parsed.</param>
-        /// <returns>Returns an instance of <see cref="ImagePickerList"/>, or <code>null</code> if <code>obj</code> is
+        /// <returns>An instance of <see cref="ImagePickerList"/>, or <code>null</code> if <paramref name="obj"/> is
         /// <code>null</code>.</returns>
         public static ImagePickerList Parse(JObject obj) {
             return obj == null ? null : new ImagePickerList(obj);
         }
 
         /// <summary>
-        /// Parses the specified JSON <code>str</code> into an instance of <see cref="ImagePickerList"/>. If
-        /// <code>str</code> is not a valid JSON object, an empty instance of <see cref="ImagePickerList"/> will be returned instead.
+        /// Parses the specified JSON <paramref name="str"/> into an instance of <see cref="ImagePickerList"/>. If
+        /// <paramref name="str"/> is not a valid JSON object, an empty instance of <see cref="ImagePickerList"/> will
+        /// be returned instead.
         /// </summary>
         /// <param name="str">The JSON string to be parsed.</param>
-        /// <returns>Returns an instance of <see cref="ImagePickerList"/>.</returns>
+        /// <returns>An instance of <see cref="ImagePickerList"/>.</returns>
         public static ImagePickerList Deserialize(string str) {
             if (str == null) return new ImagePickerList();
             if (str.StartsWith("{") && str.EndsWith("}")) return Parse(JsonConvert.DeserializeObject<JObject>(str));