Index: Core/Common/src/Core.Common.Controls.TreeView/Core.Common.Controls.TreeView.csproj
===================================================================
diff -u -rb326158bd228dc407858ba620a437a175baf0190 -rd7da4fd9051547085f0cbbec790eda9cb8ca7f14
--- Core/Common/src/Core.Common.Controls.TreeView/Core.Common.Controls.TreeView.csproj	(.../Core.Common.Controls.TreeView.csproj)	(revision b326158bd228dc407858ba620a437a175baf0190)
+++ Core/Common/src/Core.Common.Controls.TreeView/Core.Common.Controls.TreeView.csproj	(.../Core.Common.Controls.TreeView.csproj)	(revision d7da4fd9051547085f0cbbec790eda9cb8ca7f14)
@@ -46,7 +46,6 @@
     </Compile>
     <Compile Include="DragOperations.cs" />
     <Compile Include="ITreeNodePresenter.cs" />
-    <Compile Include="ITreeView.cs" />
     <Compile Include="PlaceholderLocation.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
Index: Core/Common/src/Core.Common.Controls.TreeView/ITreeNodePresenter.cs
===================================================================
diff -u -rb326158bd228dc407858ba620a437a175baf0190 -rd7da4fd9051547085f0cbbec790eda9cb8ca7f14
--- Core/Common/src/Core.Common.Controls.TreeView/ITreeNodePresenter.cs	(.../ITreeNodePresenter.cs)	(revision b326158bd228dc407858ba620a437a175baf0190)
+++ Core/Common/src/Core.Common.Controls.TreeView/ITreeNodePresenter.cs	(.../ITreeNodePresenter.cs)	(revision d7da4fd9051547085f0cbbec790eda9cb8ca7f14)
@@ -14,7 +14,7 @@
         /// <summary>
         /// TreeView containing the nodes.
         /// </summary>
-        ITreeView TreeView { get; set; }
+        TreeView TreeView { get; set; }
 
         /// <summary>
         /// Gets supported type of the object for this builder.
Fisheye: Tag d7da4fd9051547085f0cbbec790eda9cb8ca7f14 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls.TreeView/ITreeView.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Controls.TreeView/TreeNode.cs
===================================================================
diff -u -rb326158bd228dc407858ba620a437a175baf0190 -rd7da4fd9051547085f0cbbec790eda9cb8ca7f14
--- Core/Common/src/Core.Common.Controls.TreeView/TreeNode.cs	(.../TreeNode.cs)	(revision b326158bd228dc407858ba620a437a175baf0190)
+++ Core/Common/src/Core.Common.Controls.TreeView/TreeNode.cs	(.../TreeNode.cs)	(revision d7da4fd9051547085f0cbbec790eda9cb8ca7f14)
@@ -9,13 +9,13 @@
     public class TreeNode : System.Windows.Forms.TreeNode, IObserver
     {
         private readonly TreeNodeList nodes;
-        private readonly ITreeView treeView;
+        private readonly TreeView treeView;
         protected bool isLoaded;
         private object tag;
         private IObservable observable;
         private readonly int maximumTextLength = 259; // Having very big strings causes problems by tree-view
 
-        public TreeNode(ITreeView treeView)
+        public TreeNode(TreeView treeView)
         {
             this.treeView = treeView;
             nodes = new TreeNodeList(base.Nodes);
@@ -38,7 +38,7 @@
         /// </summary>
         public bool HasChildren { get; set; }
 
-        public new ITreeView TreeView
+        public new TreeView TreeView
         {
             get
             {
Index: Core/Common/src/Core.Common.Controls.TreeView/TreeView.cs
===================================================================
diff -u -rb326158bd228dc407858ba620a437a175baf0190 -rd7da4fd9051547085f0cbbec790eda9cb8ca7f14
--- Core/Common/src/Core.Common.Controls.TreeView/TreeView.cs	(.../TreeView.cs)	(revision b326158bd228dc407858ba620a437a175baf0190)
+++ Core/Common/src/Core.Common.Controls.TreeView/TreeView.cs	(.../TreeView.cs)	(revision d7da4fd9051547085f0cbbec790eda9cb8ca7f14)
@@ -17,7 +17,7 @@
     /// <summary>
     /// Summary description for Tree.
     /// </summary>
-    public class TreeView : System.Windows.Forms.TreeView, ITreeView
+    public class TreeView : System.Windows.Forms.TreeView
     {
         public event EventHandler SelectedNodeChanged;
         public event EventHandler OnUpdate;
@@ -98,11 +98,16 @@
         {
             get
             {
-                return ((ITreeView) this).SelectedNode;
+                return (TreeNode) base.SelectedNode;
             }
             set
             {
-                ((ITreeView) this).SelectedNode = value;
+                base.SelectedNode = value;
+
+                if (SelectedNodeChanged != null)
+                {
+                    SelectedNodeChanged(this, new EventArgs());
+                }
             }
         }
 
@@ -162,25 +167,6 @@
             }
         }
 
-        [Browsable(false)]
-        [DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
-        TreeNode ITreeView.SelectedNode
-        {
-            get
-            {
-                return (TreeNode) base.SelectedNode;
-            }
-            set
-            {
-                base.SelectedNode = value;
-
-                if (SelectedNodeChanged != null)
-                {
-                    SelectedNodeChanged(this, new EventArgs());
-                }
-            }
-        }
-
         public new void CollapseAll()
         {
             foreach (var node in Nodes)
Index: Core/Common/src/Core.Common.Controls.TreeView/TreeViewController.cs
===================================================================
diff -u -rb326158bd228dc407858ba620a437a175baf0190 -rd7da4fd9051547085f0cbbec790eda9cb8ca7f14
--- Core/Common/src/Core.Common.Controls.TreeView/TreeViewController.cs	(.../TreeViewController.cs)	(revision b326158bd228dc407858ba620a437a175baf0190)
+++ Core/Common/src/Core.Common.Controls.TreeView/TreeViewController.cs	(.../TreeViewController.cs)	(revision d7da4fd9051547085f0cbbec790eda9cb8ca7f14)
@@ -13,7 +13,7 @@
     {
         private static readonly ILog Log = LogManager.GetLogger(typeof(TreeViewController));
 
-        private readonly ITreeView treeView;
+        private readonly TreeView treeView;
         private readonly ICollection<ITreeNodePresenter> nodePresenters = new HashSet<ITreeNodePresenter>();
 
         private readonly Dictionary<Type, ITreeNodePresenter> nodeTagTypePresenters = new Dictionary<Type, ITreeNodePresenter>();
@@ -24,7 +24,7 @@
         private string[] loadedNodePaths;
         private string[] expandedNodePaths;
 
-        public TreeViewController(ITreeView treeView)
+        public TreeViewController(TreeView treeView)
         {
             if (treeView == null)
             {
Index: Core/Common/src/Core.Common.Controls.TreeView/TreeViewNodePresenterBase.cs
===================================================================
diff -u -rb326158bd228dc407858ba620a437a175baf0190 -rd7da4fd9051547085f0cbbec790eda9cb8ca7f14
--- Core/Common/src/Core.Common.Controls.TreeView/TreeViewNodePresenterBase.cs	(.../TreeViewNodePresenterBase.cs)	(revision b326158bd228dc407858ba620a437a175baf0190)
+++ Core/Common/src/Core.Common.Controls.TreeView/TreeViewNodePresenterBase.cs	(.../TreeViewNodePresenterBase.cs)	(revision d7da4fd9051547085f0cbbec790eda9cb8ca7f14)
@@ -10,7 +10,7 @@
 {
     public abstract class TreeViewNodePresenterBase<T> : ITreeNodePresenter
     {
-        public ITreeView TreeView { get; set; }
+        public TreeView TreeView { get; set; }
 
         public virtual Type NodeTagType
         {
Index: Core/Common/src/Core.Common.Gui/Forms/IProjectExplorer.cs
===================================================================
diff -u -r42ca97fdb85a553c6aac3bfdfe57c7be4af90821 -rd7da4fd9051547085f0cbbec790eda9cb8ca7f14
--- Core/Common/src/Core.Common.Gui/Forms/IProjectExplorer.cs	(.../IProjectExplorer.cs)	(revision 42ca97fdb85a553c6aac3bfdfe57c7be4af90821)
+++ Core/Common/src/Core.Common.Gui/Forms/IProjectExplorer.cs	(.../IProjectExplorer.cs)	(revision d7da4fd9051547085f0cbbec790eda9cb8ca7f14)
@@ -5,7 +5,7 @@
 {
     public interface IProjectExplorer : IView
     {
-        ITreeView TreeView { get; }
+        TreeView TreeView { get; }
 
         void ScrollTo(object o);
     }
Index: Core/Common/test/Core.Common.Controls.TreeView.Test/TreeNodeListTest.cs
===================================================================
diff -u -rb326158bd228dc407858ba620a437a175baf0190 -rd7da4fd9051547085f0cbbec790eda9cb8ca7f14
--- Core/Common/test/Core.Common.Controls.TreeView.Test/TreeNodeListTest.cs	(.../TreeNodeListTest.cs)	(revision b326158bd228dc407858ba620a437a175baf0190)
+++ Core/Common/test/Core.Common.Controls.TreeView.Test/TreeNodeListTest.cs	(.../TreeNodeListTest.cs)	(revision d7da4fd9051547085f0cbbec790eda9cb8ca7f14)
@@ -12,7 +12,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var treeView = mocks.Stub<ITreeView>();
+            var treeView = mocks.Stub<TreeView>();
             var someTreeNodeCollectionContainer = new System.Windows.Forms.TreeNode();
             var parentNode = new TreeNode(treeView);
             var childNode = new TreeNode(treeView);
Index: Core/Common/test/Core.Common.Controls.TreeView.Test/TreeViewControllerTest.cs
===================================================================
diff -u -rb326158bd228dc407858ba620a437a175baf0190 -rd7da4fd9051547085f0cbbec790eda9cb8ca7f14
--- Core/Common/test/Core.Common.Controls.TreeView.Test/TreeViewControllerTest.cs	(.../TreeViewControllerTest.cs)	(revision b326158bd228dc407858ba620a437a175baf0190)
+++ Core/Common/test/Core.Common.Controls.TreeView.Test/TreeViewControllerTest.cs	(.../TreeViewControllerTest.cs)	(revision d7da4fd9051547085f0cbbec790eda9cb8ca7f14)
@@ -23,7 +23,7 @@
         public void ResolveNodePresenterForDataWalksUpClassHierarchy()
         {
             var mocks = new MockRepository();
-            var treeview = mocks.StrictMock<ITreeView>();
+            var treeview = mocks.StrictMock<TreeView>();
 
             Expect.Call(treeview.GetNodeByTag(null)).IgnoreArguments().Return(null);
 
@@ -45,7 +45,7 @@
         public void ResolveNodePresenterForDataReturnsNullIfNotFound()
         {
             var mocks = new MockRepository();
-            var treeview = mocks.StrictMock<ITreeView>();
+            var treeview = mocks.StrictMock<TreeView>();
 
             Expect.Call(treeview.GetNodeByTag(null)).IgnoreArguments().Return(null);
 
@@ -61,7 +61,7 @@
         public void ResolveNodePresenterForDataReturnsNullIfItemIsNull()
         {
             var mocks = new MockRepository();
-            var treeview = mocks.StrictMock<ITreeView>();
+            var treeview = mocks.StrictMock<TreeView>();
 
             Expect.Call(treeview.GetNodeByTag(null)).IgnoreArguments().Return(null).Repeat.Any();
 
@@ -77,7 +77,7 @@
         public void ResolveNodePresenterCanMatchOnInterface()
         {
             var mocks = new MockRepository();
-            var treeview = mocks.StrictMock<ITreeView>();
+            var treeview = mocks.StrictMock<TreeView>();
 
             Expect.Call(treeview.GetNodeByTag(null)).IgnoreArguments().Return(null);
 
@@ -100,7 +100,7 @@
             var mocks = new MockRepository();
 
             var treeNode = mocks.Stub<TreeNode>();
-            var treeview = mocks.StrictMock<ITreeView>();
+            var treeview = mocks.StrictMock<TreeView>();
             var nodePresenter = mocks.StrictMock<ITreeNodePresenter>();
 
             nodePresenter.TreeView = treeview;
@@ -156,7 +156,7 @@
         {
             var mocks = new MockRepository();
 
-            var treeview = mocks.StrictMock<ITreeView>();
+            var treeview = mocks.StrictMock<TreeView>();
             var nodePresenter = mocks.StrictMock<ITreeNodePresenter>();
             var nodes = new List<TreeNode>();
 
@@ -187,7 +187,7 @@
         {
             var mocks = new MockRepository();
 
-            var treeview = mocks.Stub<ITreeView>();
+            var treeview = mocks.Stub<TreeView>();
             var nodes = new List<TreeNode>();
 
             Expect.Call(treeview.Nodes).Return(nodes).Repeat.Any();
@@ -210,7 +210,7 @@
         {
             var mocks = new MockRepository();
 
-            var treeview = mocks.StrictMock<ITreeView>();
+            var treeview = mocks.StrictMock<TreeView>();
             var nodePresenter = mocks.StrictMock<ITreeNodePresenter>();
             var nodes = new List<TreeNode>();
             var parent = new Parent();
@@ -256,7 +256,7 @@
         {
             var mocks = new MockRepository();
 
-            var treeview = mocks.StrictMock<ITreeView>();
+            var treeview = mocks.StrictMock<TreeView>();
             var parentNodePresenter = mocks.StrictMock<ITreeNodePresenter>();
             var childNodePresenter = mocks.StrictMock<ITreeNodePresenter>();
 
@@ -322,7 +322,7 @@
         {
             var mocks = new MockRepository();
 
-            var treeView = mocks.Stub<ITreeView>();
+            var treeView = mocks.Stub<TreeView>();
 
             var treeViewController = new TreeViewController(treeView);
 
@@ -459,14 +459,15 @@
             var mocks = new MockRepository();
 
             var treeNode = mocks.StrictMock<TreeNode>();
-            var treeview = mocks.StrictMock<ITreeView>();
+            var treeview = mocks.StrictMock<TreeView>();
             var nodePresenter = mocks.StrictMock<ITreeNodePresenter>();
 
             var tag = new object();
 
             Expect.Call(treeview.GetNodeByTag(null)).IgnoreArguments().Return(null).Repeat.Any();
             Expect.Call(treeview.BeginUpdate).IgnoreArguments().Repeat.Any();
             Expect.Call(treeview.EndUpdate).IgnoreArguments().Repeat.Any();
+            Expect.Call(treeview.InvokeRequired).Return(false).Repeat.Any();
 
             treeNode.HasChildren = true;
             Expect.Call(treeNode.Tag).Return(tag).Repeat.Any();
@@ -499,7 +500,7 @@
 
             var parentTreeNode = mocks.StrictMock<TreeNode>();
             var childTreeNode = mocks.StrictMock<TreeNode>();
-            var treeview = mocks.StrictMock<ITreeView>();
+            var treeview = mocks.StrictMock<TreeView>();
             var parentNodePresenter = mocks.StrictMock<ITreeNodePresenter>();
             var childNodePresenter = mocks.StrictMock<ITreeNodePresenter>();
 
@@ -513,6 +514,7 @@
             Expect.Call(treeview.GetNodeByTag(null)).IgnoreArguments().Return(null).Repeat.Any();
             Expect.Call(treeview.BeginUpdate).IgnoreArguments().Repeat.Any();
             Expect.Call(treeview.EndUpdate).IgnoreArguments().Repeat.Any();
+            Expect.Call(treeview.InvokeRequired).Return(false).Repeat.Any();
 
             parentTreeNode.HasChildren = true;
             Expect.Call(parentTreeNode.Tag).Return(parent).Repeat.Any();
@@ -558,7 +560,7 @@
         public void TestCanRenameNode()
         {
             var mocks = new MockRepository();
-            var treeview = mocks.StrictMock<ITreeView>();
+            var treeview = mocks.StrictMock<TreeView>();
             var treeNode = mocks.StrictMock<TreeNode>();
             var nodePresenter = mocks.StrictMock<ITreeNodePresenter>();
             var tag = new object();
@@ -599,7 +601,7 @@
             var mocks = new MockRepository();
             var nodePresenter = mocks.StrictMock<ITreeNodePresenter>();
             var treeNode = mocks.StrictMock<TreeNode>();
-            var treeview = mocks.StrictMock<ITreeView>();
+            var treeview = mocks.StrictMock<TreeView>();
             var tag = new object();
 
             nodePresenter.TreeView = treeview;
@@ -638,7 +640,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var treeView = mocks.Stub<ITreeView>();
+            var treeView = mocks.Stub<TreeView>();
             var nodePresenter = mocks.Stub<ITreeNodePresenter>();
             mocks.ReplayAll();
 
@@ -658,7 +660,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var treeView = mocks.Stub<ITreeView>();
+            var treeView = mocks.Stub<TreeView>();
             var nodePresenter = mocks.Stub<ITreeNodePresenter>();
             mocks.ReplayAll();
 
Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs
===================================================================
diff -u -rb326158bd228dc407858ba620a437a175baf0190 -rd7da4fd9051547085f0cbbec790eda9cb8ca7f14
--- Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs	(.../TreeViewContextMenuItemFactoryTest.cs)	(revision b326158bd228dc407858ba620a437a175baf0190)
+++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/TreeViewContextMenuItemFactoryTest.cs	(.../TreeViewContextMenuItemFactoryTest.cs)	(revision d7da4fd9051547085f0cbbec790eda9cb8ca7f14)
@@ -58,7 +58,7 @@
             var treeNodeMock = mocks.StrictMock<TreeNode>();
             var treeParentNodeMock = mocks.StrictMock<TreeNode>();
             var treeNodePresenterMock = mocks.StrictMock<ITreeNodePresenter>();
-            var treeViewMock = mocks.StrictMock<ITreeView>();
+            var treeViewMock = mocks.StrictMock<TreeView>();
             var arg1 = new object();
             var arg2 = new object();
 
@@ -99,7 +99,7 @@
             // Setup
             var treeNodeMock = mocks.StrictMock<TreeNode>();
             var treeNodePresenterMock = mocks.StrictMock<ITreeNodePresenter>();
-            var treeViewMock = mocks.StrictMock<ITreeView>();
+            var treeViewMock = mocks.StrictMock<TreeView>();
 
             treeNodeMock.Expect(tn => tn.Presenter).Return(treeNodePresenterMock);
             treeNodePresenterMock.Expect(tnp => tnp.CanRenameNode(treeNodeMock)).Return(canRename);
@@ -134,7 +134,7 @@
         {
             // Setup
             var treeNodeMock = mocks.StrictMock<TreeNode>();
-            var treeViewMock = mocks.StrictMock<ITreeView>();
+            var treeViewMock = mocks.StrictMock<TreeView>();
             if (hasChildren)
             {
                 treeNodeMock.Expect(tn => tn.TreeView).Return(treeViewMock);
@@ -173,7 +173,7 @@
         {
             // Setup
             var treeNodeMock = mocks.StrictMock<TreeNode>();
-            var treeViewMock = mocks.StrictMock<ITreeView>();
+            var treeViewMock = mocks.StrictMock<TreeView>();
             if (hasChildren)
             {
                 treeNodeMock.Expect(tn => tn.TreeView).Return(treeViewMock);
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs
===================================================================
diff -u -r8cae5d69ac2d4cf678486ac2b457c0dfe97089d5 -rd7da4fd9051547085f0cbbec790eda9cb8ca7f14
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs	(.../ProjectExplorer.cs)	(revision 8cae5d69ac2d4cf678486ac2b457c0dfe97089d5)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs	(.../ProjectExplorer.cs)	(revision d7da4fd9051547085f0cbbec790eda9cb8ca7f14)
@@ -1,10 +1,10 @@
 using System;
 using System.Windows.Forms;
-using Core.Common.Controls.TreeView;
 using Core.Common.Gui;
 using Core.Common.Gui.Forms;
 using Core.Plugins.ProjectExplorer.Properties;
 using log4net;
+using TreeView = Core.Common.Controls.TreeView.TreeView;
 
 namespace Core.Plugins.ProjectExplorer
 {
@@ -35,14 +35,6 @@
 
         public ProjectTreeView ProjectTreeView { get; private set; }
 
-        public ITreeView TreeView
-        {
-            get
-            {
-                return ProjectTreeView.TreeView;
-            }
-        }
-
         public object Data
         {
             get
@@ -69,6 +61,14 @@
             base.Dispose();
         }
 
+        public TreeView TreeView
+        {
+            get
+            {
+                return ProjectTreeView.TreeView;
+            }
+        }
+
         public void ScrollTo(object o)
         {
             var nodeToSelect = TreeView.GetNodeByTag(o);
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.cs
===================================================================
diff -u -rb326158bd228dc407858ba620a437a175baf0190 -rd7da4fd9051547085f0cbbec790eda9cb8ca7f14
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.cs	(.../ProjectTreeView.cs)	(revision b326158bd228dc407858ba620a437a175baf0190)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.cs	(.../ProjectTreeView.cs)	(revision d7da4fd9051547085f0cbbec790eda9cb8ca7f14)
@@ -2,7 +2,6 @@
 using System.Windows.Forms;
 using Core.Common.Base.Data;
 using Core.Common.Base.Plugin;
-using Core.Common.Controls.TreeView;
 using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.Plugins.ProjectExplorer.NodePresenters;
@@ -65,7 +64,7 @@
             }
         }
 
-        public ITreeView TreeView
+        public TreeView TreeView
         {
             get
             {
@@ -145,7 +144,7 @@
             TreeNode node = treeView.GetNodeByTag(gui.Selection);
             if (node != null)
             {
-                ((ITreeView) treeView).SelectedNode = node;
+                treeView.SelectedNode = node;
             }
         }
 
Index: Core/Plugins/test/Core.Plugins.Charting.Test/Forms/ChartTreeNodePresenterTest.cs
===================================================================
diff -u -rf0c2a16f1d03185660d0ac6fbb5fce8bb5c2ee43 -rd7da4fd9051547085f0cbbec790eda9cb8ca7f14
--- Core/Plugins/test/Core.Plugins.Charting.Test/Forms/ChartTreeNodePresenterTest.cs	(.../ChartTreeNodePresenterTest.cs)	(revision f0c2a16f1d03185660d0ac6fbb5fce8bb5c2ee43)
+++ Core/Plugins/test/Core.Plugins.Charting.Test/Forms/ChartTreeNodePresenterTest.cs	(.../ChartTreeNodePresenterTest.cs)	(revision d7da4fd9051547085f0cbbec790eda9cb8ca7f14)
@@ -115,7 +115,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var treeView = mocks.StrictMock<ITreeView>();
+            var treeView = mocks.StrictMock<TreeView>();
             treeView.Expect(tv => tv.TreeViewNodeSorter).Return(mocks.Stub<IComparer>());
 
             mocks.ReplayAll();
@@ -135,7 +135,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var treeView = mocks.StrictMock<ITreeView>();
+            var treeView = mocks.StrictMock<TreeView>();
             treeView.Expect(tv => tv.TreeViewNodeSorter).Return(null);
 
             mocks.ReplayAll();
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapLayerTreeViewNodePresenterTest.cs
===================================================================
diff -u -rb326158bd228dc407858ba620a437a175baf0190 -rd7da4fd9051547085f0cbbec790eda9cb8ca7f14
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapLayerTreeViewNodePresenterTest.cs	(.../MapLayerTreeViewNodePresenterTest.cs)	(revision b326158bd228dc407858ba620a437a175baf0190)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapLayerTreeViewNodePresenterTest.cs	(.../MapLayerTreeViewNodePresenterTest.cs)	(revision d7da4fd9051547085f0cbbec790eda9cb8ca7f14)
@@ -21,13 +21,13 @@
         private static readonly MockRepository mocks = new MockRepository();
         private static ITreeNodePresenter mapLayerNodePresenter;
 
-        private ITreeView treeView;
+        private TreeView treeView;
 
         [SetUp]
         public void Setup()
         {
             mapLayerNodePresenter = new MapLayerTreeViewNodePresenter(new MapLegendView(null));
-            treeView = mocks.Stub<ITreeView>();
+            treeView = mocks.Stub<TreeView>();
             mapLayerNodePresenter.TreeView = treeView;
         }
 
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/NodePresenters/MapProjectTreeViewNodePresenterTest.cs
===================================================================
diff -u -rb326158bd228dc407858ba620a437a175baf0190 -rd7da4fd9051547085f0cbbec790eda9cb8ca7f14
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/NodePresenters/MapProjectTreeViewNodePresenterTest.cs	(.../MapProjectTreeViewNodePresenterTest.cs)	(revision b326158bd228dc407858ba620a437a175baf0190)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/NodePresenters/MapProjectTreeViewNodePresenterTest.cs	(.../MapProjectTreeViewNodePresenterTest.cs)	(revision d7da4fd9051547085f0cbbec790eda9cb8ca7f14)
@@ -21,7 +21,7 @@
             var sourceNode = mocks.Stub<TreeNode>();
             var targetNode = mocks.Stub<TreeNode>();
 
-            var treeView = mocks.Stub<ITreeView>();
+            var treeView = mocks.Stub<TreeView>();
             treeView.TreeViewNodeSorter = mocks.Stub<IComparer>();
 
             mocks.ReplayAll();
@@ -46,7 +46,7 @@
             var sourceNode = mocks.Stub<TreeNode>();
             var targetNode = mocks.Stub<TreeNode>();
 
-            var treeView = mocks.Stub<ITreeView>();
+            var treeView = mocks.Stub<TreeView>();
             mocks.ReplayAll();
 
             var map = new Map();
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/VectorStyleNodePresenterTest.cs
===================================================================
diff -u -rb326158bd228dc407858ba620a437a175baf0190 -rd7da4fd9051547085f0cbbec790eda9cb8ca7f14
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/VectorStyleNodePresenterTest.cs	(.../VectorStyleNodePresenterTest.cs)	(revision b326158bd228dc407858ba620a437a175baf0190)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/VectorStyleNodePresenterTest.cs	(.../VectorStyleNodePresenterTest.cs)	(revision d7da4fd9051547085f0cbbec790eda9cb8ca7f14)
@@ -16,7 +16,7 @@
         public void Setup()
         {
             vectorStyleNodePresenter = new VectorStyleTreeViewNodePresenter();
-            var tv = Mocks.Stub<ITreeView>();
+            var tv = Mocks.Stub<TreeView>();
             vectorStyleNodePresenter.TreeView = tv;
         }
 
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/NodePresenters/RingtoetsNodePresenterBase.cs
===================================================================
diff -u -rb326158bd228dc407858ba620a437a175baf0190 -rd7da4fd9051547085f0cbbec790eda9cb8ca7f14
--- Ringtoets/Common/src/Ringtoets.Common.Forms/NodePresenters/RingtoetsNodePresenterBase.cs	(.../RingtoetsNodePresenterBase.cs)	(revision b326158bd228dc407858ba620a437a175baf0190)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/NodePresenters/RingtoetsNodePresenterBase.cs	(.../RingtoetsNodePresenterBase.cs)	(revision d7da4fd9051547085f0cbbec790eda9cb8ca7f14)
@@ -10,6 +10,7 @@
 
 using Ringtoets.Common.Forms.Properties;
 using TreeNode = Core.Common.Controls.TreeView.TreeNode;
+using TreeView = Core.Common.Controls.TreeView.TreeView;
 
 namespace Ringtoets.Common.Forms.NodePresenters
 {
@@ -38,7 +39,7 @@
             this.contextMenuBuilderProvider = contextMenuBuilderProvider;
         }
 
-        public ITreeView TreeView { get; set; }
+        public TreeView TreeView { get; set; }
 
         public Type NodeTagType
         {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationGroupContextNodePresenter.cs
===================================================================
diff -u -rb326158bd228dc407858ba620a437a175baf0190 -rd7da4fd9051547085f0cbbec790eda9cb8ca7f14
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationGroupContextNodePresenter.cs	(.../PipingCalculationGroupContextNodePresenter.cs)	(revision b326158bd228dc407858ba620a437a175baf0190)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingCalculationGroupContextNodePresenter.cs	(.../PipingCalculationGroupContextNodePresenter.cs)	(revision d7da4fd9051547085f0cbbec790eda9cb8ca7f14)
@@ -21,6 +21,7 @@
 using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
 using BaseResources = Core.Common.Base.Properties.Resources;
 using TreeNode = Core.Common.Controls.TreeView.TreeNode;
+using TreeView = Core.Common.Controls.TreeView.TreeView;
 
 namespace Ringtoets.Piping.Forms.NodePresenters
 {
@@ -338,11 +339,11 @@
         /// </summary>
         private abstract class DroppingPipingCalculationInContainerStrategy
         {
-            protected readonly ITreeView treeView;
+            protected readonly TreeView treeView;
             protected readonly PipingCalculationGroupContext target;
             private readonly PipingCalculationGroupContext originalOwnerContext;
 
-            protected DroppingPipingCalculationInContainerStrategy(ITreeView treeView, PipingCalculationGroupContext originalOwnerContext, PipingCalculationGroupContext target)
+            protected DroppingPipingCalculationInContainerStrategy(TreeView treeView, PipingCalculationGroupContext originalOwnerContext, PipingCalculationGroupContext target)
             {
                 this.treeView = treeView;
                 this.originalOwnerContext = originalOwnerContext;
@@ -426,7 +427,7 @@
             /// the original owner of the dragged item.</param>
             /// <param name="target">The calculation group context that is the target
             /// of the drag & drop operation.</param>
-            public DroppingPipingCalculationWithinSameContainer(ITreeView treeView, PipingCalculationGroupContext originalOwnerContext, PipingCalculationGroupContext target) :
+            public DroppingPipingCalculationWithinSameContainer(TreeView treeView, PipingCalculationGroupContext originalOwnerContext, PipingCalculationGroupContext target) :
                 base(treeView, originalOwnerContext, target) {}
         }
 
@@ -448,7 +449,7 @@
             /// the original owner of the dragged item.</param>
             /// <param name="target">The calculation group context that is the target
             /// of the drag & drop operation.</param>
-            public DroppingPipingCalculationToNewContainer(ITreeView treeView, PipingCalculationGroupContext originalOwnerContext, PipingCalculationGroupContext target) :
+            public DroppingPipingCalculationToNewContainer(TreeView treeView, PipingCalculationGroupContext originalOwnerContext, PipingCalculationGroupContext target) :
                 base(treeView, originalOwnerContext, target) {}
 
             public override void Execute(object draggedDataObject, IPipingCalculationItem pipingCalculationItem, int newPosition)
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationGroupContextNodePresenterTest.cs
===================================================================
diff -u -rb326158bd228dc407858ba620a437a175baf0190 -rd7da4fd9051547085f0cbbec790eda9cb8ca7f14
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationGroupContextNodePresenterTest.cs	(.../PipingCalculationGroupContextNodePresenterTest.cs)	(revision b326158bd228dc407858ba620a437a175baf0190)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingCalculationGroupContextNodePresenterTest.cs	(.../PipingCalculationGroupContextNodePresenterTest.cs)	(revision d7da4fd9051547085f0cbbec790eda9cb8ca7f14)
@@ -28,6 +28,7 @@
 using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
 using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 using TreeNode = Core.Common.Controls.TreeView.TreeNode;
+using TreeView = Core.Common.Controls.TreeView.TreeView;
 
 namespace Ringtoets.Piping.Forms.Test.NodePresenters
 {
@@ -123,7 +124,7 @@
 
             var builderProvider = mockRepository.Stub<IContextMenuBuilderProvider>();
 
-            var treeView = mockRepository.StrictMock<ITreeView>();
+            var treeView = mockRepository.StrictMock<TreeView>();
             treeView.Expect(v => v.GetNodeByTag(groupContext)).Return(groupContextNode);
             mockRepository.ReplayAll();
 
@@ -160,7 +161,7 @@
             groupContextNode.Tag = groupContext;
             groupContextNode.Expect(n => n.Parent).Return(failureMechanismNode);
 
-            var treeView = mockRepository.StrictMock<ITreeView>();
+            var treeView = mockRepository.StrictMock<TreeView>();
             treeView.Expect(v => v.GetNodeByTag(groupContext)).Return(groupContextNode);
             mockRepository.ReplayAll();
 
@@ -360,7 +361,7 @@
             });
             postUpdateDraggedItemContextNode.Expect(n => n.Parent).Return(newOwnerGroupContextNode);
 
-            var treeView = mockRepository.Stub<ITreeView>();
+            var treeView = mockRepository.Stub<TreeView>();
             treeView.Expect(v => v.GetNodeByTag(draggedItemContext)).WhenCalled(invocation =>
             {
                 if (updatewasCalled)
@@ -446,7 +447,7 @@
             postUpdateDraggedItemContextNode.Expect(n => n.Parent).Return(newOwnerGroupContextNode);
 
             // Dragging within same group requires only recording state on that group.
-            var treeView = mockRepository.Stub<ITreeView>();
+            var treeView = mockRepository.Stub<TreeView>();
             treeView.Expect(v => v.GetNodeByTag(originalOwnerGroupContext)).Return(newOwnerGroupContextNode);
             treeView.Expect(v => v.GetNodeByTag(draggedItemContext)).WhenCalled(invocation =>
             {
@@ -527,7 +528,7 @@
             });
             postUpdateCalculationContextNode.Expect(n => n.Parent).Return(newOwnerGroupContextNode);
 
-            var treeView = mockRepository.Stub<ITreeView>();
+            var treeView = mockRepository.Stub<TreeView>();
             treeView.Expect(v => v.GetNodeByTag(draggedItemContext)).WhenCalled(invocation =>
             {
                 if (updateWasCalled)
@@ -629,7 +630,7 @@
             var postUpdateDraggedItemContextNode = CreateNodeStubToBeCollapsed(draggedItemContext, new TreeNode[0]);
             postUpdateDraggedItemContextNode.Expect(n => n.Parent).Return(newOwnerGroupContextNode);
 
-            var treeView = mockRepository.Stub<ITreeView>();
+            var treeView = mockRepository.Stub<TreeView>();
             treeView.Expect(v => v.GetNodeByTag(draggedItemContext)).WhenCalled(invocation =>
             {
                 if (updatewasCalled)
@@ -1219,7 +1220,7 @@
                 }
             }).Return(null);
 
-            var treeView = mockRepository.Stub<ITreeView>();
+            var treeView = mockRepository.Stub<TreeView>();
             mockRepository.ReplayAll();
 
             group.Children.Add(calculationItem);
@@ -1288,7 +1289,7 @@
                 }
             }).Return(null);
 
-            var treeView = mockRepository.Stub<ITreeView>();
+            var treeView = mockRepository.Stub<TreeView>();
             mockRepository.ReplayAll();
 
             group.Children.Add(calculationItem);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs
===================================================================
diff -u -rb326158bd228dc407858ba620a437a175baf0190 -rd7da4fd9051547085f0cbbec790eda9cb8ca7f14
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs	(.../PipingFailureMechanismNodePresenterTest.cs)	(revision b326158bd228dc407858ba620a437a175baf0190)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/NodePresenters/PipingFailureMechanismNodePresenterTest.cs	(.../PipingFailureMechanismNodePresenterTest.cs)	(revision d7da4fd9051547085f0cbbec790eda9cb8ca7f14)
@@ -27,6 +27,7 @@
 using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources;
 using CoreCommonGuiResources = Core.Common.Gui.Properties.Resources;
 using TreeNode = Core.Common.Controls.TreeView.TreeNode;
+using TreeView = Core.Common.Controls.TreeView.TreeView;
 
 namespace Ringtoets.Piping.Forms.Test.NodePresenters
 {
@@ -625,7 +626,7 @@
             var contextMenuBuilderProviderMock = mockRepository.StrictMock<IContextMenuBuilderProvider>();
             contextMenuBuilderProviderMock.Expect(cmp => cmp.Get(failureMechanismNode)).Return(menuBuilder);
 
-            var treeView = mockRepository.Stub<ITreeView>();
+            var treeView = mockRepository.Stub<TreeView>();
 
             mockRepository.ReplayAll();
 
@@ -697,7 +698,7 @@
             var contextMenuBuilderProviderMock = mockRepository.StrictMock<IContextMenuBuilderProvider>();
             contextMenuBuilderProviderMock.Expect(cmp => cmp.Get(failureMechanismNode)).Return(menuBuilder);
 
-            var treeView = mockRepository.Stub<ITreeView>();
+            var treeView = mockRepository.Stub<TreeView>();
 
             mockRepository.ReplayAll();