Fisheye: Tag d1a8aeaa05c36dfe386de7586dd129819594ee97 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Controls/Commands/Command.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Controls/Commands/ICommand.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Controls/Commands/ICommand.cs	(revision 0)
+++ Core/Common/src/Core.Common.Controls/Commands/ICommand.cs	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
@@ -0,0 +1,23 @@
+namespace Core.Common.Controls.Commands
+{
+    /// <summary>
+    /// Abstract class that can be derived for defining the behaviour of (Ribbon) buttons and/or menu items.
+    /// </summary>
+    public interface ICommand
+    {
+        /// <summary>
+        /// Gets whether or not the <see cref="ICommand"/> is enabled.
+        /// </summary>
+        bool Enabled { get; }
+
+        /// <summary>
+        /// Gets whether or not the <see cref="ICommand"/> is checked.
+        /// </summary>
+        bool Checked { get; }
+
+        /// <summary>
+        /// This method implements the logic that should be performed after clicking the (Ribbon) button and/or menu item.
+        /// </summary>
+        void Execute(params object[] arguments);
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj
===================================================================
diff -u -r60284d242516286b70997e1894fa22b67d7f10ab -rd1a8aeaa05c36dfe386de7586dd129819594ee97
--- Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj	(.../Core.Common.Controls.csproj)	(revision 60284d242516286b70997e1894fa22b67d7f10ab)
+++ Core/Common/src/Core.Common.Controls/Core.Common.Controls.csproj	(.../Core.Common.Controls.csproj)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
@@ -77,7 +77,7 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="Commands\Command.cs" />
+    <Compile Include="Commands\ICommand.cs" />
     <Compile Include="Dialogs\DialogBase.cs">
       <SubType>Form</SubType>
     </Compile>
Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj
===================================================================
diff -u -r8cae5d69ac2d4cf678486ac2b457c0dfe97089d5 -rd1a8aeaa05c36dfe386de7586dd129819594ee97
--- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision 8cae5d69ac2d4cf678486ac2b457c0dfe97089d5)
+++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
@@ -220,7 +220,7 @@
     <Compile Include="GuiCommandHandler.cs" />
     <Compile Include="GuiExportHandler.cs" />
     <Compile Include="GuiImportHandler.cs" />
-    <Compile Include="GuiCommand.cs" />
+    <Compile Include="IGuiCommand.cs" />
     <Compile Include="ILayerEditorView.cs" />
     <Compile Include="IMapLayerProvider.cs" />
     <Compile Include="IObjectProperties.cs" />
Index: Core/Common/src/Core.Common.Gui/Forms/IRibbonCommandHandler.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -rd1a8aeaa05c36dfe386de7586dd129819594ee97
--- Core/Common/src/Core.Common.Gui/Forms/IRibbonCommandHandler.cs	(.../IRibbonCommandHandler.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Core/Common/src/Core.Common.Gui/Forms/IRibbonCommandHandler.cs	(.../IRibbonCommandHandler.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
@@ -12,7 +12,7 @@
         /// <summary>
         /// Call this action in the implementation when command needs to be handled in the graphical user interface.
         /// </summary>
-        IEnumerable<Command> Commands { get; }
+        IEnumerable<ICommand> Commands { get; }
 
         /// <summary>
         /// Gets Ribbon control implementation in the gui plugin. Gui will merge it with the existing ribbon.
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -rfa33f7c078c5d17f92f6a519f147a0a371593944 -rd1a8aeaa05c36dfe386de7586dd129819594ee97
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision fa33f7c078c5d17f92f6a519f147a0a371593944)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
@@ -986,7 +986,7 @@
             {
                 foreach (var command in ribbonExtension.Commands)
                 {
-                    var guiCommand = command as GuiCommand;
+                    var guiCommand = command as IGuiCommand;
                     if (guiCommand != null)
                     {
                         guiCommand.Gui = Gui;
Fisheye: Tag d1a8aeaa05c36dfe386de7586dd129819594ee97 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/GuiCommand.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Gui/IGui.cs
===================================================================
diff -u -re95dbee6ea6b002476a7827a03f6584b779ad594 -rd1a8aeaa05c36dfe386de7586dd129819594ee97
--- Core/Common/src/Core.Common.Gui/IGui.cs	(.../IGui.cs)	(revision e95dbee6ea6b002476a7827a03f6584b779ad594)
+++ Core/Common/src/Core.Common.Gui/IGui.cs	(.../IGui.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
@@ -54,7 +54,7 @@
         /// <summary>
         /// Gets commands.
         /// </summary>
-        IList<GuiCommand> Commands { get; }
+        IList<IGuiCommand> Commands { get; }
 
         /// <summary>
         ///  Gets all document views currently opened in the gui.
Fisheye: Tag 2b1937d120d50436169ef18d9fce57d4400d1bbe refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/IGuiCommand.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Gui/RingtoetsGui.cs
===================================================================
diff -u -r8cae5d69ac2d4cf678486ac2b457c0dfe97089d5 -rd1a8aeaa05c36dfe386de7586dd129819594ee97
--- Core/Common/src/Core.Common.Gui/RingtoetsGui.cs	(.../RingtoetsGui.cs)	(revision 8cae5d69ac2d4cf678486ac2b457c0dfe97089d5)
+++ Core/Common/src/Core.Common.Gui/RingtoetsGui.cs	(.../RingtoetsGui.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
@@ -46,7 +46,7 @@
         private static RingtoetsGui instance;
         private static string instanceCreationStackTrace;
 
-        private readonly IList<GuiCommand> commands = new List<GuiCommand>();
+        private readonly IList<IGuiCommand> commands = new List<IGuiCommand>();
         private readonly ApplicationCore applicationCore;
 
         private MainWindow mainWindow;
@@ -176,7 +176,7 @@
             }
         }
 
-        public IList<GuiCommand> Commands
+        public IList<IGuiCommand> Commands
         {
             get
             {
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/ChartViewCommandBase.cs
===================================================================
diff -u -rb0df2017d77cc00832a846a46518a2c96f927247 -rd1a8aeaa05c36dfe386de7586dd129819594ee97
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/ChartViewCommandBase.cs	(.../ChartViewCommandBase.cs)	(revision b0df2017d77cc00832a846a46518a2c96f927247)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/ChartViewCommandBase.cs	(.../ChartViewCommandBase.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
@@ -9,24 +9,28 @@
     /// Classes derived from this class will have a possibility to obtain the active
     /// <see cref="ChartView"/> (if any) and the <see cref="IGui"/>.
     /// </summary>
-    public abstract class ChartViewCommandBase : GuiCommand
+    public abstract class ChartViewCommandBase : IGuiCommand
     {
-        public override bool Enabled
+        public virtual bool Enabled
         {
             get
             {
                 return View != null;
             }
         }
 
-        public override bool Checked
+        public virtual bool Checked
         {
             get
             {
                 return false;
             }
         }
 
+        public IGui Gui { get; set; }
+
+        public abstract void Execute(params object[] arguments);
+
         /// <summary>
         /// Gets the currently active view if it is a <see cref="ChartView"/> and
         /// <c>null</c> otherwise.
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/ShowChartLegendViewCommand.cs
===================================================================
diff -u -rb0ebc3d3a65294faaf85d5f3b8f612efe61c5915 -rd1a8aeaa05c36dfe386de7586dd129819594ee97
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/ShowChartLegendViewCommand.cs	(.../ShowChartLegendViewCommand.cs)	(revision b0ebc3d3a65294faaf85d5f3b8f612efe61c5915)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/ShowChartLegendViewCommand.cs	(.../ShowChartLegendViewCommand.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
@@ -4,9 +4,9 @@
 
 namespace Core.Plugins.CommonTools.Gui.Commands.Charting
 {
-    public class ShowChartLegendViewCommand : GuiCommand
+    public class ShowChartLegendViewCommand : IGuiCommand
     {
-        public override bool Checked
+        public bool Checked
         {
             get
             {
@@ -23,20 +23,22 @@
             }
         }
 
-        public override bool Enabled
+        public bool Enabled
         {
             get
             {
                 return true;
             }
         }
 
+        public IGui Gui { get; set; }
+
         /// <summary>
         /// Opens the <see cref="ChartLegendView"/> in the UI when it was closed.
         /// Closes the <see cref="ChartLegendView"/> in the UI when it was open.
         /// </summary>
         /// <param name="arguments">No arguments are needed when calling this method.</param>
-        public override void Execute(params object[] arguments)
+        public void Execute(params object[] arguments)
         {
             var commonToolsGuiPlugin = Gui.Plugins.OfType<CommonToolsGuiPlugin>().FirstOrDefault();
             if (commonToolsGuiPlugin == null)
Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Ribbon.xaml.cs
===================================================================
diff -u -r10671f81a86637fcab2f4a38af58a9899ca1b240 -rd1a8aeaa05c36dfe386de7586dd129819594ee97
--- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision 10671f81a86637fcab2f4a38af58a9899ca1b240)
+++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
@@ -29,7 +29,7 @@
             chartTab.Group = chartingContextualGroup;
         }
 
-        public IEnumerable<Command> Commands
+        public IEnumerable<ICommand> Commands
         {
             get
             {
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Commands/ShowProjectExplorerCommand.cs
===================================================================
diff -u -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e -rd1a8aeaa05c36dfe386de7586dd129819594ee97
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/Commands/ShowProjectExplorerCommand.cs	(.../ShowProjectExplorerCommand.cs)	(revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Commands/ShowProjectExplorerCommand.cs	(.../ShowProjectExplorerCommand.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
@@ -2,17 +2,17 @@
 
 namespace Core.Plugins.ProjectExplorer.Commands
 {
-    public class ShowProjectExplorerCommand : GuiCommand
+    public class ShowProjectExplorerCommand : IGuiCommand
     {
-        public override bool Enabled
+        public bool Enabled
         {
             get
             {
                 return true;
             }
         }
 
-        public override bool Checked
+        public bool Checked
         {
             get
             {
@@ -25,7 +25,9 @@
             }
         }
 
-        public override void Execute(params object[] arguments)
+        public IGui Gui { get; set; }
+
+        public void Execute(params object[] arguments)
         {
             var view = ProjectExplorerGuiPlugin.Instance.ProjectExplorer;
             var active = Gui.ToolWindowViews.Contains(view);
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Ribbon.xaml.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -rd1a8aeaa05c36dfe386de7586dd129819594ee97
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
@@ -12,7 +12,7 @@
     /// </summary>
     public partial class Ribbon : IRibbonCommandHandler
     {
-        private readonly Command showProjectExplorerCommand;
+        private readonly ICommand showProjectExplorerCommand;
 
         public Ribbon()
         {
@@ -21,7 +21,7 @@
             showProjectExplorerCommand = new ShowProjectExplorerCommand();
         }
 
-        public IEnumerable<Command> Commands
+        public IEnumerable<ICommand> Commands
         {
             get
             {
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/CanvasCommand.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -rd1a8aeaa05c36dfe386de7586dd129819594ee97
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/CanvasCommand.cs	(.../CanvasCommand.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/CanvasCommand.cs	(.../CanvasCommand.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
@@ -1,10 +1,9 @@
-using Core.Common.Controls;
-using Core.Common.Controls.Commands;
+using Core.Common.Controls.Commands;
 using Core.Plugins.SharpMapGis.Gui.Forms;
 
 namespace Core.Plugins.SharpMapGis.Gui.Commands
 {
-    public abstract class CanvasCommand : Command
+    public abstract class CanvasCommand : ICommand
     {
         protected MapView CanvasEditor
         {
@@ -14,6 +13,10 @@
             }
         }
 
-        public override void Execute(params object[] arguments) { }
+        public abstract bool Enabled { get; }
+
+        public abstract bool Checked { get; }
+
+        public abstract void Execute(params object[] arguments);
     }
 }
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapViewCommand.cs
===================================================================
diff -u -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e -rd1a8aeaa05c36dfe386de7586dd129819594ee97
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapViewCommand.cs	(.../MapViewCommand.cs)	(revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapViewCommand.cs	(.../MapViewCommand.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
@@ -5,24 +5,28 @@
 
 namespace Core.Plugins.SharpMapGis.Gui.Commands
 {
-    public abstract class MapViewCommand : GuiCommand
+    public abstract class MapViewCommand : IGuiCommand
     {
-        public override bool Enabled
+        public virtual bool Enabled
         {
             get
             {
                 return MapView != null;
             }
         }
 
-        public override bool Checked
+        public virtual bool Checked
         {
             get
             {
                 return CurrentTool != null && CurrentTool.IsActive;
             }
         }
 
+        public IGui Gui { get; set; }
+
+        public abstract void Execute(params object[] arguments);
+
         protected MapView MapView
         {
             get
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/ShowMapContentsCommand.cs
===================================================================
diff -u -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e -rd1a8aeaa05c36dfe386de7586dd129819594ee97
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/ShowMapContentsCommand.cs	(.../ShowMapContentsCommand.cs)	(revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/ShowMapContentsCommand.cs	(.../ShowMapContentsCommand.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
@@ -3,17 +3,17 @@
 
 namespace Core.Plugins.SharpMapGis.Gui.Commands
 {
-    public class ShowMapContentsCommand : GuiCommand
+    public class ShowMapContentsCommand : IGuiCommand
     {
-        public override bool Enabled
+        public bool Enabled
         {
             get
             {
                 return true;
             }
         }
 
-        public override bool Checked
+        public bool Checked
         {
             get
             {
@@ -26,7 +26,9 @@
             }
         }
 
-        public override void Execute(params object[] arguments)
+        public IGui Gui { get; set; }
+
+        public void Execute(params object[] arguments)
         {
             var sharpMapGisGuiPlugin = Gui.Plugins.OfType<SharpMapGisGuiPlugin>().FirstOrDefault();
             if (sharpMapGisGuiPlugin == null)
Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Ribbon.xaml.cs
===================================================================
diff -u -r1899a06b3ee41beba4a7835b0c92d2b99ce93ee6 -rd1a8aeaa05c36dfe386de7586dd129819594ee97
--- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision 1899a06b3ee41beba4a7835b0c92d2b99ce93ee6)
+++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Ribbon.xaml.cs	(.../Ribbon.xaml.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
@@ -16,29 +16,29 @@
     public partial class Ribbon : IRibbonCommandHandler
     {
         // view
-        private readonly Command commandShowMapContents;
+        private readonly ICommand commandShowMapContents;
 
         // map decorations
-        private readonly Command showNorthArrow;
-        private readonly Command showMapLegend;
-        private readonly Command showScaleBar;
+        private readonly ICommand showNorthArrow;
+        private readonly ICommand showMapLegend;
+        private readonly ICommand showScaleBar;
 
         // map interaction
-        private readonly Command selectButton;
-        private readonly Command mapMeasureCommand;
-        private readonly Command exportMapAsImage;
+        private readonly ICommand selectButton;
+        private readonly ICommand mapMeasureCommand;
+        private readonly ICommand exportMapAsImage;
 
         // map zoom
-        private readonly Command mapZoomInUsingRectangleCommand;
-        private readonly Command mapFixedZoomInCommand;
-        private readonly Command mapFixedZoomOutCommand;
-        private readonly Command mapZoomToExtentsCommand;
-        private readonly Command mapPanZoomCommand;
-        private readonly Command mapZoomPreviousCommand;
-        private readonly Command mapZoomNextCommand;
+        private readonly ICommand mapZoomInUsingRectangleCommand;
+        private readonly ICommand mapFixedZoomInCommand;
+        private readonly ICommand mapFixedZoomOutCommand;
+        private readonly ICommand mapZoomToExtentsCommand;
+        private readonly ICommand mapPanZoomCommand;
+        private readonly ICommand mapZoomPreviousCommand;
+        private readonly ICommand mapZoomNextCommand;
 
         // map coverage profile
-        private readonly Command mapChangeCoordinateSystemCommand;
+        private readonly ICommand mapChangeCoordinateSystemCommand;
 
         public Ribbon()
         {
@@ -88,7 +88,7 @@
             mapTab.Group = geospatialContextualGroup;
         }
 
-        public IEnumerable<Command> Commands
+        public IEnumerable<ICommand> Commands
         {
             get
             {
Index: Ringtoets/Demo/src/Ringtoets.Demo/Commands/AddNewDemoDikeAssessmentSectionCommand.cs
===================================================================
diff -u -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e -rd1a8aeaa05c36dfe386de7586dd129819594ee97
--- Ringtoets/Demo/src/Ringtoets.Demo/Commands/AddNewDemoDikeAssessmentSectionCommand.cs	(.../AddNewDemoDikeAssessmentSectionCommand.cs)	(revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e)
+++ Ringtoets/Demo/src/Ringtoets.Demo/Commands/AddNewDemoDikeAssessmentSectionCommand.cs	(.../AddNewDemoDikeAssessmentSectionCommand.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
@@ -2,9 +2,7 @@
 using System.IO;
 using System.Linq;
 using System.Reflection;
-
 using Core.Common.Gui;
-
 using Ringtoets.Integration.Data;
 using Ringtoets.Piping.Data;
 using Ringtoets.Piping.Plugin.FileImporter;
@@ -14,25 +12,27 @@
     /// <summary>
     /// Command that adds a new <see cref="DikeAssessmentSection"/> with demo data to the project tree.
     /// </summary>
-    public class AddNewDemoDikeAssessmentSectionCommand : GuiCommand
+    public class AddNewDemoDikeAssessmentSectionCommand : IGuiCommand
     {
-        public override bool Enabled
+        public bool Enabled
         {
             get
             {
                 return true;
             }
         }
 
-        public override bool Checked
+        public bool Checked
         {
             get
             {
                 return false;
             }
         }
 
-        public override void Execute(params object[] arguments)
+        public IGui Gui { get; set; }
+
+        public void Execute(params object[] arguments)
         {
             var project = Gui.Project;
             project.Items.Add(CreateNewDemoAssessmentSection());
@@ -121,7 +121,7 @@
             {
                 var bytes = new byte[stream.Length];
                 var reader = new BinaryReader(stream);
-                reader.Read(bytes, 0, (int)stream.Length);
+                reader.Read(bytes, 0, (int) stream.Length);
                 return bytes;
             }
         }
Index: Ringtoets/Demo/src/Ringtoets.Demo/Commands/AddNewDemoDuneAssessmentSectionCommand.cs
===================================================================
diff -u -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e -rd1a8aeaa05c36dfe386de7586dd129819594ee97
--- Ringtoets/Demo/src/Ringtoets.Demo/Commands/AddNewDemoDuneAssessmentSectionCommand.cs	(.../AddNewDemoDuneAssessmentSectionCommand.cs)	(revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e)
+++ Ringtoets/Demo/src/Ringtoets.Demo/Commands/AddNewDemoDuneAssessmentSectionCommand.cs	(.../AddNewDemoDuneAssessmentSectionCommand.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
@@ -1,31 +1,32 @@
 using Core.Common.Gui;
-
 using Ringtoets.Integration.Data;
 
 namespace Ringtoets.Demo.Commands
 {
     /// <summary>
     /// Command that adds a new <see cref="DuneAssessmentSection"/> with demo data to the project tree.
     /// </summary>
-    public class AddNewDemoDuneAssessmentSectionCommand : GuiCommand
+    public class AddNewDemoDuneAssessmentSectionCommand : IGuiCommand
     {
-        public override bool Enabled
+        public bool Enabled
         {
             get
             {
                 return true;
             }
         }
 
-        public override bool Checked
+        public bool Checked
         {
             get
             {
                 return false;
             }
         }
 
-        public override void Execute(params object[] arguments)
+        public IGui Gui { get; set; }
+
+        public void Execute(params object[] arguments)
         {
             var project = Gui.Project;
             project.Items.Add(CreateNewDemoAssessmentSection());
Index: Ringtoets/Demo/src/Ringtoets.Demo/RingtoetsDemoProjectRibbon.xaml.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -rd1a8aeaa05c36dfe386de7586dd129819594ee97
--- Ringtoets/Demo/src/Ringtoets.Demo/RingtoetsDemoProjectRibbon.xaml.cs	(.../RingtoetsDemoProjectRibbon.xaml.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Ringtoets/Demo/src/Ringtoets.Demo/RingtoetsDemoProjectRibbon.xaml.cs	(.../RingtoetsDemoProjectRibbon.xaml.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
@@ -16,7 +16,7 @@
     /// </summary>
     public partial class RingtoetsDemoProjectRibbon : IRibbonCommandHandler
     {
-        private readonly Command addNewDikeAssessmentSection, addNewDuneAssessmentSection;
+        private readonly ICommand addNewDikeAssessmentSection, addNewDuneAssessmentSection;
 
         public RingtoetsDemoProjectRibbon()
         {
@@ -26,7 +26,7 @@
             addNewDuneAssessmentSection = new AddNewDemoDuneAssessmentSectionCommand();
         }
 
-        public IEnumerable<Command> Commands
+        public IEnumerable<ICommand> Commands
         {
             get
             {
Index: Ringtoets/Demo/test/Ringtoets.Demo.Test/Commands/AddNewDemoDikeAssessmentSectionCommandTest.cs
===================================================================
diff -u -r932f87dd8538c3d52638a93e81ef631fbc9d763e -rd1a8aeaa05c36dfe386de7586dd129819594ee97
--- Ringtoets/Demo/test/Ringtoets.Demo.Test/Commands/AddNewDemoDikeAssessmentSectionCommandTest.cs	(.../AddNewDemoDikeAssessmentSectionCommandTest.cs)	(revision 932f87dd8538c3d52638a93e81ef631fbc9d763e)
+++ Ringtoets/Demo/test/Ringtoets.Demo.Test/Commands/AddNewDemoDikeAssessmentSectionCommandTest.cs	(.../AddNewDemoDikeAssessmentSectionCommandTest.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
@@ -24,7 +24,7 @@
             var command = new AddNewDemoDikeAssessmentSectionCommand();
 
             // Assert
-            Assert.IsInstanceOf<GuiCommand>(command);
+            Assert.IsInstanceOf<IGuiCommand>(command);
             Assert.IsTrue(command.Enabled);
             Assert.IsFalse(command.Checked);
             Assert.IsNull(command.Gui);
Index: Ringtoets/Demo/test/Ringtoets.Demo.Test/Commands/AddNewDemoDuneAssessmentSectionCommandTest.cs
===================================================================
diff -u -r932f87dd8538c3d52638a93e81ef631fbc9d763e -rd1a8aeaa05c36dfe386de7586dd129819594ee97
--- Ringtoets/Demo/test/Ringtoets.Demo.Test/Commands/AddNewDemoDuneAssessmentSectionCommandTest.cs	(.../AddNewDemoDuneAssessmentSectionCommandTest.cs)	(revision 932f87dd8538c3d52638a93e81ef631fbc9d763e)
+++ Ringtoets/Demo/test/Ringtoets.Demo.Test/Commands/AddNewDemoDuneAssessmentSectionCommandTest.cs	(.../AddNewDemoDuneAssessmentSectionCommandTest.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
@@ -20,7 +20,7 @@
             var command = new AddNewDemoDuneAssessmentSectionCommand();
 
             // Assert
-            Assert.IsInstanceOf<GuiCommand>(command);
+            Assert.IsInstanceOf<IGuiCommand>(command);
             Assert.IsTrue(command.Enabled);
             Assert.IsFalse(command.Checked);
             Assert.IsNull(command.Gui);
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsRibbon.xaml.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -rd1a8aeaa05c36dfe386de7586dd129819594ee97
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsRibbon.xaml.cs	(.../RingtoetsRibbon.xaml.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsRibbon.xaml.cs	(.../RingtoetsRibbon.xaml.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
@@ -19,7 +19,7 @@
             InitializeComponent();
         }
 
-        public IEnumerable<Command> Commands
+        public IEnumerable<ICommand> Commands
         {
             get
             {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingRibbon.xaml.cs
===================================================================
diff -u -r0c09106be1dfa0dad80232e39fea48b274ecdf37 -rd1a8aeaa05c36dfe386de7586dd129819594ee97
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingRibbon.xaml.cs	(.../PipingRibbon.xaml.cs)	(revision 0c09106be1dfa0dad80232e39fea48b274ecdf37)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingRibbon.xaml.cs	(.../PipingRibbon.xaml.cs)	(revision d1a8aeaa05c36dfe386de7586dd129819594ee97)
@@ -15,7 +15,7 @@
             InitializeComponent();
         }
 
-        public IEnumerable<Command> Commands
+        public IEnumerable<ICommand> Commands
         {
             get
             {