Index: Core/Common/src/Core.Common.Controls/Command.cs =================================================================== diff -u -r932f87dd8538c3d52638a93e81ef631fbc9d763e -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Common/src/Core.Common.Controls/Command.cs (.../Command.cs) (revision 932f87dd8538c3d52638a93e81ef631fbc9d763e) +++ Core/Common/src/Core.Common.Controls/Command.cs (.../Command.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -1,29 +1,23 @@ namespace Core.Common.Controls { /// - /// Linking command to button. Using the Command Pattern in Windows Forms clients. + /// Abstract class that can be derivied for defining the behaviour of (Ribbon) buttons and/or menu items. /// - /// - /// This example demonstrates how to create a Button, hook it up to a Command with a minimum of code and let the power of data binding deal with turning the command on and off: - /// - /// Button button = new Button(); - /// Command command = new ArbitraryCommand("My Data"); - /// button.DataBindings.Add("Text", command, "DisplayName"); - /// button.DataBindings.Add("Enabled", command, "Enabled"); - /// button.Click += delegate { command.Execute(); }; - /// - /// public abstract class Command { + /// + /// Gets whether or not the is enabled. + /// public abstract bool Enabled { get; } - public virtual bool Checked { set; get; } + /// + /// Gets whether or not the is checked. + /// + public abstract bool Checked { get; } - public void Execute(params object[] arguments) - { - OnExecute(arguments); - } - - protected abstract void OnExecute(params object[] arguments); + /// + /// This method implements the logic that should be performed after clicking the (Ribbon) button and/or menu item. + /// + public abstract void Execute(params object[] arguments); } } \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/ExportChartAsImageCommand.cs =================================================================== diff -u -r2b1937d120d50436169ef18d9fce57d4400d1bbe -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/ExportChartAsImageCommand.cs (.../ExportChartAsImageCommand.cs) (revision 2b1937d120d50436169ef18d9fce57d4400d1bbe) +++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/ExportChartAsImageCommand.cs (.../ExportChartAsImageCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -7,7 +7,7 @@ { public class IncreaseFontSizeCommand : ChartViewCommandBase { - protected override void OnExecute(params object[] arguments) + public override void Execute(params object[] arguments) { var view = View; if (view != null) @@ -26,7 +26,7 @@ public class DecreaseFontSizeCommand : ChartViewCommandBase { - protected override void OnExecute(params object[] arguments) + public override void Execute(params object[] arguments) { var view = View; if (view != null) @@ -45,7 +45,7 @@ public class ExportChartAsImageCommand : ChartViewCommandBase { - protected override void OnExecute(params object[] arguments) + public override void Execute(params object[] arguments) { var view = View; if (view != null) @@ -65,6 +65,14 @@ } } + public override bool Checked + { + get + { + return false; + } + } + protected ChartView View { get @@ -75,8 +83,6 @@ } } - protected abstract override void OnExecute(params object[] arguments); - protected Font GetChangedFontSize(Font font, int pixels) { return new Font(font.FontFamily, font.Size + pixels, font.Style); Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/RulerCommand.cs =================================================================== diff -u -r2b1937d120d50436169ef18d9fce57d4400d1bbe -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/RulerCommand.cs (.../RulerCommand.cs) (revision 2b1937d120d50436169ef18d9fce57d4400d1bbe) +++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/RulerCommand.cs (.../RulerCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -23,7 +23,7 @@ } } - protected override void OnExecute(params object[] arguments) + public override void Execute(params object[] arguments) { var view = RulerTool; if (view == null || arguments.Length == 0) Index: Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/ShowChartLegendViewCommand.cs =================================================================== diff -u -r2b1937d120d50436169ef18d9fce57d4400d1bbe -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/ShowChartLegendViewCommand.cs (.../ShowChartLegendViewCommand.cs) (revision 2b1937d120d50436169ef18d9fce57d4400d1bbe) +++ Core/Plugins/src/Core.Plugins.CommonTools.Gui/Commands/Charting/ShowChartLegendViewCommand.cs (.../ShowChartLegendViewCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -26,7 +26,7 @@ } } - protected override void OnExecute(params object[] arguments) + public override void Execute(params object[] arguments) { var commonToolsGuiPlugin = Gui.Plugins.OfType().FirstOrDefault(); if (commonToolsGuiPlugin == null) Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/Commands/ShowProjectExplorerCommand.cs =================================================================== diff -u -r2b1937d120d50436169ef18d9fce57d4400d1bbe -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Plugins/src/Core.Plugins.ProjectExplorer/Commands/ShowProjectExplorerCommand.cs (.../ShowProjectExplorerCommand.cs) (revision 2b1937d120d50436169ef18d9fce57d4400d1bbe) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/Commands/ShowProjectExplorerCommand.cs (.../ShowProjectExplorerCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -25,7 +25,7 @@ } } - protected override void OnExecute(params object[] arguments) + public override void Execute(params object[] arguments) { var view = ProjectExplorerGuiPlugin.Instance.ProjectExplorer; var active = Gui.ToolWindowViews.Contains(view); Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/CanvasCommand.cs =================================================================== diff -u -r9df3dc4632e7821cb36847336c6d90654e40ece9 -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/CanvasCommand.cs (.../CanvasCommand.cs) (revision 9df3dc4632e7821cb36847336c6d90654e40ece9) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/CanvasCommand.cs (.../CanvasCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -13,6 +13,6 @@ } } - protected override void OnExecute(params object[] arguments) {} + public override void Execute(params object[] arguments) { } } } \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/ExportMapAsImageCommand.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/ExportMapAsImageCommand.cs (.../ExportMapAsImageCommand.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/ExportMapAsImageCommand.cs (.../ExportMapAsImageCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -5,7 +5,7 @@ { public class ExportMapAsImageCommand : MapViewCommand { - protected override void OnExecute(params object[] arguments) + public override void Execute(params object[] arguments) { var exportMapTool = MapView.MapControl.Tools.First(tool => tool is ExportMapToImageMapTool); exportMapTool.Execute(); Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/LayoutComponentToolCommand.cs =================================================================== diff -u -r2b1937d120d50436169ef18d9fce57d4400d1bbe -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/LayoutComponentToolCommand.cs (.../LayoutComponentToolCommand.cs) (revision 2b1937d120d50436169ef18d9fce57d4400d1bbe) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/LayoutComponentToolCommand.cs (.../LayoutComponentToolCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -17,10 +17,6 @@ return false; } - set - { - base.Checked = value; - } } protected override IMapTool CurrentTool @@ -36,7 +32,7 @@ } } - protected override void OnExecute(object[] arguments) + public override void Execute(object[] arguments) { var layoutComponentTool = CurrentTool as LayoutComponentTool; if (layoutComponentTool != null) @@ -61,8 +57,6 @@ // Refresh the map control MapView.MapControl.Refresh(); } - - base.OnExecute(arguments); } } } \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapAddLayerCommand.cs =================================================================== diff -u -re5cd358fe021d2c9d042e226cc00db06578619e3 -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapAddLayerCommand.cs (.../MapAddLayerCommand.cs) (revision e5cd358fe021d2c9d042e226cc00db06578619e3) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapAddLayerCommand.cs (.../MapAddLayerCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -63,7 +63,7 @@ } } - protected override void OnExecute(params object[] arguments) + public override void Execute(params object[] arguments) { string path = null; if (arguments.Length > 0) Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapChangeCoordinateSystemCommand.cs =================================================================== diff -u -re5cd358fe021d2c9d042e226cc00db06578619e3 -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapChangeCoordinateSystemCommand.cs (.../MapChangeCoordinateSystemCommand.cs) (revision e5cd358fe021d2c9d042e226cc00db06578619e3) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapChangeCoordinateSystemCommand.cs (.../MapChangeCoordinateSystemCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -14,10 +14,9 @@ { return false; } - set {} } - protected override void OnExecute(params object[] arguments) + public override void Execute(params object[] arguments) { var activeView = SharpMapGisGuiPlugin.GetFocusedMapView(); @@ -34,13 +33,9 @@ catch (CoordinateTransformException e) { var message = string.Format(Resources.MapChangeCoordinateSystemCommand_OnExecute_Cannot_convert_map_to_selected_coordinate_system_0_,e.Message); - MessageBox.Show(message, - Resources.MapChangeCoordinateSystemCommand_OnExecute_Map_coordinate_system, MessageBoxButtons.OK, MessageBoxIcon.Error); - base.OnExecute(arguments); + MessageBox.Show(message, Resources.MapChangeCoordinateSystemCommand_OnExecute_Map_coordinate_system, MessageBoxButtons.OK, MessageBoxIcon.Error); } } - - base.OnExecute(arguments); } } } \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapFixedZoomInCommand.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapFixedZoomInCommand.cs (.../MapFixedZoomInCommand.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapFixedZoomInCommand.cs (.../MapFixedZoomInCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -12,17 +12,14 @@ { return false; } - set {} } - protected override void OnExecute(params object[] arguments) + public override void Execute(params object[] arguments) { MapView activeView = SharpMapGisGuiPlugin.GetFocusedMapView(); IMapTool tool = activeView.MapControl.GetToolByType(); tool.Execute(); - - base.OnExecute(arguments); } } } \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapFixedZoomOutCommand.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapFixedZoomOutCommand.cs (.../MapFixedZoomOutCommand.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapFixedZoomOutCommand.cs (.../MapFixedZoomOutCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -11,17 +11,14 @@ { return false; } - set {} } - protected override void OnExecute(params object[] arguments) + public override void Execute(params object[] arguments) { var activeView = SharpMapGisGuiPlugin.GetFocusedMapView(); IMapTool tool = activeView.MapControl.GetToolByType(); tool.Execute(); - - base.OnExecute(arguments); } } } \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapMeasureCommand.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapMeasureCommand.cs (.../MapMeasureCommand.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapMeasureCommand.cs (.../MapMeasureCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -16,7 +16,7 @@ } } - protected override void OnExecute(object[] arguments) + public override void Execute(object[] arguments) { var tool = CurrentTool; @@ -31,8 +31,6 @@ MapView.MapControl.ActivateTool(tool); } } - - base.OnExecute(arguments); } } } \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapPanZoomCommand.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapPanZoomCommand.cs (.../MapPanZoomCommand.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapPanZoomCommand.cs (.../MapPanZoomCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -14,11 +14,10 @@ } } - protected override void OnExecute(params object[] arguments) + public override void Execute(params object[] arguments) { MapView activeView = SharpMapGisGuiPlugin.GetFocusedMapView(); activeView.MapControl.ActivateTool(CurrentTool); - base.OnExecute(arguments); } } } \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapViewCommand.cs =================================================================== diff -u -r2b1937d120d50436169ef18d9fce57d4400d1bbe -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapViewCommand.cs (.../MapViewCommand.cs) (revision 2b1937d120d50436169ef18d9fce57d4400d1bbe) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapViewCommand.cs (.../MapViewCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -21,10 +21,6 @@ { return CurrentTool != null && CurrentTool.IsActive; } - set - { - base.Checked = value; - } } protected MapView MapView @@ -50,7 +46,5 @@ return null; } } - - protected override void OnExecute(params object[] arguments) {} } } \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapZoomHistoryCommand.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapZoomHistoryCommand.cs (.../MapZoomHistoryCommand.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapZoomHistoryCommand.cs (.../MapZoomHistoryCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -10,7 +10,6 @@ { return false; } - set {} } public ZoomHistoryTool ZoomHistoryToolMapTool Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapZoomInUsingRectangleCommand.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapZoomInUsingRectangleCommand.cs (.../MapZoomInUsingRectangleCommand.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapZoomInUsingRectangleCommand.cs (.../MapZoomInUsingRectangleCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -13,11 +13,10 @@ } } - protected override void OnExecute(params object[] arguments) + public override void Execute(params object[] arguments) { var activeView = SharpMapGisGuiPlugin.GetFocusedMapView(); activeView.MapControl.ActivateTool(CurrentTool); - base.OnExecute(arguments); } } } \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapZoomNextCommand.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapZoomNextCommand.cs (.../MapZoomNextCommand.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapZoomNextCommand.cs (.../MapZoomNextCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -15,12 +15,10 @@ } } - protected override void OnExecute(params object[] arguments) + public override void Execute(params object[] arguments) { ZoomHistoryToolMapTool.NextZoomState(); MapView.MapControl.Refresh(); - - base.OnExecute(arguments); } } } \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapZoomPreviousCommand.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapZoomPreviousCommand.cs (.../MapZoomPreviousCommand.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapZoomPreviousCommand.cs (.../MapZoomPreviousCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -15,12 +15,10 @@ } } - protected override void OnExecute(params object[] arguments) + public override void Execute(params object[] arguments) { ZoomHistoryToolMapTool.PreviousZoomState(); MapView.MapControl.Refresh(); - - base.OnExecute(arguments); } } } \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapZoomToExtentsCommand.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapZoomToExtentsCommand.cs (.../MapZoomToExtentsCommand.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapZoomToExtentsCommand.cs (.../MapZoomToExtentsCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -10,15 +10,14 @@ { return false; } - set {} } /// /// if arguments is null the active mapview will zoom to it's default extents. /// Otherwise the first arguments will be assumed to be a mapview and the active view will zoom to that map extents /// /// - protected override void OnExecute(params object[] arguments) + public override void Execute(params object[] arguments) { MapView targetView = null; if (arguments.Length == 1) //target extent Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapZoomToFeatureCommand.cs =================================================================== diff -u -r9f01c4daf5b7af6549045ed6ac404d18419c2555 -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapZoomToFeatureCommand.cs (.../MapZoomToFeatureCommand.cs) (revision 9f01c4daf5b7af6549045ed6ac404d18419c2555) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/MapZoomToFeatureCommand.cs (.../MapZoomToFeatureCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -9,7 +9,7 @@ /// first argument IFeature is expected as /// /// - protected override void OnExecute(params object[] arguments) + public override void Execute(params object[] arguments) { MapView activeView = SharpMapGisGuiPlugin.GetFocusedMapView(); if (activeView == null) Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/SelectCommand.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/SelectCommand.cs (.../SelectCommand.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/SelectCommand.cs (.../SelectCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -18,7 +18,7 @@ } } - protected override void OnExecute(params object[] arguments) + public override void Execute(params object[] arguments) { CanvasEditor.IsSelectItemActive = true; } Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/ShowMapContentsCommand.cs =================================================================== diff -u -r2b1937d120d50436169ef18d9fce57d4400d1bbe -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/ShowMapContentsCommand.cs (.../ShowMapContentsCommand.cs) (revision 2b1937d120d50436169ef18d9fce57d4400d1bbe) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/ShowMapContentsCommand.cs (.../ShowMapContentsCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -26,7 +26,7 @@ } } - protected override void OnExecute(params object[] arguments) + public override void Execute(params object[] arguments) { var sharpMapGisGuiPlugin = Gui.Plugins.OfType().FirstOrDefault(); if (sharpMapGisGuiPlugin == null) Index: Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/ZoomLayerCommand.cs =================================================================== diff -u -r10b304d4b5cb2283801cdb16204baf2a42ab5967 -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/ZoomLayerCommand.cs (.../ZoomLayerCommand.cs) (revision 10b304d4b5cb2283801cdb16204baf2a42ab5967) +++ Core/Plugins/src/Core.Plugins.SharpMapGis.Gui/Commands/ZoomLayerCommand.cs (.../ZoomLayerCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -9,7 +9,7 @@ { public class ZoomLayerCommand : MapViewCommand { - protected override void OnExecute(params object[] arguments) + public override void Execute(params object[] arguments) { // parameter 0 must be a layer ILayer layer = (arguments[0] is ILayer) ? arguments[0] as ILayer : null; Index: Ringtoets/Demo/src/Ringtoets.Demo/Commands/AddNewDemoDikeAssessmentSectionCommand.cs =================================================================== diff -u -r2b1937d120d50436169ef18d9fce57d4400d1bbe -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Ringtoets/Demo/src/Ringtoets.Demo/Commands/AddNewDemoDikeAssessmentSectionCommand.cs (.../AddNewDemoDikeAssessmentSectionCommand.cs) (revision 2b1937d120d50436169ef18d9fce57d4400d1bbe) +++ Ringtoets/Demo/src/Ringtoets.Demo/Commands/AddNewDemoDikeAssessmentSectionCommand.cs (.../AddNewDemoDikeAssessmentSectionCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -24,8 +24,16 @@ } } - protected override void OnExecute(params object[] arguments) + public override bool Checked { + get + { + return false; + } + } + + public override void Execute(params object[] arguments) + { var project = Gui.Project; project.Items.Add(CreateNewDemoAssessmentSection()); project.NotifyObservers(); Index: Ringtoets/Demo/src/Ringtoets.Demo/Commands/AddNewDemoDuneAssessmentSectionCommand.cs =================================================================== diff -u -r2b1937d120d50436169ef18d9fce57d4400d1bbe -re8aaaf3808e54e4f075eab6f6c58bedf35e0890e --- Ringtoets/Demo/src/Ringtoets.Demo/Commands/AddNewDemoDuneAssessmentSectionCommand.cs (.../AddNewDemoDuneAssessmentSectionCommand.cs) (revision 2b1937d120d50436169ef18d9fce57d4400d1bbe) +++ Ringtoets/Demo/src/Ringtoets.Demo/Commands/AddNewDemoDuneAssessmentSectionCommand.cs (.../AddNewDemoDuneAssessmentSectionCommand.cs) (revision e8aaaf3808e54e4f075eab6f6c58bedf35e0890e) @@ -17,8 +17,16 @@ } } - protected override void OnExecute(params object[] arguments) + public override bool Checked { + get + { + return false; + } + } + + public override void Execute(params object[] arguments) + { var project = Gui.Project; project.Items.Add(CreateNewDemoAssessmentSection()); project.NotifyObservers();