Fisheye: Tag b26409726de6dd5db534791e43885dd29b7b09b8 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Utils/Collections/Generic/EventedList.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj
===================================================================
diff -u -ref35125104cc8b0201f9c961049cc6c8a30fb74d -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj	(.../Core.Common.Utils.csproj)	(revision ef35125104cc8b0201f9c961049cc6c8a30fb74d)
+++ Core/Common/src/Core.Common.Utils/Core.Common.Utils.csproj	(.../Core.Common.Utils.csproj)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -133,7 +133,6 @@
     <Compile Include="Validation\ValidationReport.cs" />
     <Compile Include="Validation\ValidationSeverity.cs" />
     <Compile Include="Reflection\AssemblyUtils.cs" />
-    <Compile Include="Collections\Generic\EventedList.cs" />
     <Compile Include="Collections\Generic\IEventedList.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
Index: Core/Common/test/Core.Common.Controls.Swf.Test/Table/TableViewTest.cs
===================================================================
diff -u -r9f917802e4ebd3c4c6681e7f42198d6e758cafed -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/Common/test/Core.Common.Controls.Swf.Test/Table/TableViewTest.cs	(.../TableViewTest.cs)	(revision 9f917802e4ebd3c4c6681e7f42198d6e758cafed)
+++ Core/Common/test/Core.Common.Controls.Swf.Test/Table/TableViewTest.cs	(.../TableViewTest.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -12,7 +12,6 @@
 using Core.Common.Controls.Swf.Table.Editors;
 using Core.Common.Controls.Swf.Test.Table.TestClasses;
 using Core.Common.TestUtil;
-using Core.Common.Utils.Collections.Generic;
 using Core.Common.Utils.Reflection;
 using DevExpress.XtraEditors.Repository;
 using DevExpress.XtraGrid.Columns;
@@ -522,7 +521,7 @@
             };
 
             // default items
-            var items = new EventedList<Item>
+            var items = new List<Item>
             {
                 new Item
                 {
@@ -573,7 +572,7 @@
             };
 
             // default items
-            var items = new EventedList<Item>
+            var items = new List<Item>
             {
                 new Item
                 {
@@ -629,7 +628,7 @@
             };
 
             // default items
-            var items = new EventedList<Item>
+            var items = new List<Item>
             {
                 new Item
                 {
Index: Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewControllerTest.cs
===================================================================
diff -u -r306a164c5ead734735facc944334f18d3c79a3be -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewControllerTest.cs	(.../TreeViewControllerTest.cs)	(revision 306a164c5ead734735facc944334f18d3c79a3be)
+++ Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewControllerTest.cs	(.../TreeViewControllerTest.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -4,7 +4,6 @@
 using System.Linq;
 using Core.Common.Controls.Swf.TreeViewControls;
 using Core.Common.Utils.Collections;
-using Core.Common.Utils.Collections.Generic;
 using Core.Common.Utils.Reflection;
 using NUnit.Framework;
 using Rhino.Mocks;
@@ -680,10 +679,10 @@
         {
             public Parent()
             {
-                Children = new EventedList<Child>();
+                Children = new List<Child>();
             }
 
-            public IEventedList<Child> Children { get; set; }
+            public List<Child> Children { get; set; }
 
             public string Name { get; set; }
         }
Index: Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewTest.cs
===================================================================
diff -u -r25019cc752a91361f32968c26d48064ed35a916c -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewTest.cs	(.../TreeViewTest.cs)	(revision 25019cc752a91361f32968c26d48064ed35a916c)
+++ Core/Common/test/Core.Common.Controls.Swf.Test/TreeViewControls/TreeViewTest.cs	(.../TreeViewTest.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -498,7 +498,7 @@
         {
             public Child()
             {
-                Children = new EventedList<Child>();
+                Children = new List<Child>();
             }
 
             public string Name { get; set; }
Fisheye: Tag b26409726de6dd5db534791e43885dd29b7b09b8 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Utils.Test/Collections/Generic/EventedListTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj
===================================================================
diff -u -refec4e46185ca0ddf371587a8783263ab26a316a -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj	(.../Core.Common.Utils.Test.csproj)	(revision efec4e46185ca0ddf371587a8783263ab26a316a)
+++ Core/Common/test/Core.Common.Utils.Test/Core.Common.Utils.Test.csproj	(.../Core.Common.Utils.Test.csproj)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -88,7 +88,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Collections\EnumerableExtensionsTest.cs" />
-    <Compile Include="Collections\Generic\EventedListTest.cs" />
     <Compile Include="ComparableExtensionsTest.cs" />
     <Compile Include="MathUtilsTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -153,6 +152,7 @@
   <ItemGroup>
     <None Include="Resources\acorn.png" />
   </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Core/GIS/src/Core.GIS.SharpMap.Api/Collections/EventedList.cs
===================================================================
diff -u
--- Core/GIS/src/Core.GIS.SharpMap.Api/Collections/EventedList.cs	(revision 0)
+++ Core/GIS/src/Core.GIS.SharpMap.Api/Collections/EventedList.cs	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -0,0 +1,490 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+
+using Core.Common.Utils;
+using Core.Common.Utils.Collections;
+using Core.Common.Utils.Collections.Generic;
+
+namespace Core.GIS.SharpMap.Api.Collections
+{
+    /// <summary>
+    /// A list that supports IEventedList so the outside world
+    /// can tell when changes occur
+    /// </summary>
+    /// <typeparam name="T">The type of element being stored in the list</typeparam>
+    [Serializable]
+    public class EventedList<T> : IEventedList<T>, IList, INotifyPropertyChange // TODO: move INotifyPropertyChanged to interface and fix aspect
+    {
+        public event NotifyCollectionChangingEventHandler CollectionChanging;
+        public event NotifyCollectionChangedEventHandler CollectionChanged;
+        public event PropertyChangingEventHandler PropertyChanging;
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        /// <summary>
+        /// The underlying storage
+        /// </summary>
+        private readonly List<T> list;
+
+        // re-use event delegates, for performance reasons (10x speedup at add/remove)
+        private PropertyChangingEventHandler Item_PropertyChangingDelegate;
+        private PropertyChangedEventHandler Item_PropertyChangedDelegate;
+        private NotifyCollectionChangedEventHandler Item_CollectionChangedDelegate;
+
+        #region Constructors
+
+        /// <summary>
+        /// Construct me
+        /// </summary>
+        public EventedList() : this(null) {}
+
+        /// <summary>
+        /// Construct me
+        /// </summary>
+        /// <param name="initialData">The initialization data</param>
+        public EventedList(IEnumerable<T> initialData)
+        {
+            list = initialData == null ? new List<T>() : new List<T>(initialData);
+
+            // subscribe to existing items
+            foreach (var o in list)
+            {
+                SubscribeEvents(o);
+            }
+        }
+
+        private void InitializeDelegates()
+        {
+            Item_PropertyChangedDelegate = Item_PropertyChanged;
+            Item_PropertyChangingDelegate = Item_PropertyChanging;
+            Item_CollectionChangedDelegate = Item_CollectionChanged;
+        }
+
+        #endregion
+
+        #region IList<T> Members
+
+        public int IndexOf(T item)
+        {
+            return list.IndexOf(item);
+        }
+
+        public void Insert(int index, T item)
+        {
+            CheckReadOnly();
+            if (!OnAdding(item, index))
+            {
+                return;
+            }
+            list.Insert(index, item);
+            OnAdded(item, index);
+        }
+
+        private void CheckReadOnly()
+        {
+            if (IsReadOnly)
+            {
+                throw new ReadOnlyException("Collection is read-only");
+            }
+        }
+
+        /// <summary>
+        /// Removes the first occurrence of a specific object from the <see cref="IList"/>.
+        /// </summary>
+        /// <param name="value">The <see cref="Object"/> to remove from the <see cref="IList"/>.</param>
+        /// <exception cref="NotSupportedException">The <see cref="IList"/> is read-only. 
+        /// -or- The <see cref="IList"/> has a fixed size.</exception>
+        public void Remove(object value)
+        {
+            Remove((T) value);
+        }
+
+        public void RemoveAt(int index)
+        {
+            CheckReadOnly();
+            var item = this[index];
+            if (!OnRemoving(item, index))
+            {
+                return;
+            }
+            list.RemoveAt(index);
+            OnRemoved(item, index);
+        }
+
+        /// <summary>
+        /// Gets or sets the element at the specified index.
+        /// </summary>
+        /// <returns>
+        /// The element at the specified index.
+        /// </returns>
+        /// <param name="index">The zero-based index of the element to get or set.</param>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="index"/> is not a valid index in the <see cref="IList"/>.</exception>
+        /// <exception cref="NotSupportedException">The property is set and the <see cref="IList"/> is read-only.</exception>
+        object IList.this[int index]
+        {
+            get
+            {
+                return this[index];
+            }
+            set
+            {
+                this[index] = (T) value;
+            }
+        }
+
+        public T this[int index]
+        {
+            get
+            {
+                return list[index];
+            }
+            set
+            {
+                CheckReadOnly();
+                var old = this[index];
+                if (!OnReplacing(old, index))
+                {
+                    return;
+                }
+                list[index] = value;
+                OnReplaced(value, old, index);
+            }
+        }
+
+        #endregion
+
+        #region ICollection<T> Members
+
+        public void Add(T item)
+        {
+            CheckReadOnly();
+            if (!OnAdding(item, Count))
+            {
+                return;
+            }
+            list.Add(item);
+            OnAdded(item, list.Count - 1);
+        }
+
+        /// <summary>
+        /// Adds an item to the <see cref="IList"/>.
+        /// </summary>
+        /// <returns>
+        /// The position into which the new element was inserted.
+        /// </returns>
+        /// <param name="value">The <see cref="Object"/> to add to the <see cref="IList"/>.</param>
+        /// <exception cref="NotSupportedException">The <see cref="IList"/> is read-only.-or- The <see cref="IList"/> has a fixed size.</exception>
+        int IList.Add(object value)
+        {
+            Add((T) value);
+            return Count - 1;
+        }
+
+        /// <summary>
+        /// Determines whether the <see cref="IList"/> contains a specific value.
+        /// </summary>
+        /// <returns>
+        /// true if the <see cref="Object"/> is found in the <see cref="IList"/>; otherwise, false.
+        /// </returns>
+        /// <param name="value">The <see cref="Object"/> to locate in the <see cref="IList"/>.</param>
+        public bool Contains(object value)
+        {
+            return value is T && Contains((T) value);
+        }
+
+        public void Clear()
+        {
+            CheckReadOnly();
+
+            while (list.Count != 0)
+            {
+                RemoveAt(list.Count - 1);
+            }
+        }
+
+        /// <summary>
+        /// Determines the index of a specific item in the <see cref="IList"/>.
+        /// </summary>
+        /// <returns>
+        /// The index of <paramref name="value"/> if found in the list; otherwise, -1.
+        /// </returns>
+        /// <param name="value">The <see cref="Object"/> to locate in the <see cref="IList"/>.</param>
+        public int IndexOf(object value)
+        {
+            return IndexOf((T) value);
+        }
+
+        /// <summary>
+        /// Inserts an item to the <see cref="IList"/> at the specified index.
+        /// </summary>
+        /// <param name="index">The zero-based index at which <paramref name="value"/> should be inserted.</param>
+        /// <param name="value">The <see cref="Object"/> to insert into the <see cref="IList"/>.</param>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="index"/> is not a valid index in the <see cref="IList"/>.</exception>
+        /// <exception cref="NotSupportedException">The <see cref="IList"/> is read-only.-or- The <see cref="IList"/> has a fixed size.</exception>
+        /// <exception cref="NullReferenceException"><paramref name="value"/> is null reference in the <see cref="IList"/>.</exception>
+        public void Insert(int index, object value)
+        {
+            Insert(index, (T) value);
+        }
+
+        public bool Contains(T item)
+        {
+            return list.Contains(item);
+        }
+
+        public void CopyTo(T[] array, int arrayIndex)
+        {
+            list.CopyTo(array, arrayIndex);
+        }
+
+        /// <summary>
+        /// Copies the elements of the <see cref="ICollection"/> to an <see cref="Array"/>, starting at a particular <see cref="Array"/> index.
+        /// </summary>
+        /// <param name="array">The one-dimensional <see cref="Array"/> that is the destination of the elements copied from <see cref="ICollection"/>. The <see cref="Array"/> must have zero-based indexing.</param>
+        /// <param name="index">The zero-based index in <paramref name="array"/> at which copying begins.</param>
+        /// <exception cref="ArgumentNullException"><paramref name="array"/> is null.</exception>
+        /// <exception cref="ArgumentOutOfRangeException"><paramref name="index"/> is less than zero.</exception>
+        /// <exception cref="ArgumentException"><paramref name="array"/> is multidimensional.-or- <paramref name="index"/> is equal to or greater than the length of <paramref name="array"/>.-or- The number of elements in the source <see cref="ICollection"/> is greater than the available space from <paramref name="index"/> to the end of the destination <paramref name="array"/>.</exception>
+        /// <exception cref="ArgumentException">The type of the source <see cref="ICollection"/> cannot be cast automatically to the type of the destination <paramref name="array"/>.</exception>
+        public void CopyTo(Array array, int index)
+        {
+            var i = 0;
+            foreach (var o in list)
+            {
+                if (i >= index)
+                {
+                    array.SetValue(o, i);
+                }
+
+                i++;
+            }
+        }
+
+        public virtual int Count
+        {
+            get
+            {
+                return list.Count;
+            }
+        }
+
+        public object SyncRoot { get; private set; }
+
+        public bool IsSynchronized { get; private set; }
+
+        public bool IsReadOnly
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        /// <summary>
+        /// Gets a value indicating whether the <see cref="IList"/> has a fixed size.
+        /// </summary>
+        /// <returns>
+        /// true if the <see cref="IList"/> has a fixed size; otherwise, false.
+        /// </returns>
+        public bool IsFixedSize
+        {
+            get
+            {
+                return false;
+            }
+        }
+
+        public bool Remove(T item)
+        {
+            CheckReadOnly();
+            var index = list.IndexOf(item);
+            if (index == -1)
+            {
+                return false;
+            }
+
+            if (!OnRemoving(item, index))
+            {
+                return false;
+            }
+            if (list.Remove(item))
+            {
+                OnRemoved(item, index);
+                return true;
+            }
+            return false;
+        }
+
+        #endregion
+
+        #region IEnumerable<T> Members
+
+        public void AddRange(IEnumerable<T> enumerable)
+        {
+            foreach (var o in enumerable)
+            {
+                Add(o);
+            }
+        }
+
+        public IEnumerator<T> GetEnumerator()
+        {
+            return list.GetEnumerator();
+        }
+
+        IEnumerator IEnumerable.GetEnumerator()
+        {
+            return list.GetEnumerator();
+        }
+
+        #endregion
+
+        #region IEventedList Helpers
+
+        protected virtual bool OnRemoving(T item, int index)
+        {
+            return FireCollectionChangingEvent(NotifyCollectionChangeAction.Remove, item, index);
+        }
+
+        private bool OnReplacing(T item, int index)
+        {
+            return FireCollectionChangingEvent(NotifyCollectionChangeAction.Replace, item, index);
+        }
+
+        protected virtual bool OnAdding(T item, int index)
+        {
+            return FireCollectionChangingEvent(NotifyCollectionChangeAction.Add, item, index);
+        }
+
+        private void OnReplaced(object item, object oldItem, int index)
+        {
+            UnsubscribeEvents(oldItem);
+            SubscribeEvents(item);
+            FireCollectionChangedEvent(NotifyCollectionChangeAction.Replace, item, index, oldItem);
+        }
+
+        private void OnAdded(object item, int index)
+        {
+            SubscribeEvents(item);
+            FireCollectionChangedEvent(NotifyCollectionChangeAction.Add, item, index);
+        }
+
+        private void OnRemoved(T item, int index)
+        {
+            UnsubscribeEvents(item);
+            FireCollectionChangedEvent(NotifyCollectionChangeAction.Remove, item, index);
+        }
+
+        private bool FireCollectionChangingEvent(NotifyCollectionChangeAction action, T item, int index)
+        {
+            if (CollectionChanging != null)
+            {
+                var args = new NotifyCollectionChangingEventArgs(action, item, index, -1);
+
+                try
+                {
+                    CollectionChanging(this, args);
+                }
+                catch
+                {
+                    throw;
+                }
+
+                return !args.Cancel;
+            }
+
+            return true;
+        }
+
+        private void FireCollectionChangedEvent(NotifyCollectionChangeAction action, object item, int index, object oldItem = null)
+        {
+            if (CollectionChanged != null)
+            {
+                var args = new NotifyCollectionChangingEventArgs(action, item, index, -1)
+                {
+                    OldItem = oldItem
+                };
+                CollectionChanged(this, args);
+            }
+        }
+
+        private void Item_CollectionChanged(object sender, NotifyCollectionChangingEventArgs e)
+        {
+            // forwards event to subscribers of the list
+            if (CollectionChanged != null)
+            {
+                CollectionChanged(sender, e);
+            }
+        }
+
+        private void Item_PropertyChanging(object sender, PropertyChangingEventArgs e)
+        {
+            // forwards event to subscribers of the list
+            if (PropertyChanging != null)
+            {
+                PropertyChanging(sender, e);
+            }
+        }
+
+        private void Item_PropertyChanged(object sender, PropertyChangedEventArgs e)
+        {
+            // forwards event to subscribers of the list
+            if (PropertyChanged != null)
+            {
+                PropertyChanged(sender, e);
+            }
+        }
+
+        /// <summary>
+        /// Unsubscribes PropertyChanged and CollectionChanged handlers it item supports them.
+        /// </summary>
+        /// <param name="item">The item to detach the handlers from</param>
+        private void UnsubscribeEvents(object item)
+        {
+            var notifyPropertyChange = item as INotifyPropertyChange;
+            if (notifyPropertyChange != null)
+            {
+                notifyPropertyChange.PropertyChanging -= Item_PropertyChangingDelegate;
+                notifyPropertyChange.PropertyChanged -= Item_PropertyChangedDelegate;
+            }
+
+            var notifyCollectionChange = item as INotifyCollectionChange;
+            if (notifyCollectionChange != null)
+            {
+                notifyCollectionChange.CollectionChanged -= Item_CollectionChangedDelegate;
+            }
+        }
+
+        /// <summary>
+        /// Subscribes PropertyChanged and CollectionChanged it item supports them
+        /// </summary>
+        /// <param name="item">The item to detach the handlers from</param>
+        private void SubscribeEvents(object item)
+        {
+            var notifyPropertyChange = item as INotifyPropertyChange;
+            if (notifyPropertyChange != null)
+            {
+                if (Item_PropertyChangedDelegate == null)
+                {
+                    InitializeDelegates();
+                }
+                notifyPropertyChange.PropertyChanged += Item_PropertyChangedDelegate;
+                notifyPropertyChange.PropertyChanging += Item_PropertyChangingDelegate;
+            }
+
+            var notifyCollectionChanged = item as INotifyCollectionChange;
+            if (notifyCollectionChanged != null)
+            {
+                if (Item_PropertyChangedDelegate == null)
+                {
+                    InitializeDelegates();
+                }
+                notifyCollectionChanged.CollectionChanged += Item_CollectionChangedDelegate;
+            }
+        }
+
+        #endregion
+    }
+}
\ No newline at end of file
Index: Core/GIS/src/Core.GIS.SharpMap.Api/Core.GIS.SharpMap.Api.csproj
===================================================================
diff -u -r3f1a2b8718a744b49b160c89df46dee6b7fb5fdd -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/GIS/src/Core.GIS.SharpMap.Api/Core.GIS.SharpMap.Api.csproj	(.../Core.GIS.SharpMap.Api.csproj)	(revision 3f1a2b8718a744b49b160c89df46dee6b7fb5fdd)
+++ Core/GIS/src/Core.GIS.SharpMap.Api/Core.GIS.SharpMap.Api.csproj	(.../Core.GIS.SharpMap.Api.csproj)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -47,9 +47,11 @@
   <ItemGroup>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Collections\EventedList.cs" />
     <Compile Include="Delegates\AddRelatedFeature.cs" />
     <Compile Include="Editors\FallOffType.cs" />
     <Compile Include="Delegates\GetLabelMethod.cs" />
Index: Core/GIS/src/Core.GIS.SharpMap.Api/IMap.cs
===================================================================
diff -u -rc9f937248bfbebc0373784594fb0e7bb5e2912bd -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/GIS/src/Core.GIS.SharpMap.Api/IMap.cs	(.../IMap.cs)	(revision c9f937248bfbebc0373784594fb0e7bb5e2912bd)
+++ Core/GIS/src/Core.GIS.SharpMap.Api/IMap.cs	(.../IMap.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Drawing2D;
-using Core.Common.Utils.Collections.Generic;
 using Core.GIS.GeoAPI.CoordinateSystems;
 using Core.GIS.GeoAPI.Extensions.Feature;
 using Core.GIS.GeoAPI.Geometries;
+using Core.GIS.SharpMap.Api.Collections;
 using Core.GIS.SharpMap.Api.Delegates;
 using Core.GIS.SharpMap.Api.Layers;
 
Index: Core/GIS/src/Core.GIS.SharpMap.Api/ITheme.cs
===================================================================
diff -u -r29074485032e73e932140ea9980c21d929e4dc08 -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/GIS/src/Core.GIS.SharpMap.Api/ITheme.cs	(.../ITheme.cs)	(revision 29074485032e73e932140ea9980c21d929e4dc08)
+++ Core/GIS/src/Core.GIS.SharpMap.Api/ITheme.cs	(.../ITheme.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -18,8 +18,8 @@
 using System;
 using System.Drawing;
 using Core.Common.Utils;
-using Core.Common.Utils.Collections.Generic;
 using Core.GIS.GeoAPI.Extensions.Feature;
+using Core.GIS.SharpMap.Api.Collections;
 
 namespace Core.GIS.SharpMap.Api
 {
Index: Core/GIS/src/Core.GIS.SharpMap.Api/Layers/IGroupLayer.cs
===================================================================
diff -u -rbd67946f192eeda84e18c1d2842b9f20e39dfaf8 -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/GIS/src/Core.GIS.SharpMap.Api/Layers/IGroupLayer.cs	(.../IGroupLayer.cs)	(revision bd67946f192eeda84e18c1d2842b9f20e39dfaf8)
+++ Core/GIS/src/Core.GIS.SharpMap.Api/Layers/IGroupLayer.cs	(.../IGroupLayer.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -1,5 +1,5 @@
 using Core.Common.Utils.Collections;
-using Core.Common.Utils.Collections.Generic;
+using Core.GIS.SharpMap.Api.Collections;
 
 namespace Core.GIS.SharpMap.Api.Layers
 {
Index: Core/GIS/src/Core.GIS.SharpMap.UI/Forms/MapControl.cs
===================================================================
diff -u -r10b304d4b5cb2283801cdb16204baf2a42ab5967 -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/GIS/src/Core.GIS.SharpMap.UI/Forms/MapControl.cs	(.../MapControl.cs)	(revision 10b304d4b5cb2283801cdb16204baf2a42ab5967)
+++ Core/GIS/src/Core.GIS.SharpMap.UI/Forms/MapControl.cs	(.../MapControl.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -7,9 +7,9 @@
 using System.Windows.Forms;
 using Core.Common.Utils;
 using Core.Common.Utils.Collections;
-using Core.Common.Utils.Collections.Generic;
 using Core.GIS.GeoAPI.Extensions.Feature;
 using Core.GIS.SharpMap.Api;
+using Core.GIS.SharpMap.Api.Collections;
 using Core.GIS.SharpMap.Api.Editors;
 using Core.GIS.SharpMap.Api.Layers;
 using Core.GIS.SharpMap.Styles;
Index: Core/GIS/src/Core.GIS.SharpMap/Layers/GroupLayer.cs
===================================================================
diff -u -r9b3ad522b72ddb7f06ce04cab7a0acb508c268bb -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/GIS/src/Core.GIS.SharpMap/Layers/GroupLayer.cs	(.../GroupLayer.cs)	(revision 9b3ad522b72ddb7f06ce04cab7a0acb508c268bb)
+++ Core/GIS/src/Core.GIS.SharpMap/Layers/GroupLayer.cs	(.../GroupLayer.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -21,10 +21,10 @@
 using System.Drawing;
 using System.Linq;
 using Core.Common.Utils.Collections;
-using Core.Common.Utils.Collections.Generic;
 using Core.GIS.GeoAPI.Geometries;
 using Core.GIS.NetTopologySuite.Geometries;
 using Core.GIS.SharpMap.Api;
+using Core.GIS.SharpMap.Api.Collections;
 using Core.GIS.SharpMap.Api.Layers;
 
 namespace Core.GIS.SharpMap.Layers
Index: Core/GIS/src/Core.GIS.SharpMap/Map/Map.cs
===================================================================
diff -u -ref35125104cc8b0201f9c961049cc6c8a30fb74d -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/GIS/src/Core.GIS.SharpMap/Map/Map.cs	(.../Map.cs)	(revision ef35125104cc8b0201f9c961049cc6c8a30fb74d)
+++ Core/GIS/src/Core.GIS.SharpMap/Map/Map.cs	(.../Map.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -26,14 +26,14 @@
 using Core.Common.Base;
 using Core.Common.Utils;
 using Core.Common.Utils.Collections;
-using Core.Common.Utils.Collections.Generic;
 using Core.Common.Utils.Drawing;
 using Core.GIS.GeoAPI.CoordinateSystems;
 using Core.GIS.GeoAPI.Extensions.Feature;
 using Core.GIS.GeoAPI.Geometries;
 using Core.GIS.NetTopologySuite.Extensions.Features;
 using Core.GIS.NetTopologySuite.Geometries;
 using Core.GIS.SharpMap.Api;
+using Core.GIS.SharpMap.Api.Collections;
 using Core.GIS.SharpMap.Api.Delegates;
 using Core.GIS.SharpMap.Api.Layers;
 using Core.GIS.SharpMap.CoordinateSystems;
Index: Core/GIS/src/Core.GIS.SharpMap/Rendering/Thematics/CategorialTheme.cs
===================================================================
diff -u -r65830e2ebd2c65f1994385223680ccd54aad0ad8 -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/GIS/src/Core.GIS.SharpMap/Rendering/Thematics/CategorialTheme.cs	(.../CategorialTheme.cs)	(revision 65830e2ebd2c65f1994385223680ccd54aad0ad8)
+++ Core/GIS/src/Core.GIS.SharpMap/Rendering/Thematics/CategorialTheme.cs	(.../CategorialTheme.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -2,10 +2,10 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using Core.Common.Utils.Collections.Generic;
 using Core.GIS.GeoAPI.Extensions.Feature;
 using Core.GIS.NetTopologySuite.Extensions.Features;
 using Core.GIS.SharpMap.Api;
+using Core.GIS.SharpMap.Api.Collections;
 using Core.GIS.SharpMap.Styles;
 
 namespace Core.GIS.SharpMap.Rendering.Thematics
Index: Core/GIS/src/Core.GIS.SharpMap/Rendering/Thematics/CustomTheme.cs
===================================================================
diff -u -ra60bbf1de4ed3d809e8325c0b7359f7786f4a16d -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/GIS/src/Core.GIS.SharpMap/Rendering/Thematics/CustomTheme.cs	(.../CustomTheme.cs)	(revision a60bbf1de4ed3d809e8325c0b7359f7786f4a16d)
+++ Core/GIS/src/Core.GIS.SharpMap/Rendering/Thematics/CustomTheme.cs	(.../CustomTheme.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -18,9 +18,9 @@
 using System;
 using System.ComponentModel;
 using System.Drawing;
-using Core.Common.Utils.Collections.Generic;
 using Core.GIS.GeoAPI.Extensions.Feature;
 using Core.GIS.SharpMap.Api;
+using Core.GIS.SharpMap.Api.Collections;
 
 namespace Core.GIS.SharpMap.Rendering.Thematics
 {
Index: Core/GIS/src/Core.GIS.SharpMap/Rendering/Thematics/Theme.cs
===================================================================
diff -u -r8fdd5ce0ff4590589a7671851030fccc511f2bd0 -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/GIS/src/Core.GIS.SharpMap/Rendering/Thematics/Theme.cs	(.../Theme.cs)	(revision 8fdd5ce0ff4590589a7671851030fccc511f2bd0)
+++ Core/GIS/src/Core.GIS.SharpMap/Rendering/Thematics/Theme.cs	(.../Theme.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -2,9 +2,9 @@
 using System.Collections;
 using System.ComponentModel;
 using System.Drawing;
-using Core.Common.Utils.Collections.Generic;
 using Core.GIS.GeoAPI.Extensions.Feature;
 using Core.GIS.SharpMap.Api;
+using Core.GIS.SharpMap.Api.Collections;
 
 namespace Core.GIS.SharpMap.Rendering.Thematics
 {
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Collections/EventedListTest.cs
===================================================================
diff -u
--- Core/GIS/test/Core.GIS.SharpMap.Test/Collections/EventedListTest.cs	(revision 0)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Collections/EventedListTest.cs	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -0,0 +1,264 @@
+using System.ComponentModel;
+using System.Linq;
+
+using Core.Common.TestUtil;
+using Core.Common.Utils;
+using Core.Common.Utils.Collections;
+using Core.GIS.SharpMap.Api.Collections;
+
+using NUnit.Framework;
+
+namespace Core.GIS.SharpMap.Test.Collections
+{
+    [TestFixture]
+    public class EventedListTest
+    {
+        [SetUp]
+        public void SetUp()
+        {
+            LogHelper.ConfigureLogging();
+        }
+
+        [Test]
+        public void CollectionChangedWhenValueIsAdded()
+        {
+            var eventedList = new EventedList<object>();
+            var callCount = 0;
+            var item = new object();
+            eventedList.CollectionChanged += delegate(object sender, NotifyCollectionChangingEventArgs e)
+            {
+                Assert.AreEqual(eventedList, sender);
+                Assert.AreEqual(item, e.Item);
+                callCount++;
+            };
+            eventedList.Add(item);
+            Assert.AreEqual(1, callCount);
+        }
+
+        [Test]
+        public void CollectionChangedWhenValueIsRemoved()
+        {
+            var eventedList = new EventedList<int>();
+
+            var called = false;
+            eventedList.Add(1);
+            eventedList.CollectionChanged += delegate { called = true; };
+            eventedList.Remove(1);
+            Assert.IsTrue(called);
+        }
+
+        [Test]
+        public void ItemReplaced()
+        {
+            var eventedList = new EventedList<int>();
+
+            var called = false;
+            eventedList.Add(1);
+            eventedList.CollectionChanged += delegate { called = true; };
+            eventedList[0] = 2;
+            Assert.IsTrue(called);
+        }
+
+        [Test]
+        public void UnsubscribeFromOldItemOnReplace()
+        {
+            var eventedList = new EventedList<MockClassWithTwoProperties>();
+
+            var aPropertyChangeCount = 0;
+            var listPropertyChangeCount = 0;
+
+            var a = new MockClassWithTwoProperties
+            {
+                StringProperty = "a"
+            };
+
+            eventedList.Add(a);
+
+            eventedList.PropertyChanged += delegate { listPropertyChangeCount++; };
+            a.PropertyChanged += delegate { aPropertyChangeCount++; };
+
+            // replace item
+            eventedList[0] = new MockClassWithTwoProperties
+            {
+                StringProperty = "second a"
+            };
+
+            a.StringProperty = "a2";
+
+            Assert.AreEqual(0, listPropertyChangeCount);
+            Assert.AreEqual(1, aPropertyChangeCount);
+        }
+
+        [Test]
+        public void UnsubscribeFromRemovedItems()
+        {
+            var eventedList = new EventedList<MockClassWithTwoProperties>();
+
+            var aPropertyChangeCount = 0;
+            var listPropertyChangeCount = 0;
+
+            var a = new MockClassWithTwoProperties
+            {
+                StringProperty = "a"
+            };
+
+            eventedList.Add(a);
+
+            eventedList.PropertyChanged += delegate { listPropertyChangeCount++; };
+            a.PropertyChanged += delegate { aPropertyChangeCount++; };
+
+            // replace item
+            eventedList.Remove(a);
+
+            a.StringProperty = "a2";
+
+            Assert.AreEqual(0, listPropertyChangeCount);
+            Assert.AreEqual(1, aPropertyChangeCount);
+        }
+
+        [Test]
+        public void AddRangeTest()
+        {
+            var eventedList = new EventedList<int>();
+
+            //keep record of number of collectionchanges.
+            var i = 0;
+            eventedList.CollectionChanged += delegate { i++; };
+
+            //add three integers to the list.
+            eventedList.AddRange(new[]
+            {
+                1,
+                2,
+                3
+            });
+
+            //three collectionchanged events will be generated.
+            Assert.AreEqual(3, i);
+
+            //check if items where added to the list.
+            Assert.IsTrue(eventedList.SequenceEqual(new[]
+            {
+                1,
+                2,
+                3
+            }));
+        }
+
+        [Test]
+        public void ContainsShouldWorkForObjectsOfADifferentType()
+        {
+            var doubleList = new EventedList<double>
+            {
+                1.0, 2.0
+            };
+            Assert.IsFalse(doubleList.Contains("This must return false"));
+        }
+
+        [Test]
+        public void ListShouldSubscribeToPropertyChangesInChildObjectAfterAddRange()
+        {
+            var eventedList = new EventedList<MockClassWithTwoProperties>();
+
+            //add three integers to the list.
+            var properties = new MockClassWithTwoProperties();
+            eventedList.AddRange(new[]
+            {
+                properties
+            });
+
+            object theSender = null;
+            PropertyChangedEventArgs theEventArgs = null;
+            eventedList.PropertyChanged += delegate(object sender, PropertyChangedEventArgs e)
+            {
+                theSender = sender;
+                theEventArgs = e;
+            };
+            properties.StringProperty = "iets";
+            Assert.AreEqual(properties, theSender);
+            Assert.AreEqual("StringProperty", theEventArgs.PropertyName);
+        }
+
+        [Test]
+        public void ListShouldSubscribeToPropertyChangesInChildObjectAfterAdd()
+        {
+            var eventedList = new EventedList<MockClassWithTwoProperties>();
+
+            //add three integers to the list.
+            var properties = new MockClassWithTwoProperties();
+            eventedList.Add(properties);
+
+            object theSender = null;
+            PropertyChangedEventArgs theEventArgs = null;
+            eventedList.PropertyChanged += delegate(object sender, PropertyChangedEventArgs e)
+            {
+                theSender = sender;
+                theEventArgs = e;
+            };
+            properties.StringProperty = "iets";
+            Assert.AreEqual(properties, theSender);
+            Assert.AreEqual("StringProperty", theEventArgs.PropertyName);
+        }
+
+        [Test]
+        public void EventSubscriptionShouldBeFast()
+        {
+            var eventedList = new EventedList<MockWithPropertyAndCollectionChange>();
+
+            // warm-up
+            for (var i = 0; i < 50; i++)
+            {
+                eventedList.Add(new MockWithPropertyAndCollectionChange());
+            }
+
+            TestHelper.AssertIsFasterThan(250, () =>
+            {
+                for (var i = 0; i < 20000; i++)
+                {
+                    eventedList.Add(new MockWithPropertyAndCollectionChange());
+                }
+            });
+        }
+
+        private class MockWithPropertyAndCollectionChange : INotifyPropertyChange, INotifyCollectionChange
+        {
+            // Required by interface, but not used (yet)
+#pragma warning disable 67
+            public event PropertyChangingEventHandler PropertyChanging;
+
+            public event PropertyChangedEventHandler PropertyChanged;
+
+            public event NotifyCollectionChangedEventHandler CollectionChanged;
+
+            public event NotifyCollectionChangingEventHandler CollectionChanging;
+#pragma warning restore 67
+        }
+
+        private class MockClassWithTwoProperties : INotifyPropertyChange
+        {
+            private string stringField;
+            public event PropertyChangedEventHandler PropertyChanged;
+            public event PropertyChangingEventHandler PropertyChanging;
+
+            public string StringProperty
+            {
+                get
+                {
+                    return stringField;
+                }
+                set
+                {
+                    if (PropertyChanging != null)
+                    {
+                        PropertyChanging(this, new PropertyChangingEventArgs("StringProperty"));
+                    }
+                    stringField = value;
+                    if (PropertyChanged != null)
+                    {
+                        PropertyChanged(this, new PropertyChangedEventArgs("StringProperty"));
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Core.GIS.SharpMap.Test.csproj
===================================================================
diff -u -rd6e6eadf4a2521df75b6d371bacbb181a43058a3 -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/GIS/test/Core.GIS.SharpMap.Test/Core.GIS.SharpMap.Test.csproj	(.../Core.GIS.SharpMap.Test.csproj)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Core.GIS.SharpMap.Test.csproj	(.../Core.GIS.SharpMap.Test.csproj)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -102,6 +102,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Collections\EventedListTest.cs" />
     <Compile Include="Converters\WKB\WKBTests.cs" />
     <Compile Include="Converters\WKT\WktGeometryTests.cs" />
     <Compile Include="CoordinateSystems\CoordinateSystemValidatorTest.cs" />
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/FeatureCollectionTest.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/FeatureCollectionTest.cs	(.../FeatureCollectionTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/FeatureCollectionTest.cs	(.../FeatureCollectionTest.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.ComponentModel;
 using Core.Common.Utils;
-using Core.Common.Utils.Collections.Generic;
 using Core.GIS.GeoAPI.Extensions.Feature;
 using Core.GIS.GeoAPI.Geometries;
 using Core.GIS.NetTopologySuite.Extensions.Features;
 using Core.GIS.NetTopologySuite.Geometries;
+using Core.GIS.SharpMap.Api.Collections;
 using Core.GIS.SharpMap.Data.Providers;
 using NUnit.Framework;
 
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/FeatureProviderTest.cs
===================================================================
diff -u -rd6e6eadf4a2521df75b6d371bacbb181a43058a3 -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/FeatureProviderTest.cs	(.../FeatureProviderTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Data/Providers/FeatureProviderTest.cs	(.../FeatureProviderTest.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -1,5 +1,5 @@
-using Core.Common.Utils.Collections.Generic;
-using Core.GIS.GeoAPI.Geometries;
+using Core.GIS.GeoAPI.Geometries;
+using Core.GIS.SharpMap.Api.Collections;
 using Core.GIS.SharpMap.Converters.WellKnownText;
 using Core.GIS.SharpMap.Data.Providers;
 using Core.GIS.SharpMap.Layers;
Index: Core/GIS/test/Core.GIS.SharpMap.Test/MapTest.cs
===================================================================
diff -u -rd6e6eadf4a2521df75b6d371bacbb181a43058a3 -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/GIS/test/Core.GIS.SharpMap.Test/MapTest.cs	(.../MapTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/MapTest.cs	(.../MapTest.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -5,12 +5,12 @@
 using System.Drawing;
 using System.Linq;
 using Core.Common.TestUtil;
-using Core.Common.Utils.Collections.Generic;
 using Core.Common.Utils.Reflection;
 using Core.GIS.GeoAPI.Geometries;
 using Core.GIS.NetTopologySuite.Extensions.Features;
 using Core.GIS.NetTopologySuite.Geometries;
 using Core.GIS.SharpMap.Api;
+using Core.GIS.SharpMap.Api.Collections;
 using Core.GIS.SharpMap.Api.Layers;
 using Core.GIS.SharpMap.Converters.WellKnownText;
 using Core.GIS.SharpMap.Data.Providers;
Index: Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/CategorialThemeTest.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/CategorialThemeTest.cs	(.../CategorialThemeTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/GIS/test/Core.GIS.SharpMap.Test/Rendering/Thematics/CategorialThemeTest.cs	(.../CategorialThemeTest.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -1,8 +1,8 @@
 using System;
 using System.ComponentModel;
 using System.Drawing;
-using Core.Common.Utils.Collections.Generic;
 using Core.GIS.SharpMap.Api;
+using Core.GIS.SharpMap.Api.Collections;
 using Core.GIS.SharpMap.Rendering.Thematics;
 using Core.GIS.SharpMap.Styles;
 using NUnit.Framework;
Index: Core/GIS/test/Core.GIS.SharpMap.UI.Test/MapLayerProviderHelperTest.cs
===================================================================
diff -u -rad6f88d1d7b21f950588f6109b79fe007aab0c9e -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/GIS/test/Core.GIS.SharpMap.UI.Test/MapLayerProviderHelperTest.cs	(.../MapLayerProviderHelperTest.cs)	(revision ad6f88d1d7b21f950588f6109b79fe007aab0c9e)
+++ Core/GIS/test/Core.GIS.SharpMap.UI.Test/MapLayerProviderHelperTest.cs	(.../MapLayerProviderHelperTest.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using Core.Common.Gui;
 using Core.Common.Utils.Collections;
-using Core.Common.Utils.Collections.Generic;
 using Core.GIS.SharpMap.Api;
+using Core.GIS.SharpMap.Api.Collections;
 using Core.GIS.SharpMap.Api.Layers;
 using Core.GIS.SharpMap.Layers;
 using NUnit.Framework;
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapViewTabControl.cs
===================================================================
diff -u -rfefc0cc505a41a79d4643c80335484daf4ca30ce -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapViewTabControl.cs	(.../MapViewTabControl.cs)	(revision fefc0cc505a41a79d4643c80335484daf4ca30ce)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapViewTabControl.cs	(.../MapViewTabControl.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -7,6 +7,8 @@
 using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.Common.Utils.Collections.Generic;
+using Core.GIS.SharpMap.Api.Collections;
+
 using Xceed.Wpf.AvalonDock;
 using Xceed.Wpf.AvalonDock.Layout;
 
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/VectorLayerAttributeTableView.cs
===================================================================
diff -u -rc3dd2497d527a0d8f1e7d974f601903d2e426331 -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/VectorLayerAttributeTableView.cs	(.../VectorLayerAttributeTableView.cs)	(revision c3dd2497d527a0d8f1e7d974f601903d2e426331)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/VectorLayerAttributeTableView.cs	(.../VectorLayerAttributeTableView.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -10,11 +10,11 @@
 using Core.Common.Gui;
 using Core.Common.Utils;
 using Core.Common.Utils.Collections;
-using Core.Common.Utils.Collections.Generic;
 using Core.Common.Utils.ComponentModel;
 using Core.Common.Utils.Reflection;
 using Core.GIS.GeoAPI.Extensions.Feature;
 using Core.GIS.NetTopologySuite.Extensions.Features;
+using Core.GIS.SharpMap.Api.Collections;
 using Core.GIS.SharpMap.Api.Layers;
 using Core.Plugins.SharpMapGis.Gui.Properties;
 using TypeConverter = Core.Common.Utils.TypeConverter;
Index: Core/Plugins/src/Core.Plugins.SharpMapGis/BackGroundMapLayer.cs
===================================================================
diff -u -rab0195c554a0abb5d15b06c995b696b97a61b3e9 -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/Plugins/src/Core.Plugins.SharpMapGis/BackGroundMapLayer.cs	(.../BackGroundMapLayer.cs)	(revision ab0195c554a0abb5d15b06c995b696b97a61b3e9)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis/BackGroundMapLayer.cs	(.../BackGroundMapLayer.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Utils.Collections;
-using Core.Common.Utils.Collections.Generic;
+using Core.GIS.SharpMap.Api.Collections;
 using Core.GIS.SharpMap.Api.Layers;
 using Core.GIS.SharpMap.Layers;
 using Core.GIS.SharpMap.Map;
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapLayerTreeViewNodePresenterTest.cs
===================================================================
diff -u -r44fce3b0d8942914f2678d8e33ca99646cf8062f -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapLayerTreeViewNodePresenterTest.cs	(.../MapLayerTreeViewNodePresenterTest.cs)	(revision 44fce3b0d8942914f2678d8e33ca99646cf8062f)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapLayerTreeViewNodePresenterTest.cs	(.../MapLayerTreeViewNodePresenterTest.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -1,11 +1,9 @@
 using System.Collections;
 using System.Drawing;
 using System.IO;
-using Core.Common.Controls;
 using Core.Common.Controls.Swf.TreeViewControls;
-using Core.Common.Gui;
 using Core.Common.TestUtil;
-using Core.Common.Utils.Collections.Generic;
+using Core.GIS.SharpMap.Api.Collections;
 using Core.GIS.SharpMap.Api.Layers;
 using Core.GIS.SharpMap.Data.Providers;
 using Core.GIS.SharpMap.Layers;
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapViewTest.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapViewTest.cs	(.../MapViewTest.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapViewTest.cs	(.../MapViewTest.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -1,13 +1,12 @@
 using System.Drawing;
 using System.IO;
 using System.Linq;
-using Core.Common.Controls;
 using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.Common.TestUtil;
-using Core.Common.Utils.Collections.Generic;
 using Core.Common.Utils.Reflection;
 using Core.GIS.NetTopologySuite.Geometries;
+using Core.GIS.SharpMap.Api.Collections;
 using Core.GIS.SharpMap.Data.Providers;
 using Core.GIS.SharpMap.Extensions.CoordinateSystems;
 using Core.GIS.SharpMap.Layers;
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/VectorLayerAttributeTableViewTest.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -rb26409726de6dd5db534791e43885dd29b7b09b8
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/VectorLayerAttributeTableViewTest.cs	(.../VectorLayerAttributeTableViewTest.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/VectorLayerAttributeTableViewTest.cs	(.../VectorLayerAttributeTableViewTest.cs)	(revision b26409726de6dd5db534791e43885dd29b7b09b8)
@@ -1,11 +1,11 @@
 using System.Collections;
 using System.Collections.Generic;
 using Core.Common.Utils;
-using Core.Common.Utils.Collections.Generic;
 using Core.Common.Utils.ComponentModel;
 using Core.GIS.GeoAPI.Extensions.Feature;
 using Core.GIS.NetTopologySuite.Extensions.Features;
 using Core.GIS.NetTopologySuite.Geometries;
+using Core.GIS.SharpMap.Api.Collections;
 using Core.GIS.SharpMap.Data.Providers;
 using Core.GIS.SharpMap.Layers;
 using Core.Plugins.SharpMapGis.Gui.Forms;