huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make ModelPropertyCollection inherit ReadOnlyCollection<T> 

Just some small cleanup. Did a search and all of our other custom List-ish
things inherit either Collection<T> or ReadOnlyCollection<T>.

Still no good solution for dictionaries.
This commit is contained in:
Ryan Nowak 2015-10-06 13:48:33 -07:00
parent 0dadf56fc8
commit d9e40d92de
1 changed files with 10 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/Microsoft.AspNet.Mvc.Abstractions/ModelBinding/ModelPropertyCollection.cs
View File

@ -2,50 +2,35 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq;
namespace Microsoft.AspNet.Mvc.ModelBinding namespace Microsoft.AspNet.Mvc.ModelBinding
{ {
/// <summary> /// <summary>
/// A read-only list of <see cref="ModelMetadata"/> objects which represent model properties. /// A read-only collection of <see cref="ModelMetadata"/> objects which represent model properties.
/// </summary> /// </summary>
public class ModelPropertyCollection : IReadOnlyList<ModelMetadata> public class ModelPropertyCollection : ReadOnlyCollection<ModelMetadata>
{ {
private readonly List<ModelMetadata> _properties;
/// <summary> /// <summary>
/// Creates a new <see cref="ModelPropertyCollection"/>. /// Creates a new <see cref="ModelPropertyCollection"/>.
/// </summary> /// </summary>
/// <param name="properties">The properties.</param> /// <param name="properties">The properties.</param>
public ModelPropertyCollection(IEnumerable<ModelMetadata> properties) public ModelPropertyCollection(IEnumerable<ModelMetadata> properties)
: base(properties.ToList())
{ {
if (properties == null)
{
throw new ArgumentNullException(nameof(properties));
}
_properties = new List<ModelMetadata>(properties);
}
/// <inheritdoc />
public ModelMetadata this[int index]
{
get
{
return _properties[index];
}
} }
/// <summary> /// <summary>
/// Gets a <see cref="ModelMetadata"/> instance for the property corresponding to <paramref name="propertyName"/>. /// Gets a <see cref="ModelMetadata"/> instance for the property corresponding to <paramref name="propertyName"/>.
/// </summary> /// </summary>
/// <param name="propertyName"> /// <param name="propertyName">
/// The property name. Property names are compared using <see cref="StringComparison.Ordinal"/> /// The property name. Property names are compared using <see cref="StringComparison.Ordinal"/>.
/// </param> /// </param>
/// <returns> /// <returns>
/// The <see cref="ModelMetadata"/> instance for the property specified by <paramref name="propertyName"/>, or null /// The <see cref="ModelMetadata"/> instance for the property specified by <paramref name="propertyName"/>, or
/// if no match can be found. /// <c>null</c> if no match can be found.
/// </returns> /// </returns>
public ModelMetadata this[string propertyName] public ModelMetadata this[string propertyName]
{ {
@ -56,8 +41,9 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
throw new ArgumentNullException(nameof(propertyName)); throw new ArgumentNullException(nameof(propertyName));
} }
foreach (var property in _properties) for (var i = 0; i < Items.Count; i++)
{ {
var property = Items[i];
if (string.Equals(property.PropertyName, propertyName, StringComparison.Ordinal)) if (string.Equals(property.PropertyName, propertyName, StringComparison.Ordinal))
{ {
return property; return property;
@ -67,26 +53,5 @@ namespace Microsoft.AspNet.Mvc.ModelBinding
return null; return null;
} }
} }
/// <inheritdoc />
public int Count
{
get
{
return _properties.Count;
}
}
/// <inheritdoc />
public IEnumerator<ModelMetadata> GetEnumerator()
{
return _properties.GetEnumerator();
}
/// <inheritdoc />
IEnumerator IEnumerable.GetEnumerator()
{
return GetEnumerator();
}
} }
} }