yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename WeightAttribute, change default to 100, cleanup

Browse Source
This commit is contained in:
Stephan
2016-11-24 18:13:05 +01:00
parent ed37b84b3b
commit 0179540023
9 changed files with 15 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Umbraco.Core/ObjectResolution/ManyObjectsResolverBase.cs
View File

@@ -23,7 +23,7 @@ namespace Umbraco.Core.ObjectResolution
private readonly List<Type> _instanceTypes = new List<Type>();
private IEnumerable<TResolved> _sortedValues;
private int _defaultPluginWeight = 10;
private int _defaultPluginWeight = 100;
#region Constructors
@@ -179,7 +179,7 @@ namespace Umbraco.Core.ObjectResolution
/// </summary>
/// <returns>The sorted resolved object instances.</returns>
/// <remarks>
/// <para>The order is based upon the <c>WeightedPluginAttribute</c> and <c>DefaultPluginWeight</c>.</para>
/// <para>The order is based upon the <c>WeightAttribute</c> and <c>DefaultPluginWeight</c>.</para>
/// <para>Weights are sorted ascendingly (lowest weights come first).</para>
/// </remarks>
protected IEnumerable<TResolved> GetSortedValues()
@@ -196,7 +196,7 @@ namespace Umbraco.Core.ObjectResolution
/// <summary>
/// Gets or sets the default type weight.
/// </summary>
/// <remarks>Determines the weight of types that do not have a <c>WeightedPluginAttribute</c> set on
/// <remarks>Determines the weight of types that do not have a <c>WeightAttribute</c> set on
/// them, when calling <c>GetSortedValues</c>.</remarks>
protected virtual int DefaultPluginWeight
{
@@ -212,7 +212,7 @@ namespace Umbraco.Core.ObjectResolution
protected virtual int GetObjectWeight(object o)
{
var type = o.GetType();
var attr = type.GetCustomAttribute<WeightedPluginAttribute>(true);
var attr = type.GetCustomAttribute<WeightAttribute>(true);
return attr == null ? DefaultPluginWeight : attr.Weight;
}