From 92f983a569ce00b037e71744fe83fc3d9a7fdee5 Mon Sep 17 00:00:00 2001 From: "shannon@ShandemVaio" Date: Fri, 27 Jul 2012 06:02:41 +0600 Subject: [PATCH] Removed Freezing event as we won't need it --- .../Resolving/MultipleResolverBase.cs | 6 ++--- src/Umbraco.Core/Resolving/Resolution.cs | 4 +-- .../EnumerableExtensionsTests.cs | 25 +------------------ 3 files changed, 5 insertions(+), 30 deletions(-) diff --git a/src/Umbraco.Core/Resolving/MultipleResolverBase.cs b/src/Umbraco.Core/Resolving/MultipleResolverBase.cs index a6e0a86ab8..8fba742f58 100644 --- a/src/Umbraco.Core/Resolving/MultipleResolverBase.cs +++ b/src/Umbraco.Core/Resolving/MultipleResolverBase.cs @@ -49,7 +49,7 @@ namespace Umbraco.Core.Resolving using (new WriteLock(Lock)) { _resolved.Add(item); - } + } } public void Clear() @@ -58,7 +58,7 @@ namespace Umbraco.Core.Resolving using (new WriteLock(Lock)) { _resolved.Clear(); - } + } } public void Insert(int index, TResolved item) @@ -67,7 +67,7 @@ namespace Umbraco.Core.Resolving using (new WriteLock(Lock)) { _resolved.Insert(index, item); - } + } } } diff --git a/src/Umbraco.Core/Resolving/Resolution.cs b/src/Umbraco.Core/Resolving/Resolution.cs index ac0e419fcd..e53a1b46f3 100644 --- a/src/Umbraco.Core/Resolving/Resolution.cs +++ b/src/Umbraco.Core/Resolving/Resolution.cs @@ -9,7 +9,6 @@ namespace Umbraco.Core.Resolving internal class Resolution { - public static event EventHandler Freezing; public static event EventHandler Frozen; public static bool IsFrozen { get; private set; } @@ -24,8 +23,7 @@ namespace Umbraco.Core.Resolving { if (Resolution.IsFrozen) throw new InvalidOperationException("Resolution is frozen. It is not possible to freeze it again."); - if (Freezing != null) - Freezing(null, null); + IsFrozen = true; if (Frozen != null) Frozen(null, null); diff --git a/src/Umbraco.Tests/EnumerableExtensionsTests.cs b/src/Umbraco.Tests/EnumerableExtensionsTests.cs index e8a567c97c..9bacfeb39a 100644 --- a/src/Umbraco.Tests/EnumerableExtensionsTests.cs +++ b/src/Umbraco.Tests/EnumerableExtensionsTests.cs @@ -8,30 +8,7 @@ using Umbraco.Core.Resolving; namespace Umbraco.Tests { - [TestFixture] - public class MultipleResolverBaseTests - { - - internal class MyItemsResolver : MultipleResolverBase - { - public MyItemsResolver(IEnumerable initItems) - { - foreach(var i in initItems) - { - Add(i); - } - } - - public IEnumerable MyItems - { - get { return Values; } - } - } - - - } - - + [TestFixture] public class EnumerableExtensionsTests {