Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewList.cs =================================================================== diff -u -r84a9db62e2fb9699c289b2df788b6d622e4f637a -r9b3ad522b72ddb7f06ce04cab7a0acb508c268bb --- Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewList.cs (.../ViewList.cs) (revision 84a9db62e2fb9699c289b2df788b6d622e4f637a) +++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewList.cs (.../ViewList.cs) (revision 9b3ad522b72ddb7f06ce04cab7a0acb508c268bb) @@ -76,8 +76,6 @@ public Action UpdateViewNameAction { get; set; } - public bool SkipChildItemEventBubbling { get; set; } - public IView ActiveView { get Index: Core/Common/src/Core.Common.Utils/Collections/Generic/EventedList.cs =================================================================== diff -u -rab0195c554a0abb5d15b06c995b696b97a61b3e9 -r9b3ad522b72ddb7f06ce04cab7a0acb508c268bb --- Core/Common/src/Core.Common.Utils/Collections/Generic/EventedList.cs (.../EventedList.cs) (revision ab0195c554a0abb5d15b06c995b696b97a61b3e9) +++ Core/Common/src/Core.Common.Utils/Collections/Generic/EventedList.cs (.../EventedList.cs) (revision 9b3ad522b72ddb7f06ce04cab7a0acb508c268bb) @@ -32,41 +32,8 @@ private PropertyChangedEventHandler Item_PropertyChangedDelegate; private NotifyCollectionChangingEventHandler Item_CollectionChangingDelegate; private NotifyCollectionChangedEventHandler Item_CollectionChangedDelegate; - private bool skipChildItemEventBubbling; public bool HasParent { get; set; } - bool INotifyCollectionChange.SkipChildItemEventBubbling - { - get - { - return skipChildItemEventBubbling; - } - set - { - if (skipChildItemEventBubbling == value) - { - return; - } - - skipChildItemEventBubbling = value; - - if (Count > 0) - { - foreach (var item in list) - { - if (value) - { - UnsubscribeEvents(item); - } - else - { - SubscribeEvents(item); - } - } - } - } - } - #region Constructors /// @@ -508,11 +475,6 @@ /// The item to detach the handlers from private void SubscribeEvents(object item) { - if (((INotifyCollectionChange) this).SkipChildItemEventBubbling) - { - return; - } - var notifyPropertyChange = item as INotifyPropertyChange; if (notifyPropertyChange != null) { Index: Core/Common/src/Core.Common.Utils/Collections/INotifyCollectionChange.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r9b3ad522b72ddb7f06ce04cab7a0acb508c268bb --- Core/Common/src/Core.Common.Utils/Collections/INotifyCollectionChange.cs (.../INotifyCollectionChange.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Common/src/Core.Common.Utils/Collections/INotifyCollectionChange.cs (.../INotifyCollectionChange.cs) (revision 9b3ad522b72ddb7f06ce04cab7a0acb508c268bb) @@ -2,7 +2,6 @@ { public interface INotifyCollectionChange : INotifyCollectionChanging, INotifyCollectionChanged { - // TODO: move to IEventedList! Not relevant for all INotifyCollectionChange - bool SkipChildItemEventBubbling { get; set; } + } } \ No newline at end of file Index: Core/Common/test/Core.Common.Utils.Tests/Collections/Generic/EventedListTest.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r9b3ad522b72ddb7f06ce04cab7a0acb508c268bb --- Core/Common/test/Core.Common.Utils.Tests/Collections/Generic/EventedListTest.cs (.../EventedListTest.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Common/test/Core.Common.Utils.Tests/Collections/Generic/EventedListTest.cs (.../EventedListTest.cs) (revision 9b3ad522b72ddb7f06ce04cab7a0acb508c268bb) @@ -230,18 +230,6 @@ public event NotifyCollectionChangingEventHandler CollectionChanging; #pragma warning restore 67 - - public bool SkipChildItemEventBubbling - { - get - { - throw new NotImplementedException(); - } - set - { - throw new NotImplementedException(); - } - } } private class MockClassWithTwoProperties : INotifyPropertyChange Index: Core/GIS/src/Core.GIS.SharpMap/Layers/GroupLayer.cs =================================================================== diff -u -rbd67946f192eeda84e18c1d2842b9f20e39dfaf8 -r9b3ad522b72ddb7f06ce04cab7a0acb508c268bb --- Core/GIS/src/Core.GIS.SharpMap/Layers/GroupLayer.cs (.../GroupLayer.cs) (revision bd67946f192eeda84e18c1d2842b9f20e39dfaf8) +++ Core/GIS/src/Core.GIS.SharpMap/Layers/GroupLayer.cs (.../GroupLayer.cs) (revision 9b3ad522b72ddb7f06ce04cab7a0acb508c268bb) @@ -216,8 +216,6 @@ } } - bool INotifyCollectionChange.SkipChildItemEventBubbling { get; set; } - public virtual IEnumerable GetAllLayers(bool includeGroupLayers) { return SharpMap.Map.Map.GetLayers(Layers, includeGroupLayers, true); Index: Core/GIS/src/Core.GIS.SharpMap/Map/Map.cs =================================================================== diff -u -rc9f937248bfbebc0373784594fb0e7bb5e2912bd -r9b3ad522b72ddb7f06ce04cab7a0acb508c268bb --- Core/GIS/src/Core.GIS.SharpMap/Map/Map.cs (.../Map.cs) (revision c9f937248bfbebc0373784594fb0e7bb5e2912bd) +++ Core/GIS/src/Core.GIS.SharpMap/Map/Map.cs (.../Map.cs) (revision 9b3ad522b72ddb7f06ce04cab7a0acb508c268bb) @@ -1736,8 +1736,6 @@ public virtual event NotifyCollectionChangedEventHandler CollectionChanged; public virtual event NotifyCollectionChangingEventHandler CollectionChanging; - bool INotifyCollectionChange.SkipChildItemEventBubbling { get; set; } - public virtual bool HasDefaultEnvelopeSet { get Index: Core/Plugins/test/Core.Plugins.CommonTools.Tests/TestViewList.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r9b3ad522b72ddb7f06ce04cab7a0acb508c268bb --- Core/Plugins/test/Core.Plugins.CommonTools.Tests/TestViewList.cs (.../TestViewList.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Plugins/test/Core.Plugins.CommonTools.Tests/TestViewList.cs (.../TestViewList.cs) (revision 9b3ad522b72ddb7f06ce04cab7a0acb508c268bb) @@ -37,20 +37,9 @@ } public int Count { get; private set; } + public bool IsReadOnly { get; private set; } - public bool SkipChildItemEventBubbling - { - get - { - throw new NotImplementedException(); - } - set - { - throw new NotImplementedException(); - } - } - public bool IgnoreActivation { get; set; } public IView ActiveView