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

Changes ParameterEditorResolver to a Container resolver

Browse Source
This commit is contained in:
Shannon
2015-05-05 18:51:33 +10:00
parent 36f3948835
commit 939fc8a92c
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/CoreBootManager.cs
View File

@@ -322,7 +322,7 @@ namespace Umbraco.Core
Container, ProfilingLogger.Logger, () => PluginManager.ResolvePropertyEditors(),
manifestBuilder);
ParameterEditorResolver.Current = new ParameterEditorResolver(
ServiceProvider, ProfilingLogger.Logger, () => PluginManager.ResolveParameterEditors(),
Container, ProfilingLogger.Logger, () => PluginManager.ResolveParameterEditors(),
manifestBuilder);
//setup the validators resolver with our predefined validators

9
src/Umbraco.Core/PropertyEditors/ParameterEditorResolver.cs
View File

@@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Umbraco.Core.LightInject;
using Umbraco.Core.Logging;
using Umbraco.Core.Manifest;
using Umbraco.Core.ObjectResolution;
@@ -14,12 +15,12 @@ namespace Umbraco.Core.PropertyEditors
/// This resolver will contain any parameter editors defined in manifests as well as any property editors defined in manifests
/// that have the IsParameterEditorFlag = true and any PropertyEditors found in c# that have this flag as well.
/// </remarks>
internal class ParameterEditorResolver : LazyManyObjectsResolverBase<ParameterEditorResolver, IParameterEditor>
internal class ParameterEditorResolver : ContainerLazyManyObjectsResolver<ParameterEditorResolver, IParameterEditor>
{
private readonly ManifestBuilder _builder;
public ParameterEditorResolver(IServiceProvider serviceProvider, ILogger logger, Func<IEnumerable<Type>> typeListProducerList, ManifestBuilder builder)
: base(serviceProvider, logger, typeListProducerList, ObjectLifetimeScope.Application)
public ParameterEditorResolver(IServiceContainer container, ILogger logger, Func<IEnumerable<Type>> typeListProducerList, ManifestBuilder builder)
: base(container, logger, typeListProducerList, ObjectLifetimeScope.Application)
{
_builder = builder;
}