From 939fc8a92c38dd1448c0bf3ffec96e6f1d3116ab Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Tue, 5 May 2015 18:51:33 +1000
Subject: [PATCH] Changes ParameterEditorResolver to a Container resolver

---
 src/Umbraco.Core/CoreBootManager.cs                      | 2 +-
 .../PropertyEditors/ParameterEditorResolver.cs           | 9 +++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Umbraco.Core/CoreBootManager.cs b/src/Umbraco.Core/CoreBootManager.cs
index 7520698c89..3c4df27ba1 100644
--- a/src/Umbraco.Core/CoreBootManager.cs
+++ b/src/Umbraco.Core/CoreBootManager.cs
@@ -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
diff --git a/src/Umbraco.Core/PropertyEditors/ParameterEditorResolver.cs b/src/Umbraco.Core/PropertyEditors/ParameterEditorResolver.cs
index fa9feb3347..14d62d0700 100644
--- a/src/Umbraco.Core/PropertyEditors/ParameterEditorResolver.cs
+++ b/src/Umbraco.Core/PropertyEditors/ParameterEditorResolver.cs
@@ -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;
         }