Index: Core/Common/src/Core.Common.Controls.Swf/Charting/IChartView.cs
===================================================================
diff -u -r2da9b71bbdefaeed62c47b673671b7d76502a363 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Controls.Swf/Charting/IChartView.cs	(.../IChartView.cs)	(revision 2da9b71bbdefaeed62c47b673671b7d76502a363)
+++ Core/Common/src/Core.Common.Controls.Swf/Charting/IChartView.cs	(.../IChartView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Windows.Forms;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Controls.Swf.Charting
 {
Index: Core/Common/src/Core.Common.Controls.Swf/HtmlPageView.cs
===================================================================
diff -u -rfeb20f297f2379be706c411932eb53f84821df83 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Controls.Swf/HtmlPageView.cs	(.../HtmlPageView.cs)	(revision feb20f297f2379be706c411932eb53f84821df83)
+++ Core/Common/src/Core.Common.Controls.Swf/HtmlPageView.cs	(.../HtmlPageView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,5 +1,6 @@
 using System.Drawing;
 using System.Windows.Forms;
+using Core.Common.Controls.Views;
 using Core.Common.Utils;
 
 namespace Core.Common.Controls.Swf
Index: Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs
===================================================================
diff -u -r9f917802e4ebd3c4c6681e7f42198d6e758cafed -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs	(.../TableView.cs)	(revision 9f917802e4ebd3c4c6681e7f42198d6e758cafed)
+++ Core/Common/src/Core.Common.Controls.Swf/Table/TableView.cs	(.../TableView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -12,6 +12,7 @@
 using Core.Common.Controls.Swf.Properties;
 using Core.Common.Controls.Swf.Table.Editors;
 using Core.Common.Controls.Swf.Table.Validation;
+using Core.Common.Controls.Views;
 using Core.Common.Utils;
 using Core.Common.Utils.Collections;
 using Core.Common.Utils.Reflection;
Index: Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/ITreeView.cs
===================================================================
diff -u -ref35125104cc8b0201f9c961049cc6c8a30fb74d -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/ITreeView.cs	(.../ITreeView.cs)	(revision ef35125104cc8b0201f9c961049cc6c8a30fb74d)
+++ Core/Common/src/Core.Common.Controls.Swf/TreeViewControls/ITreeView.cs	(.../ITreeView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Controls.Swf.TreeViewControls
 {
Index: Core/Common/src/Core.Common.Controls.Swf/WizardDialog.cs
===================================================================
diff -u -rcb6027f953ef4d8f3dbeda8fc055796acaded855 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Controls.Swf/WizardDialog.cs	(.../WizardDialog.cs)	(revision cb6027f953ef4d8f3dbeda8fc055796acaded855)
+++ Core/Common/src/Core.Common.Controls.Swf/WizardDialog.cs	(.../WizardDialog.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -6,6 +6,7 @@
 using System.Windows.Forms;
 using Core.Common.Controls.Dialogs;
 using Core.Common.Controls.Swf.Properties;
+using Core.Common.Controls.Views;
 using DevExpress.XtraWizard;
 
 namespace Core.Common.Controls.Swf
Fisheye: Tag 0c09106be1dfa0dad80232e39fea48b274ecdf37 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls/Command.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Controls/Commands/Command.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Controls/Commands/Command.cs	(revision 0)
+++ Core/Common/src/Core.Common.Controls/Commands/Command.cs	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -0,0 +1,23 @@
+namespace Core.Common.Controls.Commands
+{
+    /// <summary>
+    /// Abstract class that can be derivied for defining the behaviour of (Ribbon) buttons and/or menu items.
+    /// </summary>
+    public abstract class Command
+    {
+        /// <summary>
+        /// Gets whether or not the <see cref="Command"/> is enabled.
+        /// </summary>
+        public abstract bool Enabled { get; }
+
+        /// <summary>
+        /// Gets whether or not the <see cref="Command"/> is checked.
+        /// </summary>
+        public abstract bool Checked { get; }
+
+        /// <summary>
+        /// This method implements the logic that should be performed after clicking the (Ribbon) button and/or menu item.
+        /// </summary>
+        public abstract void Execute(params object[] arguments);
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj
===================================================================
diff -u -r73d88cd5f6df8e9a3d47808ecd588ae42591c4d8 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj	(.../Core.Common.Controls.csproj)	(revision 73d88cd5f6df8e9a3d47808ecd588ae42591c4d8)
+++ Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj	(.../Core.Common.Controls.csproj)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -77,7 +77,7 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="Command.cs" />
+    <Compile Include="Commands\Command.cs" />
     <Compile Include="Dialogs\DialogBase.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -90,8 +90,8 @@
     <Compile Include="Dialogs\ExceptionDialog.Designer.cs">
       <DependentUpon>ExceptionDialog.cs</DependentUpon>
     </Compile>
-    <Compile Include="IReusableView.cs" />
-    <Compile Include="IView.cs" />
+    <Compile Include="Views\IReusableView.cs" />
+    <Compile Include="Views\IView.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
Fisheye: Tag 0c09106be1dfa0dad80232e39fea48b274ecdf37 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls/IReusableView.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 0c09106be1dfa0dad80232e39fea48b274ecdf37 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls/IView.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Controls/ViewInfo.cs
===================================================================
diff -u -r2ea5055c818880a8c2e03f74e2f4e19a427fbb8e -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Controls/ViewInfo.cs	(.../ViewInfo.cs)	(revision 2ea5055c818880a8c2e03f74e2f4e19a427fbb8e)
+++ Core/Common/src/Core.Common.Controls/ViewInfo.cs	(.../ViewInfo.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,5 +1,6 @@
 using System;
 using System.Drawing;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Controls
 {
Index: Core/Common/src/Core.Common.Controls/Views/IReusableView.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Controls/Views/IReusableView.cs	(revision 0)
+++ Core/Common/src/Core.Common.Controls/Views/IReusableView.cs	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -0,0 +1,22 @@
+using System;
+
+namespace Core.Common.Controls.Views
+{
+    /// <summary>
+    /// IReusable views are reused. When a view should be opened for an object supported by the view and the view
+    /// is not locked the view will be reused. 
+    /// When implementing this interface the view must expect data will be set after construction to render new objects.
+    /// </summary>
+    public interface IReusableView : IView
+    {
+        /// <summary>
+        /// Required. Event should be fired when lock changes. Allows to update the UI (image for the tab)
+        /// </summary>
+        event EventHandler LockedChanged;
+
+        /// <summary>
+        /// Required. Determines whether the view is tight to the data it renders.
+        /// </summary>
+        bool Locked { get; set; }
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Controls/Views/IView.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Controls/Views/IView.cs	(revision 0)
+++ Core/Common/src/Core.Common.Controls/Views/IView.cs	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -0,0 +1,73 @@
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using Core.Common.Utils.Collections.Generic;
+
+namespace Core.Common.Controls.Views
+{
+    /// <summary>
+    /// General interface for graphical user interface views used in applications
+    /// </summary>
+    public interface IView : IDisposable
+    {
+        /// <summary>
+        /// Gets or sets data shown by this view. Usually it is any object in the system which can be shown by some IView derived class.
+        /// </summary>
+        object Data { get; set; }
+
+        /// <summary>
+        /// Gets or sets the *caption/title* for the view
+        /// TODO: change it to Name
+        /// 
+        /// IGui implementation sets this.
+        /// </summary>
+        string Text { get; set; }
+
+        /// <summary>
+        /// Sets or gets image set on the title of the view.
+        /// </summary>
+        Image Image { get; set; }
+
+        /// <summary>
+        /// True when view is visible.
+        /// </summary>
+        bool Visible { get; }
+
+        ViewInfo ViewInfo { get; set; }
+
+        /// <summary>
+        /// Makes object visible in the view if possible
+        /// </summary>
+        /// <param name="item"></param>
+        void EnsureVisible(object item);
+    }
+
+    public interface ICompositeView : IView
+    {
+        IEventedList<IView> ChildViews { get; }
+
+        bool HandlesChildViews { get; }
+
+        void ActivateChildView(IView childView);
+    }
+
+    /// <summary>
+    /// View that can be searched by using the SearchDialog
+    /// TODO : change to ISearchable and move to a different place
+    /// </summary>
+    public interface ISearchableView : IView
+    {
+        /// <summary>
+        /// Returns the objects that where found using the text.
+        /// This will be called from a separate thread.
+        /// </summary>
+        IEnumerable<Tuple<string, object>> SearchItemsByText(string text, bool caseSensitive, Func<bool> isSearchCancelled, Action<int> setProgressPercentage);
+    }
+
+    /// <summary>
+    /// Marker interface to indicate this view is not a principal view of its current data object and therefore 
+    /// should not be returned when asking for existing views for a data object. It will however be closed when 
+    /// the data is removed.
+    /// </summary>
+    public interface IAdditionalView : IView {}
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationReportControl.cs
===================================================================
diff -u -r622c20f6fc0b693b67a3e57b2ece939823002c62 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationReportControl.cs	(.../ValidationReportControl.cs)	(revision 622c20f6fc0b693b67a3e57b2ece939823002c62)
+++ Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationReportControl.cs	(.../ValidationReportControl.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -5,6 +5,7 @@
 using System.Windows.Forms;
 using System.Windows.Forms.VisualStyles;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Swf.Properties;
 using Core.Common.Utils.Validation;
 
Index: Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.cs
===================================================================
diff -u -rf7d7a919dec1b7d79672af043f268cde57aab0ba -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.cs	(.../ValidationView.cs)	(revision f7d7a919dec1b7d79672af043f268cde57aab0ba)
+++ Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.cs	(.../ValidationView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -4,6 +4,7 @@
 using System.Windows.Forms;
 using Core.Common.Base.IO;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 using Core.Common.Utils.Validation;
 
 namespace Core.Common.Gui.Swf.Validation
Index: Core/Common/src/Core.Common.Gui/ActiveViewChangeEventArgs.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Gui/ActiveViewChangeEventArgs.cs	(.../ActiveViewChangeEventArgs.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Gui/ActiveViewChangeEventArgs.cs	(.../ActiveViewChangeEventArgs.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,5 +1,6 @@
 using System;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Gui
 {
Index: Core/Common/src/Core.Common.Gui/Forms/IProjectExplorer.cs
===================================================================
diff -u -r074232b001ecb5ae110c0b95c05264d4372cbfb5 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Gui/Forms/IProjectExplorer.cs	(.../IProjectExplorer.cs)	(revision 074232b001ecb5ae110c0b95c05264d4372cbfb5)
+++ Core/Common/src/Core.Common.Gui/Forms/IProjectExplorer.cs	(.../IProjectExplorer.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,5 +1,6 @@
 using Core.Common.Controls;
 using Core.Common.Controls.Swf.TreeViewControls;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Gui.Forms
 {
Index: Core/Common/src/Core.Common.Gui/Forms/IPropertyGrid.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Gui/Forms/IPropertyGrid.cs	(.../IPropertyGrid.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Gui/Forms/IPropertyGrid.cs	(.../IPropertyGrid.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,4 +1,5 @@
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Gui.Forms
 {
Index: Core/Common/src/Core.Common.Gui/Forms/IRibbonCommandHandler.cs
===================================================================
diff -u -r932f87dd8538c3d52638a93e81ef631fbc9d763e -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Gui/Forms/IRibbonCommandHandler.cs	(.../IRibbonCommandHandler.cs)	(revision 932f87dd8538c3d52638a93e81ef631fbc9d763e)
+++ Core/Common/src/Core.Common.Gui/Forms/IRibbonCommandHandler.cs	(.../IRibbonCommandHandler.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Core.Common.Controls;
+using Core.Common.Controls.Commands;
 
 namespace Core.Common.Gui.Forms
 {
Index: Core/Common/src/Core.Common.Gui/Forms/MessageWindow/IMessageWindow.cs
===================================================================
diff -u -r2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Gui/Forms/MessageWindow/IMessageWindow.cs	(.../IMessageWindow.cs)	(revision 2c3e0c9ff532b71fd0a6805eda0ce9a83ee7f126)
+++ Core/Common/src/Core.Common.Gui/Forms/MessageWindow/IMessageWindow.cs	(.../IMessageWindow.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,5 +1,6 @@
 using System;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 using log4net.Core;
 
 namespace Core.Common.Gui.Forms.MessageWindow
Index: Core/Common/src/Core.Common.Gui/Forms/RichTextView.cs
===================================================================
diff -u -r12c5ceb5471938a64061362a809cab802f00eb30 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Gui/Forms/RichTextView.cs	(.../RichTextView.cs)	(revision 12c5ceb5471938a64061362a809cab802f00eb30)
+++ Core/Common/src/Core.Common.Gui/Forms/RichTextView.cs	(.../RichTextView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -2,6 +2,7 @@
 using System.IO;
 using System.Windows.Forms;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Gui.Forms
 {
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/AvalonDockDockingManager.cs
===================================================================
diff -u -r8376f3f25a98f8755479ed069c318e0b70922b38 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/AvalonDockDockingManager.cs	(.../AvalonDockDockingManager.cs)	(revision 8376f3f25a98f8755479ed069c318e0b70922b38)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/AvalonDockDockingManager.cs	(.../AvalonDockDockingManager.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -13,6 +13,7 @@
 using System.Windows.Media;
 using System.Windows.Media.Imaging;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Properties;
 using Core.Common.Utils.Reflection;
 using Xceed.Wpf.AvalonDock;
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/DockTabClosingEventArgs.cs
===================================================================
diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/DockTabClosingEventArgs.cs	(.../DockTabClosingEventArgs.cs)	(revision eee6c7815d1e418eac38c1c552fb279c0887ef55)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/DockTabClosingEventArgs.cs	(.../DockTabClosingEventArgs.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,5 +1,6 @@
 using System;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Gui.Forms.ViewManager
 {
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/IDockingManager.cs
===================================================================
diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/IDockingManager.cs	(.../IDockingManager.cs)	(revision eee6c7815d1e418eac38c1c552fb279c0887ef55)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/IDockingManager.cs	(.../IDockingManager.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Gui.Forms.ViewManager
 {
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewList.cs
===================================================================
diff -u -ref35125104cc8b0201f9c961049cc6c8a30fb74d -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewList.cs	(.../ViewList.cs)	(revision ef35125104cc8b0201f9c961049cc6c8a30fb74d)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewList.cs	(.../ViewList.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Properties;
 using Core.Common.Utils.Collections;
 using log4net;
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs
===================================================================
diff -u -r83aacc6578d82137751a7d28f691e8b3d02312f1 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs	(.../ViewResolver.cs)	(revision 83aacc6578d82137751a7d28f691e8b3d02312f1)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewResolver.cs	(.../ViewResolver.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Properties;
 using Core.Common.Utils.Reflection;
 using log4net;
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewSelectionContextMenuController.cs
===================================================================
diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewSelectionContextMenuController.cs	(.../ViewSelectionContextMenuController.cs)	(revision eee6c7815d1e418eac38c1c552fb279c0887ef55)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewSelectionContextMenuController.cs	(.../ViewSelectionContextMenuController.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,6 +1,7 @@
 using System;
 using System.Windows.Forms;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Properties;
 
 namespace Core.Common.Gui.Forms.ViewManager
Index: Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewSelectionMouseController.cs
===================================================================
diff -u -reee6c7815d1e418eac38c1c552fb279c0887ef55 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewSelectionMouseController.cs	(.../ViewSelectionMouseController.cs)	(revision eee6c7815d1e418eac38c1c552fb279c0887ef55)
+++ Core/Common/src/Core.Common.Gui/Forms/ViewManager/ViewSelectionMouseController.cs	(.../ViewSelectionMouseController.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,6 +1,7 @@
 using System;
 using System.Windows.Forms;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Properties;
 
 namespace Core.Common.Gui.Forms.ViewManager
Index: Core/Common/src/Core.Common.Gui/GuiCommand.cs
===================================================================
diff -u -r2b1937d120d50436169ef18d9fce57d4400d1bbe -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Gui/GuiCommand.cs	(.../GuiCommand.cs)	(revision 2b1937d120d50436169ef18d9fce57d4400d1bbe)
+++ Core/Common/src/Core.Common.Gui/GuiCommand.cs	(.../GuiCommand.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,4 +1,5 @@
 using Core.Common.Controls;
+using Core.Common.Controls.Commands;
 
 namespace Core.Common.Gui
 {
Index: Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs
===================================================================
diff -u -rd80205891b2350b00c02a87833da74bfdf1228b7 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs	(.../GuiCommandHandler.cs)	(revision d80205891b2350b00c02a87833da74bfdf1228b7)
+++ Core/Common/src/Core.Common.Gui/GuiCommandHandler.cs	(.../GuiCommandHandler.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -11,6 +11,7 @@
 using Core.Common.Base.IO;
 using Core.Common.Base.Plugin;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Forms;
 using Core.Common.Gui.Forms.ViewManager;
 using Core.Common.Gui.Properties;
Index: Core/Common/src/Core.Common.Gui/GuiExportHandler.cs
===================================================================
diff -u -r03d695408e57bf5c75121a09687140ddac8e1971 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Gui/GuiExportHandler.cs	(.../GuiExportHandler.cs)	(revision 03d695408e57bf5c75121a09687140ddac8e1971)
+++ Core/Common/src/Core.Common.Gui/GuiExportHandler.cs	(.../GuiExportHandler.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -5,6 +5,7 @@
 using System.Windows.Forms;
 using Core.Common.Base.IO;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Forms;
 using Core.Common.Gui.Properties;
 using log4net;
Index: Core/Common/src/Core.Common.Gui/ILayerEditorView.cs
===================================================================
diff -u -r9f01c4daf5b7af6549045ed6ac404d18419c2555 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Gui/ILayerEditorView.cs	(.../ILayerEditorView.cs)	(revision 9f01c4daf5b7af6549045ed6ac404d18419c2555)
+++ Core/Common/src/Core.Common.Gui/ILayerEditorView.cs	(.../ILayerEditorView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 using Core.GIS.GeoAPI.Extensions.Feature;
 using Core.GIS.SharpMap.Api.Layers;
 
Index: Core/Common/src/Core.Common.Gui/IViewList.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Gui/IViewList.cs	(.../IViewList.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Gui/IViewList.cs	(.../IViewList.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 using Core.Common.Utils.Collections;
 using Core.Common.Utils.Collections.Generic;
 
Index: Core/Common/src/Core.Common.Gui/IViewResolver.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Gui/IViewResolver.cs	(.../IViewResolver.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Common/src/Core.Common.Gui/IViewResolver.cs	(.../IViewResolver.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Gui
 {
Index: Core/Common/src/Core.Common.Gui/RingtoetsGui.cs
===================================================================
diff -u -ra600b08ffb5dac8164691824fe6dc7f4e96814d0 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/src/Core.Common.Gui/RingtoetsGui.cs	(.../RingtoetsGui.cs)	(revision a600b08ffb5dac8164691824fe6dc7f4e96814d0)
+++ Core/Common/src/Core.Common.Gui/RingtoetsGui.cs	(.../RingtoetsGui.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -12,6 +12,7 @@
 using Core.Common.Base.Plugin;
 using Core.Common.Controls;
 using Core.Common.Controls.Swf.TreeViewControls;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.ContextMenu;
 using Core.Common.Gui.Forms.MainWindow;
 using Core.Common.Gui.Forms.MessageWindow;
Index: Core/Common/test/Core.Common.Test/Gui/ToolWindowTestControl.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/test/Core.Common.Test/Gui/ToolWindowTestControl.cs	(.../ToolWindowTestControl.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/Common/test/Core.Common.Test/Gui/ToolWindowTestControl.cs	(.../ToolWindowTestControl.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,6 +1,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Test.Gui
 {
Index: Core/Common/test/Core.Common.Test/Gui/ViewListTest.cs
===================================================================
diff -u -ra600b08ffb5dac8164691824fe6dc7f4e96814d0 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/test/Core.Common.Test/Gui/ViewListTest.cs	(.../ViewListTest.cs)	(revision a600b08ffb5dac8164691824fe6dc7f4e96814d0)
+++ Core/Common/test/Core.Common.Test/Gui/ViewListTest.cs	(.../ViewListTest.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -2,6 +2,7 @@
 using System.Linq;
 using Core.Common.Controls;
 using Core.Common.Controls.Swf;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.Common.Gui.Forms.ViewManager;
 using Core.Common.Test.TestObjects;
Index: Core/Common/test/Core.Common.Test/TestObjects/TestDockingManager.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/test/Core.Common.Test/TestObjects/TestDockingManager.cs	(.../TestDockingManager.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/Common/test/Core.Common.Test/TestObjects/TestDockingManager.cs	(.../TestDockingManager.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.Common.Gui.Forms.ViewManager;
 
Index: Core/Common/test/Core.Common.Test/TestObjects/TestReusableView.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/test/Core.Common.Test/TestObjects/TestReusableView.cs	(.../TestReusableView.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/Common/test/Core.Common.Test/TestObjects/TestReusableView.cs	(.../TestReusableView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -2,6 +2,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Test.TestObjects
 {
Index: Core/Common/test/Core.Common.Test/TestObjects/TestView.cs
===================================================================
diff -u -r41c77f9f36ae74a406fd382187426cc06d2b0200 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Common/test/Core.Common.Test/TestObjects/TestView.cs	(.../TestView.cs)	(revision 41c77f9f36ae74a406fd382187426cc06d2b0200)
+++ Core/Common/test/Core.Common.Test/TestObjects/TestView.cs	(.../TestView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -2,6 +2,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 
 namespace Core.Common.Test.TestObjects
 {
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/ExportChartAsImageCommand.cs
===================================================================
diff -u -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/ExportChartAsImageCommand.cs	(.../ExportChartAsImageCommand.cs)	(revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/ExportChartAsImageCommand.cs	(.../ExportChartAsImageCommand.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,6 +1,7 @@
 using System.Drawing;
 using Core.Common.Controls;
 using Core.Common.Controls.Swf.Charting;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 
 namespace Core.Plugins.CommonTools.Gui.Commands.Charting
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/RulerCommand.cs
===================================================================
diff -u -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/RulerCommand.cs	(.../RulerCommand.cs)	(revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/RulerCommand.cs	(.../RulerCommand.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,6 +1,7 @@
 using Core.Common.Controls;
 using Core.Common.Controls.Swf.Charting;
 using Core.Common.Controls.Swf.Charting.Tools;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 
 namespace Core.Plugins.CommonTools.Gui.Commands.Charting
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/CommonToolsGuiPlugin.cs
===================================================================
diff -u -r41f690d1d649d07cdb7a11fce79fff5c343de1bd -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/CommonToolsGuiPlugin.cs	(.../CommonToolsGuiPlugin.cs)	(revision 41f690d1d649d07cdb7a11fce79fff5c343de1bd)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/CommonToolsGuiPlugin.cs	(.../CommonToolsGuiPlugin.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -9,6 +9,7 @@
 using Core.Common.Controls.Swf.Charting;
 using Core.Common.Controls.Swf.Charting.Series;
 using Core.Common.Controls.Swf.Table;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.Common.Gui.Forms;
 using Core.Common.Gui.Swf;
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/Charting/ChartLegendView.cs
===================================================================
diff -u -r2da9b71bbdefaeed62c47b673671b7d76502a363 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/Charting/ChartLegendView.cs	(.../ChartLegendView.cs)	(revision 2da9b71bbdefaeed62c47b673671b7d76502a363)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/Charting/ChartLegendView.cs	(.../ChartLegendView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -6,6 +6,7 @@
 using Core.Common.Controls;
 using Core.Common.Controls.Swf.Charting;
 using Core.Common.Controls.Swf.Charting.Series;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 
 namespace Core.Plugins.CommonTools.Gui.Forms.Charting
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/TextDocumentView.cs
===================================================================
diff -u -r9b0f0e0e061a17409b0ba973819d45c1d10aef4c -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/TextDocumentView.cs	(.../TextDocumentView.cs)	(revision 9b0f0e0e061a17409b0ba973819d45c1d10aef4c)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Forms/TextDocumentView.cs	(.../TextDocumentView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -4,6 +4,7 @@
 using System.Linq;
 using System.Windows.Forms;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 using Core.Common.Utils;
 using Core.Plugins.CommonTools.Gui.Properties;
 
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Ribbon.xaml.cs
===================================================================
diff -u -r932f87dd8538c3d52638a93e81ef631fbc9d763e -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision 932f87dd8538c3d52638a93e81ef631fbc9d763e)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Windows;
 using Core.Common.Controls;
+using Core.Common.Controls.Commands;
 using Core.Common.Gui.Forms;
 using Core.Plugins.CommonTools.Gui.Commands.Charting;
 
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.cs
===================================================================
diff -u -r44fce3b0d8942914f2678d8e33ca99646cf8062f -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.cs	(.../ProjectTreeView.cs)	(revision 44fce3b0d8942914f2678d8e33ca99646cf8062f)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectTreeView.cs	(.../ProjectTreeView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -5,6 +5,7 @@
 using Core.Common.Base.Plugin;
 using Core.Common.Controls;
 using Core.Common.Controls.Swf.TreeViewControls;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.Plugins.ProjectExplorer.NodePresenters;
 using TreeView = Core.Common.Controls.Swf.TreeViewControls.TreeView;
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Ribbon.xaml.cs
===================================================================
diff -u -r932f87dd8538c3d52638a93e81ef631fbc9d763e -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision 932f87dd8538c3d52638a93e81ef631fbc9d763e)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Windows;
 using Core.Common.Controls;
+using Core.Common.Controls.Commands;
 using Core.Common.Gui.Forms;
 using Core.Plugins.ProjectExplorer.Commands;
 
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/CanvasCommand.cs
===================================================================
diff -u -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/CanvasCommand.cs	(.../CanvasCommand.cs)	(revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/CanvasCommand.cs	(.../CanvasCommand.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,4 +1,5 @@
 using Core.Common.Controls;
+using Core.Common.Controls.Commands;
 using Core.Plugins.SharpMapGis.Gui.Forms;
 
 namespace Core.Plugins.SharpMapGis.Gui.Commands
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLegendView.cs
===================================================================
diff -u -r44fce3b0d8942914f2678d8e33ca99646cf8062f -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLegendView.cs	(.../MapLegendView.cs)	(revision 44fce3b0d8942914f2678d8e33ca99646cf8062f)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapLegendView/MapLegendView.cs	(.../MapLegendView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -6,6 +6,7 @@
 using System.Windows.Forms;
 using Core.Common.Controls;
 using Core.Common.Controls.Swf.TreeViewControls;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.GIS.GeoAPI.CoordinateSystems;
 using Core.GIS.SharpMap.Api.Layers;
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs
===================================================================
diff -u -rff2e1e6b0ff7be1e74fb44268f4fc83e39d224f1 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs	(.../MapView.cs)	(revision ff2e1e6b0ff7be1e74fb44268f4fc83e39d224f1)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapView.cs	(.../MapView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -6,6 +6,7 @@
 using System.Windows.Forms;
 using Core.Common.Controls;
 using Core.Common.Controls.Swf;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.Common.Utils.Collections;
 using Core.Common.Utils.Collections.Generic;
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapViewTabControl.cs
===================================================================
diff -u -r8376f3f25a98f8755479ed069c318e0b70922b38 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapViewTabControl.cs	(.../MapViewTabControl.cs)	(revision 8376f3f25a98f8755479ed069c318e0b70922b38)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Forms/MapViewTabControl.cs	(.../MapViewTabControl.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -5,6 +5,7 @@
 using System.Windows.Forms;
 using System.Windows.Forms.Integration;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.Common.Utils.Collections.Generic;
 using Xceed.Wpf.AvalonDock;
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/GisGuiService.cs
===================================================================
diff -u -r9f01c4daf5b7af6549045ed6ac404d18419c2555 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/GisGuiService.cs	(.../GisGuiService.cs)	(revision 9f01c4daf5b7af6549045ed6ac404d18419c2555)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/GisGuiService.cs	(.../GisGuiService.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.GIS.GeoAPI.Geometries;
 using Core.GIS.SharpMap.Api;
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/IGuiMapViewExtentions.cs
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/IGuiMapViewExtentions.cs	(.../IGuiMapViewExtentions.cs)	(revision a950714ad9510756331d862aa35695fa0b2ed03b)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/IGuiMapViewExtentions.cs	(.../IGuiMapViewExtentions.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.Plugins.SharpMapGis.Gui.Forms;
 
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Ribbon.xaml.cs
===================================================================
diff -u -r932f87dd8538c3d52638a93e81ef631fbc9d763e -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision 932f87dd8538c3d52638a93e81ef631fbc9d763e)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Windows;
 using Core.Common.Controls;
+using Core.Common.Controls.Commands;
 using Core.Common.Gui.Forms;
 using Core.GIS.SharpMap.UI.Tools.Decorations;
 using Core.Plugins.SharpMapGis.Gui.Commands;
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/SharpMapGisGuiPlugin.cs
===================================================================
diff -u -r44fce3b0d8942914f2678d8e33ca99646cf8062f -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/SharpMapGisGuiPlugin.cs	(.../SharpMapGisGuiPlugin.cs)	(revision 44fce3b0d8942914f2678d8e33ca99646cf8062f)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/SharpMapGisGuiPlugin.cs	(.../SharpMapGisGuiPlugin.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -10,6 +10,7 @@
 using Core.Common.Controls;
 using Core.Common.Controls.Swf.Table;
 using Core.Common.Controls.Swf.TreeViewControls;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.Common.Gui.Forms;
 using Core.Common.Utils;
Index: Core/Plugins/test/Core.Plugins.CommonTools.Gui.Test/TestViewList.cs
===================================================================
diff -u -rf6c37066281b4fb079758661aef9e15f0163b1e5 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Plugins/test/Core.Plugins.CommonTools.Gui.Test/TestViewList.cs	(.../TestViewList.cs)	(revision f6c37066281b4fb079758661aef9e15f0163b1e5)
+++ Core/Plugins/test/Core.Plugins.CommonTools.Gui.Test/TestViewList.cs	(.../TestViewList.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 using Core.Common.Gui;
 using Core.Common.Utils.Collections;
 
Index: Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapViewTest.cs
===================================================================
diff -u -rd6e6eadf4a2521df75b6d371bacbb181a43058a3 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapViewTest.cs	(.../MapViewTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
+++ Core/Plugins/test/Core.Plugins.SharpMapGis.Test/Forms/MapViewTest.cs	(.../MapViewTest.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -2,6 +2,7 @@
 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;
Index: Ringtoets/Demo/src/Ringtoets.Demo/RingtoetsDemoProjectRibbon.xaml.cs
===================================================================
diff -u -r932f87dd8538c3d52638a93e81ef631fbc9d763e -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Ringtoets/Demo/src/Ringtoets.Demo/RingtoetsDemoProjectRibbon.xaml.cs	(.../RingtoetsDemoProjectRibbon.xaml.cs)	(revision 932f87dd8538c3d52638a93e81ef631fbc9d763e)
+++ Ringtoets/Demo/src/Ringtoets.Demo/RingtoetsDemoProjectRibbon.xaml.cs	(.../RingtoetsDemoProjectRibbon.xaml.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -2,6 +2,7 @@
 using System.Windows;
 
 using Core.Common.Controls;
+using Core.Common.Controls.Commands;
 using Core.Common.Gui.Forms;
 
 using Ringtoets.Demo.Commands;
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs
===================================================================
diff -u -r83aacc6578d82137751a7d28f691e8b3d02312f1 -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs	(.../FailureMechanismContributionView.cs)	(revision 83aacc6578d82137751a7d28f691e8b3d02312f1)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs	(.../FailureMechanismContributionView.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -3,6 +3,7 @@
 using System.Windows.Forms;
 using Core.Common.Base;
 using Core.Common.Controls;
+using Core.Common.Controls.Views;
 using Core.Common.Gui.Properties;
 using Core.Common.Utils.Reflection;
 using Ringtoets.Integration.Data.Contribution;
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsRibbon.xaml.cs
===================================================================
diff -u -r932f87dd8538c3d52638a93e81ef631fbc9d763e -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsRibbon.xaml.cs	(.../RingtoetsRibbon.xaml.cs)	(revision 932f87dd8538c3d52638a93e81ef631fbc9d763e)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsRibbon.xaml.cs	(.../RingtoetsRibbon.xaml.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,6 +1,7 @@
 using System.Collections.Generic;
 
 using Core.Common.Controls;
+using Core.Common.Controls.Commands;
 using Core.Common.Gui.Forms;
 
 namespace Ringtoets.Integration.Plugin
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingRibbon.xaml.cs
===================================================================
diff -u -r932f87dd8538c3d52638a93e81ef631fbc9d763e -r0c09106be1dfa0dad80232e39fea48b274ecdf37
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingRibbon.xaml.cs	(.../PipingRibbon.xaml.cs)	(revision 932f87dd8538c3d52638a93e81ef631fbc9d763e)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingRibbon.xaml.cs	(.../PipingRibbon.xaml.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Core.Common.Controls;
+using Core.Common.Controls.Commands;
 using Core.Common.Gui.Forms;
 
 namespace Ringtoets.Piping.Plugin