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

Rename FilterDescriptorComparer to FilterDescriptorOrderComparer

This commit is contained in:
Yishai Galatzer 2014-03-10 13:51:20 -07:00
parent 28e0792db6
commit 9d3e5b5a81
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Microsoft.AspNet.Mvc.Core/Filters/FilterDescriptor.cs
View File

@ -1,4 +1,6 @@
namespace Microsoft.AspNet.Mvc using System;
namespace Microsoft.AspNet.Mvc
{ {
public class FilterDescriptor public class FilterDescriptor
{ {

6
src/Microsoft.AspNet.Mvc.Core/Filters/FilterDescriptorComparer.cs → src/Microsoft.AspNet.Mvc.Core/Filters/FilterDescriptorOrderComparer.cs
View File

@ -2,11 +2,11 @@
namespace Microsoft.AspNet.Mvc namespace Microsoft.AspNet.Mvc
{ {
public class FilterDescriptorComparer : IComparer<FilterDescriptor> public class FilterDescriptorOrderComparer : IComparer<FilterDescriptor>
{ {
private static readonly FilterDescriptorComparer _comparer = new FilterDescriptorComparer(); private static readonly FilterDescriptorOrderComparer _comparer = new FilterDescriptorOrderComparer();
public static FilterDescriptorComparer Comparer { get { return _comparer; } } public static FilterDescriptorOrderComparer Comparer { get { return _comparer; } }
public int Compare([NotNull]FilterDescriptor x, [NotNull]FilterDescriptor y) public int Compare([NotNull]FilterDescriptor x, [NotNull]FilterDescriptor y)
{ {

4
src/Microsoft.AspNet.Mvc.Core/ReflectedActionDescriptorProvider.cs
View File

@ -53,7 +53,7 @@ namespace Microsoft.AspNet.Mvc
controllerAttributes.OfType<IFilter>() controllerAttributes.OfType<IFilter>()
.Select(filter => new FilterDescriptor(filter, FilterOrigin.Controller)) .Select(filter => new FilterDescriptor(filter, FilterOrigin.Controller))
.Concat(_globalFilters) .Concat(_globalFilters)
.OrderBy(d => d, FilterDescriptorComparer.Comparer) .OrderBy(d => d, FilterDescriptorOrderComparer.Comparer)
.ToArray(); .ToArray();
foreach (var methodInfo in cd.ControllerTypeInfo.DeclaredMethods) foreach (var methodInfo in cd.ControllerTypeInfo.DeclaredMethods)
@ -116,7 +116,7 @@ namespace Microsoft.AspNet.Mvc
var filtersFromAction = attributes.OfType<IFilter>().Select(filter => new FilterDescriptor(filter, FilterOrigin.Action)); var filtersFromAction = attributes.OfType<IFilter>().Select(filter => new FilterDescriptor(filter, FilterOrigin.Action));
ad.FilterDescriptors = filtersFromAction.Concat(globalAndControllerFilters) ad.FilterDescriptors = filtersFromAction.Concat(globalAndControllerFilters)
.OrderBy(d => d, FilterDescriptorComparer.Comparer) .OrderBy(d => d, FilterDescriptorOrderComparer.Comparer)
.ToList(); .ToList();
return ad; return ad;