Index: Core/Common/src/Core.Common.Controls.TreeView/TreeNodeInfo.cs =================================================================== diff -u -r3f35f3de88bb3cfd07df4c1bdd4447a6fcecce89 -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Core/Common/src/Core.Common.Controls.TreeView/TreeNodeInfo.cs (.../TreeNodeInfo.cs) (revision 3f35f3de88bb3cfd07df4c1bdd4447a6fcecce89) +++ Core/Common/src/Core.Common.Controls.TreeView/TreeNodeInfo.cs (.../TreeNodeInfo.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -65,10 +65,9 @@ /// Gets or sets a function for obtaining the tree node context menu. /// The object parameter represents the wrapped data of the tree node. /// The parameter represents the tree node. - /// The parameter represents the current tree node information object. /// The parameter represents the current tree view control. /// - public Func ContextMenuStrip { get; set; } + public Func ContextMenuStrip { get; set; } /// /// Gets or sets a function for obtaining child node objects. @@ -203,10 +202,9 @@ /// Gets or sets a function for obtaining the tree node context menu. /// The parameter represents the wrapped data of the tree node. /// The parameter represents the tree node. - /// The parameter represents the current tree node information object. /// The parameter represents the current tree view control. /// - public Func ContextMenuStrip { get; set; } + public Func ContextMenuStrip { get; set; } /// /// Gets or sets a function for obtaining child node objects. @@ -313,8 +311,8 @@ ? tag => treeNodeInfo.Image((TData) tag) : (Func) null, ContextMenuStrip = treeNodeInfo.ContextMenuStrip != null - ? (tag, sourceNode, info, treeViewControl) => treeNodeInfo.ContextMenuStrip((TData) tag, sourceNode, info, treeViewControl) - : (Func) null, + ? (tag, sourceNode, treeViewControl) => treeNodeInfo.ContextMenuStrip((TData) tag, sourceNode, treeViewControl) + : (Func) null, ChildNodeObjects = treeNodeInfo.ChildNodeObjects != null ? tag => treeNodeInfo.ChildNodeObjects((TData) tag) : (Func) null, Index: Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs =================================================================== diff -u -ra7344a227d40381dd9f5f2559a3402250e97a5f3 -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs (.../TreeViewControl.cs) (revision a7344a227d40381dd9f5f2559a3402250e97a5f3) +++ Core/Common/src/Core.Common.Controls.TreeView/TreeViewControl.cs (.../TreeViewControl.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -522,7 +522,7 @@ // Update the context menu (relevant in case of keyboard navigation in the tree view) selectedNode.ContextMenuStrip = treeNodeInfo.ContextMenuStrip != null - ? treeNodeInfo.ContextMenuStrip(selectedNode.Tag, selectedNode, treeNodeInfo, this) + ? treeNodeInfo.ContextMenuStrip(selectedNode.Tag, selectedNode, this) : null; if (treeView.ContextMenu != null && selectedNode.ContextMenuStrip != null) @@ -588,7 +588,7 @@ // Update the context menu clickedNode.ContextMenuStrip = treeNodeInfo.ContextMenuStrip != null - ? treeNodeInfo.ContextMenuStrip(clickedNode.Tag, clickedNode, treeNodeInfo, this) + ? treeNodeInfo.ContextMenuStrip(clickedNode.Tag, clickedNode, this) : null; return; Index: Core/Common/src/Core.Common.Gui/ContextMenu/ContextMenuBuilder.cs =================================================================== diff -u -ra7344a227d40381dd9f5f2559a3402250e97a5f3 -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Core/Common/src/Core.Common.Gui/ContextMenu/ContextMenuBuilder.cs (.../ContextMenuBuilder.cs) (revision a7344a227d40381dd9f5f2559a3402250e97a5f3) +++ Core/Common/src/Core.Common.Gui/ContextMenu/ContextMenuBuilder.cs (.../ContextMenuBuilder.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -52,11 +52,10 @@ /// to obtain information to render and bind actions to the items of the . /// If null, this builder will not render items which require this type of information. /// The for which to create a . - /// The to use while creating the . /// The to use while executing the actions. /// Thrown when the required object instances could not be created based on /// the or . - public ContextMenuBuilder(IApplicationFeatureCommands featureCommandHandler, IExportImportCommandHandler importExportHandler, IViewCommands viewsCommandsHandler, TreeNode treeNode, TreeNodeInfo treeNodeInfo, TreeViewControl treeViewControl) + public ContextMenuBuilder(IApplicationFeatureCommands featureCommandHandler, IExportImportCommandHandler importExportHandler, IViewCommands viewsCommandsHandler, TreeNode treeNode, TreeViewControl treeViewControl) { try { Index: Core/Common/src/Core.Common.Gui/ContextMenu/IContextMenuBuilderProvider.cs =================================================================== diff -u -rb3db013105d10992eeefea39f5ecbdacdd57b4d4 -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Core/Common/src/Core.Common.Gui/ContextMenu/IContextMenuBuilderProvider.cs (.../IContextMenuBuilderProvider.cs) (revision b3db013105d10992eeefea39f5ecbdacdd57b4d4) +++ Core/Common/src/Core.Common.Gui/ContextMenu/IContextMenuBuilderProvider.cs (.../IContextMenuBuilderProvider.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -36,14 +36,12 @@ /// /// The to have the /// create a for. - /// The to use while creating the - /// . /// The to use while executing the /// actions. /// The which can be used to create a /// for . /// Thrown when the instance could /// not be created. - IContextMenuBuilder Get(TreeNode treeNode, TreeNodeInfo treeNodeInfo, TreeViewControl treeViewControl); + IContextMenuBuilder Get(TreeNode treeNode, TreeViewControl treeViewControl); } } \ No newline at end of file Index: Core/Common/src/Core.Common.Gui/RingtoetsGui.cs =================================================================== diff -u -rf1e2ad82328ef2ef9a8079b79dc405c0a166188a -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Core/Common/src/Core.Common.Gui/RingtoetsGui.cs (.../RingtoetsGui.cs) (revision f1e2ad82328ef2ef9a8079b79dc405c0a166188a) +++ Core/Common/src/Core.Common.Gui/RingtoetsGui.cs (.../RingtoetsGui.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -749,9 +749,9 @@ #region Implementation: IContextMenuBuilderProvider - public IContextMenuBuilder Get(TreeNode treeNode, TreeNodeInfo treeNodeInfo, TreeViewControl treeViewControl) + public IContextMenuBuilder Get(TreeNode treeNode, TreeViewControl treeViewControl) { - return new ContextMenuBuilder(appFeatureApplicationCommands, exportImportCommandHandler, ViewCommands, treeNode, treeNodeInfo, treeViewControl); + return new ContextMenuBuilder(appFeatureApplicationCommands, exportImportCommandHandler, ViewCommands, treeNode, treeViewControl); } #endregion Index: Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs =================================================================== diff -u -ra7344a227d40381dd9f5f2559a3402250e97a5f3 -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs (.../ContextMenuBuilderTest.cs) (revision a7344a227d40381dd9f5f2559a3402250e97a5f3) +++ Core/Common/test/Core.Common.Gui.Test/ContextMenu/ContextMenuBuilderTest.cs (.../ContextMenuBuilderTest.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -25,14 +25,13 @@ { // Setup var treeNodeMock = mocks.StrictMock(); - var treeNodeInfoMock = mocks.StrictMock(); var importExportHandlerMock = mocks.StrictMock(); var viewCommandsMock = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); mocks.ReplayAll(); // Call - TestDelegate test = () => new ContextMenuBuilder(null, importExportHandlerMock, viewCommandsMock, treeNodeMock, treeNodeInfoMock, treeViewControlMock); + TestDelegate test = () => new ContextMenuBuilder(null, importExportHandlerMock, viewCommandsMock, treeNodeMock, treeViewControlMock); // Assert var message = Assert.Throws(test).Message; @@ -46,14 +45,13 @@ { // Setup var treeNodeMock = mocks.StrictMock(); - var treeNodeInfoMock = mocks.StrictMock(); var applicationFeatureCommandsMock = mocks.StrictMock(); var viewCommandsMock = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); mocks.ReplayAll(); // Call - TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommandsMock, null, viewCommandsMock, treeNodeMock, treeNodeInfoMock, treeViewControlMock); + TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommandsMock, null, viewCommandsMock, treeNodeMock, treeViewControlMock); // Assert var message = Assert.Throws(test).Message; @@ -69,12 +67,11 @@ var applicationFeatureCommandsMockMock = mocks.StrictMock(); var exportImportHandlerMock = mocks.StrictMock(); var treeNodeMock = mocks.StrictMock(); - var treeNodeInfoMock = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); mocks.ReplayAll(); // Call - TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommandsMockMock, exportImportHandlerMock, null, treeNodeMock, treeNodeInfoMock, treeViewControlMock); + TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommandsMockMock, exportImportHandlerMock, null, treeNodeMock, treeViewControlMock); // Assert var message = Assert.Throws(test).Message; @@ -88,13 +85,12 @@ { // Setup var applicationFeatureCommandsMock = mocks.StrictMock(); - var treeNodeInfoMock = mocks.StrictMock(); var importExportHandlerMock = mocks.StrictMock(); var viewCommandsMock = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); // Call - TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommandsMock, importExportHandlerMock, viewCommandsMock, null, treeNodeInfoMock, treeViewControlMock); + TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommandsMock, importExportHandlerMock, viewCommandsMock, null, treeViewControlMock); // Assert var message = Assert.Throws(test).Message; @@ -109,10 +105,9 @@ var treeNodeMock = mocks.StrictMock(); var importExportHandlerMock = mocks.StrictMock(); var viewCommandsMock = mocks.StrictMock(); - var treeNodeInfoMock = mocks.StrictMock(); // Call - TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommandsMock, importExportHandlerMock, viewCommandsMock, treeNodeMock, treeNodeInfoMock, null); + TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommandsMock, importExportHandlerMock, viewCommandsMock, treeNodeMock, null); // Assert var message = Assert.Throws(test).Message; @@ -127,12 +122,11 @@ var exportImportHandlerMock = mocks.StrictMock(); var viewCommandsMock = mocks.StrictMock(); var treeNodeMock = mocks.StrictMock(); - var treeNodeInfoMock = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); mocks.ReplayAll(); // Call - TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommandsMockMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeNodeInfoMock, treeViewControlMock); + TestDelegate test = () => new ContextMenuBuilder(applicationFeatureCommandsMockMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeViewControlMock); // Assert Assert.DoesNotThrow(test); @@ -148,11 +142,10 @@ var exportImportHandlerMock = mocks.StrictMock(); var viewCommandsMock = mocks.StrictMock(); var treeNodeMock = mocks.StrictMock(); - var treeNodeInfoMock = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); mocks.ReplayAll(); - var builder = new ContextMenuBuilder(applicationFeatureCommandsMockMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeNodeInfoMock, treeViewControlMock); + var builder = new ContextMenuBuilder(applicationFeatureCommandsMockMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeViewControlMock); // Call var result = builder.Build(); @@ -182,7 +175,7 @@ mocks.ReplayAll(); - var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeNodeInfoMock, treeViewControl); + var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeViewControl); // Call var result = builder.AddRenameItem().Build(); @@ -221,7 +214,7 @@ mocks.ReplayAll(); - var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeNodeInfoMock, treeViewControl); + var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeViewControl); // Call var result = builder.AddDeleteItem().Build(); @@ -246,7 +239,6 @@ var viewCommandsMock = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); var treeNode= new TreeNode(); - var treeNodeInfoMock = mocks.StrictMock(); if (hasChildren) { @@ -255,7 +247,7 @@ mocks.ReplayAll(); - var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNode, treeNodeInfoMock, treeViewControlMock); + var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNode, treeViewControlMock); // Call var result = builder.AddExpandAllItem().Build(); @@ -280,7 +272,6 @@ var viewCommandsMock = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); var treeNode = new TreeNode(); - var treeNodeInfoMock = mocks.StrictMock(); if (hasChildren) { @@ -289,7 +280,7 @@ mocks.ReplayAll(); - var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNode, treeNodeInfoMock, treeViewControlMock); + var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNode, treeViewControlMock); // Call var result = builder.AddCollapseAllItem().Build(); @@ -314,7 +305,6 @@ var viewCommandsMock = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); var treeNodeMock = mocks.Stub(); - var treeNodeInfoMock = mocks.Stub(); var nodeData = new object(); viewCommandsMock.Expect(ch => ch.CanOpenViewFor(nodeData)).Return(hasViewForNodeData); @@ -323,7 +313,7 @@ treeNodeMock.Tag = nodeData; - var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeNodeInfoMock, treeViewControlMock); + var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeViewControlMock); // Call var result = builder.AddOpenItem().Build(); @@ -349,14 +339,13 @@ var treeViewControlMock = mocks.StrictMock(); var nodeData = new object(); var treeNodeMock = mocks.Stub(); - var treeNodeInfoMock = mocks.Stub(); exportImportHandlerMock.Expect(ch => ch.CanExportFrom(nodeData)).Return(hasExportersForNodeData); mocks.ReplayAll(); treeNodeMock.Tag = nodeData; - var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeNodeInfoMock, treeViewControlMock); + var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeViewControlMock); // Call var result = builder.AddExportItem().Build(); @@ -382,14 +371,13 @@ var treeViewControlMock = mocks.StrictMock(); var nodeData = new object(); var treeNodeMock = mocks.Stub(); - var treeNodeInfoMock = mocks.Stub(); exportImportHandlerMock.Expect(ch => ch.CanImportOn(nodeData)).Return(hasImportersForNodeData); mocks.ReplayAll(); treeNodeMock.Tag = nodeData; - var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeNodeInfoMock, treeViewControlMock); + var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeViewControlMock); // Call var result = builder.AddImportItem().Build(); @@ -415,15 +403,14 @@ var treeViewControlMock = mocks.StrictMock(); var nodeData = new object(); var treeNodeMock = mocks.Stub(); - var treeNodeInfoMock = mocks.Stub(); applicationFeatureCommandsMock.Expect(ch => ch.CanShowPropertiesFor(nodeData)).Return(hasPropertiesForNodeData); mocks.ReplayAll(); treeNodeMock.Tag = nodeData; - var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeNodeInfoMock, treeViewControlMock); + var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeViewControlMock); // Call var result = builder.AddPropertiesItem().Build(); @@ -442,14 +429,13 @@ { // Setup var treeNodeMock = mocks.StrictMock(); - var treeNodeInfoMock = mocks.Stub(); var applicationFeatureCommandsMock = mocks.StrictMock(); var exportImportHandlerMock = mocks.StrictMock(); var viewCommandsMock = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); mocks.ReplayAll(); - var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeNodeInfoMock, treeViewControlMock); + var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeViewControlMock); var item = new StrictContextMenuItem(null,null,null,null); // Call @@ -469,14 +455,13 @@ { // Setup var treeNodeMock = mocks.StrictMock(); - var treeNodeInfoMock = mocks.Stub(); var applicationFeatureCommandsMock = mocks.StrictMock(); var exportImportHandlerMock = mocks.StrictMock(); var viewCommandsMock = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); mocks.ReplayAll(); - var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeNodeInfoMock, treeViewControlMock); + var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeViewControlMock); // Call var result = builder.AddSeparator().Build(); @@ -495,14 +480,13 @@ { // Setup var treeNodeMock = mocks.StrictMock(); - var treeNodeInfoMock = mocks.Stub(); var applicationFeatureCommandsMock = mocks.StrictMock(); var exportImportHandlerMock = mocks.StrictMock(); var viewCommandsMock = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); mocks.ReplayAll(); - var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeNodeInfoMock, treeViewControlMock); + var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeViewControlMock); var someItem = new StrictContextMenuItem(null, null, null, null); @@ -529,14 +513,13 @@ { // Setup var treeNodeMock = mocks.StrictMock(); - var treeNodeInfoMock = mocks.Stub(); var applicationFeatureCommandsMock = mocks.StrictMock(); var exportImportHandlerMock = mocks.StrictMock(); var viewCommandsMock = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); mocks.ReplayAll(); - var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeNodeInfoMock, treeViewControlMock); + var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeViewControlMock); var someItem = new StrictContextMenuItem(null, null, null, null); var someOtherItem = new StrictContextMenuItem(null, null, null, null); @@ -567,14 +550,13 @@ { // Setup var treeNodeMock = mocks.StrictMock(); - var treeNodeInfoMock = mocks.Stub(); var applicationFeatureCommandsMock = mocks.StrictMock(); var exportImportHandlerMock = mocks.StrictMock(); var viewCommandsMock = mocks.StrictMock(); var treeViewControlMock = mocks.StrictMock(); mocks.ReplayAll(); - var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeNodeInfoMock, treeViewControlMock); + var builder = new ContextMenuBuilder(applicationFeatureCommandsMock, exportImportHandlerMock, viewCommandsMock, treeNodeMock, treeViewControlMock); builder.AddCustomItem(new StrictContextMenuItem(null, null, null, null)); Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerGuiPlugin.cs =================================================================== diff -u -r8598c47dd25fb62ccaab803cc9fc01e7b0be5299 -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerGuiPlugin.cs (.../ProjectExplorerGuiPlugin.cs) (revision 8598c47dd25fb62ccaab803cc9fc01e7b0be5299) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerGuiPlugin.cs (.../ProjectExplorerGuiPlugin.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -94,15 +94,15 @@ Text = project => project.Name, Image = project => ProjectExplorerResources.ProjectIcon, ChildNodeObjects = project => project.Items.ToArray(), - ContextMenuStrip = (project, sourceNode, treeNodeInfo, treeViewControl) => + ContextMenuStrip = (project, sourceNode, treeViewControl) => { var addItem = new StrictContextMenuItem( ProjectExplorerResources.AddItem, ProjectExplorerResources.AddItem_ToolTip, ProjectExplorerResources.PlusIcon, (s, e) => Gui.ProjectCommands.AddNewItem(project)); - return Gui.Get(sourceNode, treeNodeInfo, treeViewControl) + return Gui.Get(sourceNode, treeViewControl) .AddCustomItem(addItem) .AddSeparator() .AddImportItem() Index: Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/TreeNodeInfos/ProjectTreeNodeInfoTest.cs =================================================================== diff -u -r8598c47dd25fb62ccaab803cc9fc01e7b0be5299 -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/TreeNodeInfos/ProjectTreeNodeInfoTest.cs (.../ProjectTreeNodeInfoTest.cs) (revision 8598c47dd25fb62ccaab803cc9fc01e7b0be5299) +++ Core/Plugins/test/Core.Plugins.ProjectExplorer.Test/TreeNodeInfos/ProjectTreeNodeInfoTest.cs (.../ProjectTreeNodeInfoTest.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -116,7 +116,7 @@ var menuBuilderMock = mocks.StrictMock(); var viewCommandsMock = mocks.StrictMock(); - gui.Expect(g => g.Get(treeNode, info, treeViewControlMock)).Return(menuBuilderMock); + gui.Expect(g => g.Get(treeNode, treeViewControlMock)).Return(menuBuilderMock); gui.Expect(g => g.ViewCommands).Return(viewCommandsMock); gui.Expect(g => g.GetTreeNodeInfos()).Return(Enumerable.Empty()); @@ -136,7 +136,7 @@ plugin.Gui = gui; // Call - info.ContextMenuStrip(null, treeNode, info, treeViewControlMock); + info.ContextMenuStrip(null, treeNode, treeViewControlMock); // Assert mocks.VerifyAll(); @@ -155,7 +155,7 @@ var projectCommandsMock = mocks.StrictMock(); var viewCommandsMock = mocks.StrictMock(); - guiMock.Stub(g => g.Get(treeNode, info, treeViewControlMock)).Return(menuBuilder); + guiMock.Stub(g => g.Get(treeNode, treeViewControlMock)).Return(menuBuilder); guiMock.Stub(g => g.ProjectCommands).Return(projectCommandsMock); guiMock.Stub(g => g.ViewCommands).Return(viewCommandsMock); guiMock.Stub(g => g.GetTreeNodeInfos()).Return(Enumerable.Empty()); @@ -166,7 +166,7 @@ plugin.Gui = guiMock; // Call - var result = info.ContextMenuStrip(project, treeNode, info, treeViewControlMock); + var result = info.ContextMenuStrip(project, treeNode, treeViewControlMock); result.Items[0].PerformClick(); Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs =================================================================== diff -u -rb3db013105d10992eeefea39f5ecbdacdd57b4d4 -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs (.../RingtoetsGuiPlugin.cs) (revision b3db013105d10992eeefea39f5ecbdacdd57b4d4) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs (.../RingtoetsGuiPlugin.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -128,11 +128,11 @@ { Text = failureMechanismContribution => RingtoetsDataResources.FailureMechanismContribution_DisplayName, Image = failureMechanismContribution => RingtoetsFormsResources.GenericInputOutputIcon, - ContextMenuStrip = (failureMechanismContribution, sourceNode, treeNodeInfo, treeViewControl) => Gui.Get(sourceNode, treeNodeInfo, treeViewControl) - .AddOpenItem() - .AddSeparator() - .AddExportItem() - .Build() + ContextMenuStrip = (failureMechanismContribution, sourceNode, treeViewControl) => Gui.Get(sourceNode, treeViewControl) + .AddOpenItem() + .AddSeparator() + .AddExportItem() + .Build() }; } @@ -166,9 +166,9 @@ parentProject.NotifyObservers(); } - private ContextMenuStrip AssessmentSectionBaseContextMenuStrip(AssessmentSectionBase nodeData, TreeNode node, TreeNodeInfo treeNodeInfo, TreeViewControl treeViewControl) + private ContextMenuStrip AssessmentSectionBaseContextMenuStrip(AssessmentSectionBase nodeData, TreeNode node, TreeViewControl treeViewControl) { - return Gui.Get(node, treeNodeInfo, treeViewControl) + return Gui.Get(node, treeViewControl) .AddRenameItem() .AddDeleteItem() .AddSeparator() @@ -217,7 +217,7 @@ }; } - private ContextMenuStrip FailureMechanismPlaceholderContextMenuStrip(FailureMechanismPlaceholder nodeData, TreeNode node, TreeNodeInfo treeNodeInfo, TreeViewControl treeViewControl) + private ContextMenuStrip FailureMechanismPlaceholderContextMenuStrip(FailureMechanismPlaceholder nodeData, TreeNode node, TreeViewControl treeViewControl) { var calculateItem = new StrictContextMenuItem( RingtoetsCommonFormsResources.Calculate_all, @@ -236,7 +236,7 @@ Enabled = false }; - return Gui.Get(node, treeNodeInfo, treeViewControl) + return Gui.Get(node, treeViewControl) .AddCustomItem(calculateItem) .AddCustomItem(clearOutputItem) .AddSeparator() @@ -263,9 +263,9 @@ return RingtoetsFormsResources.PlaceholderIcon; } - private ContextMenuStrip PlaceholderWithReadonlyNameContextMenuStrip(PlaceholderWithReadonlyName nodeData, TreeNode node, TreeNodeInfo treeNodeInfo, TreeViewControl treeViewControl) + private ContextMenuStrip PlaceholderWithReadonlyNameContextMenuStrip(PlaceholderWithReadonlyName nodeData, TreeNode node, TreeViewControl treeViewControl) { - IContextMenuBuilder menuBuilder = Gui.Get(node, treeNodeInfo, treeViewControl); + IContextMenuBuilder menuBuilder = Gui.Get(node, treeViewControl); if (nodeData is InputPlaceholder || nodeData is OutputPlaceholder) { @@ -316,9 +316,9 @@ } } - private ContextMenuStrip CategoryTreeFolderContextMenu(CategoryTreeFolder nodeData, TreeNode node, TreeNodeInfo treeNodeInfo, TreeViewControl treeViewControl) + private ContextMenuStrip CategoryTreeFolderContextMenu(CategoryTreeFolder nodeData, TreeNode node, TreeViewControl treeViewControl) { - return Gui.Get(node, treeNodeInfo, treeViewControl) + return Gui.Get(node, treeViewControl) .AddExpandAllItem() .AddCollapseAllItem() .Build(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionBaseTreeNodeInfoTest.cs =================================================================== diff -u -rb3db013105d10992eeefea39f5ecbdacdd57b4d4 -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionBaseTreeNodeInfoTest.cs (.../AssessmentSectionBaseTreeNodeInfoTest.cs) (revision b3db013105d10992eeefea39f5ecbdacdd57b4d4) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/AssessmentSectionBaseTreeNodeInfoTest.cs (.../AssessmentSectionBaseTreeNodeInfoTest.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -121,7 +121,7 @@ var gui = mocks.StrictMultiMock(); var treeViewControlMock = mocks.StrictMock(); var menuBuilderMock = mocks.StrictMock(); - gui.Expect(g => g.Get(treeNode, info, treeViewControlMock)).Return(menuBuilderMock); + gui.Expect(g => g.Get(treeNode, treeViewControlMock)).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddRenameItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddDeleteItem()).Return(menuBuilderMock); @@ -140,7 +140,7 @@ plugin.Gui = gui; // Call - info.ContextMenuStrip(null, treeNode, info, treeViewControlMock); + info.ContextMenuStrip(null, treeNode, treeViewControlMock); // Assert mocks.VerifyAll(); @@ -215,7 +215,7 @@ public class TestAssessmentSectionBase : AssessmentSectionBase { - private IEnumerable failureMechanisms; + private readonly IEnumerable failureMechanisms; public TestAssessmentSectionBase(FailureMechanismContribution contribution, IEnumerable failureMechanisms) { Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContributionTreeNodeInfoTest.cs =================================================================== diff -u -rb3db013105d10992eeefea39f5ecbdacdd57b4d4 -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContributionTreeNodeInfoTest.cs (.../FailureMechanismContributionTreeNodeInfoTest.cs) (revision b3db013105d10992eeefea39f5ecbdacdd57b4d4) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContributionTreeNodeInfoTest.cs (.../FailureMechanismContributionTreeNodeInfoTest.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -86,14 +86,14 @@ menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); - gui.Expect(cmp => cmp.Get(nodeMock, info, treeViewControlMock)).Return(menuBuilderMock); + gui.Expect(cmp => cmp.Get(nodeMock, treeViewControlMock)).Return(menuBuilderMock); mocks.ReplayAll(); plugin.Gui = gui; // Call - info.ContextMenuStrip(null, nodeMock, info, treeViewControlMock); + info.ContextMenuStrip(null, nodeMock, treeViewControlMock); // Assert mocks.VerifyAll(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismPlaceholderTreeNodeInfoTest.cs =================================================================== diff -u -rb3db013105d10992eeefea39f5ecbdacdd57b4d4 -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismPlaceholderTreeNodeInfoTest.cs (.../FailureMechanismPlaceholderTreeNodeInfoTest.cs) (revision b3db013105d10992eeefea39f5ecbdacdd57b4d4) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismPlaceholderTreeNodeInfoTest.cs (.../FailureMechanismPlaceholderTreeNodeInfoTest.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -132,14 +132,14 @@ menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); - gui.Expect(cmp => cmp.Get(nodeMock, info, treeViewControlMock)).Return(menuBuilderMock); + gui.Expect(cmp => cmp.Get(nodeMock, treeViewControlMock)).Return(menuBuilderMock); mocks.ReplayAll(); plugin.Gui = gui; // Call - info.ContextMenuStrip(null, nodeMock, info, treeViewControlMock); + info.ContextMenuStrip(null, nodeMock, treeViewControlMock); // Assert mocks.VerifyAll(); @@ -154,14 +154,14 @@ var menuBuilderMock = new CustomItemsOnlyContextMenuBuilder(); var nodeMock = mocks.StrictMock(); - gui.Expect(cmp => cmp.Get(nodeMock, info, treeViewControlMock)).Return(menuBuilderMock); + gui.Expect(cmp => cmp.Get(nodeMock, treeViewControlMock)).Return(menuBuilderMock); mocks.ReplayAll(); plugin.Gui = gui; // Call - var menu = info.ContextMenuStrip(null, nodeMock, info, treeViewControlMock); + var menu = info.ContextMenuStrip(null, nodeMock, treeViewControlMock); // Assert mocks.VerifyAll(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/PlaceholderWithReadonlyNameTreeNodeInfoTest.cs =================================================================== diff -u -rb3db013105d10992eeefea39f5ecbdacdd57b4d4 -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/PlaceholderWithReadonlyNameTreeNodeInfoTest.cs (.../PlaceholderWithReadonlyNameTreeNodeInfoTest.cs) (revision b3db013105d10992eeefea39f5ecbdacdd57b4d4) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/PlaceholderWithReadonlyNameTreeNodeInfoTest.cs (.../PlaceholderWithReadonlyNameTreeNodeInfoTest.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -120,14 +120,14 @@ menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); - gui.Expect(cmp => cmp.Get(nodeMock, info, treeViewControlMock)).Return(menuBuilderMock); + gui.Expect(cmp => cmp.Get(nodeMock, treeViewControlMock)).Return(menuBuilderMock); mocks.ReplayAll(); plugin.Gui = gui; // Call - info.ContextMenuStrip(new OutputPlaceholder(string.Empty), nodeMock, info, treeViewControlMock); + info.ContextMenuStrip(new OutputPlaceholder(string.Empty), nodeMock, treeViewControlMock); // Assert mocks.VerifyAll(); @@ -150,14 +150,14 @@ menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); - gui.Expect(cmp => cmp.Get(nodeMock, info, treeViewControlMock)).Return(menuBuilderMock); + gui.Expect(cmp => cmp.Get(nodeMock, treeViewControlMock)).Return(menuBuilderMock); mocks.ReplayAll(); plugin.Gui = gui; // Call - info.ContextMenuStrip(new InputPlaceholder(string.Empty), nodeMock, info, treeViewControlMock); + info.ContextMenuStrip(new InputPlaceholder(string.Empty), nodeMock, treeViewControlMock); // Assert mocks.VerifyAll(); @@ -178,14 +178,14 @@ menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); - gui.Expect(cmp => cmp.Get(nodeMock, info, treeViewControlMock)).Return(menuBuilderMock); + gui.Expect(cmp => cmp.Get(nodeMock, treeViewControlMock)).Return(menuBuilderMock); mocks.ReplayAll(); plugin.Gui = gui; // Call - info.ContextMenuStrip(null, nodeMock, info, treeViewControlMock); + info.ContextMenuStrip(null, nodeMock, treeViewControlMock); // Assert mocks.VerifyAll(); Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs =================================================================== diff -u -r5f53f2f23d0c4145d79823c5443966ff4a5a830f -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision 5f53f2f23d0c4145d79823c5443966ff4a5a830f) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingGuiPlugin.cs (.../PipingGuiPlugin.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -107,12 +107,12 @@ { Text = pipingInputContext => PipingFormsResources.PipingInputContext_NodeDisplayName, Image = pipingInputContext => PipingFormsResources.PipingInputIcon, - ContextMenuStrip = (nodeData, node, treeNodeInfo, treeViewControl) => Gui.Get(node, treeNodeInfo, treeViewControl) - .AddImportItem() - .AddExportItem() - .AddSeparator() - .AddPropertiesItem() - .Build() + ContextMenuStrip = (nodeData, node, treeViewControl) => Gui.Get(node, treeViewControl) + .AddImportItem() + .AddExportItem() + .AddSeparator() + .AddPropertiesItem() + .Build() }; yield return new TreeNodeInfo> @@ -121,22 +121,22 @@ Image = ringtoetsPipingSurfaceLine => PipingFormsResources.FolderIcon, ForeColor = ringtoetsPipingSurfaceLine => ringtoetsPipingSurfaceLine.Any() ? Color.FromKnownColor(KnownColor.ControlText) : Color.FromKnownColor(KnownColor.GrayText), ChildNodeObjects = ringtoetsPipingSurfaceLine => ringtoetsPipingSurfaceLine.Cast().ToArray(), - ContextMenuStrip = (nodeData, node, treeNodeInfo, treeViewControl) => Gui.Get(node, treeNodeInfo, treeViewControl) - .AddImportItem() - .AddExportItem() - .AddSeparator() - .AddExpandAllItem() - .AddCollapseAllItem() - .Build() + ContextMenuStrip = (nodeData, node, treeViewControl) => Gui.Get(node, treeViewControl) + .AddImportItem() + .AddExportItem() + .AddSeparator() + .AddExpandAllItem() + .AddCollapseAllItem() + .Build() }; yield return new TreeNodeInfo { Text = pipingSurfaceLine => pipingSurfaceLine.Name, Image = pipingSurfaceLine => PipingFormsResources.PipingSurfaceLineIcon, - ContextMenuStrip = (nodeData, node, treeNodeInfo, treeViewControl) => Gui.Get(node, treeNodeInfo, treeViewControl) - .AddPropertiesItem() - .Build() + ContextMenuStrip = (nodeData, node, treeViewControl) => Gui.Get(node, treeViewControl) + .AddPropertiesItem() + .Build() }; yield return new TreeNodeInfo> @@ -145,65 +145,65 @@ Image = pipingSoilProfiles => PipingFormsResources.FolderIcon, ForeColor = pipingSoilProfiles => pipingSoilProfiles.Any() ? Color.FromKnownColor(KnownColor.ControlText) : Color.FromKnownColor(KnownColor.GrayText), ChildNodeObjects = pipingSoilProfiles => pipingSoilProfiles.Cast().ToArray(), - ContextMenuStrip = (nodeData, node, treeNodeInfo, treeViewControl) => Gui.Get(node, treeNodeInfo, treeViewControl) - .AddImportItem() - .AddExportItem() - .AddSeparator() - .AddExpandAllItem() - .AddCollapseAllItem() - .Build() + ContextMenuStrip = (nodeData, node, treeViewControl) => Gui.Get(node, treeViewControl) + .AddImportItem() + .AddExportItem() + .AddSeparator() + .AddExpandAllItem() + .AddCollapseAllItem() + .Build() }; yield return new TreeNodeInfo { Text = pipingSoilProfile => pipingSoilProfile.Name, Image = pipingSoilProfile => PipingFormsResources.PipingSoilProfileIcon, - ContextMenuStrip = (nodeData, node, treeNodeInfo, treeViewControl) => Gui.Get(node, treeNodeInfo, treeViewControl) - .AddPropertiesItem() - .Build() + ContextMenuStrip = (nodeData, node, treeViewControl) => Gui.Get(node, treeViewControl) + .AddPropertiesItem() + .Build() }; yield return new TreeNodeInfo { Text = pipingOutput => PipingFormsResources.PipingOutput_DisplayName, Image = pipingOutput => PipingFormsResources.PipingOutputIcon, - ContextMenuStrip = (nodeData, node, treeNodeInfo, treeViewControl) => Gui.Get(node, treeNodeInfo, treeViewControl) - .AddExportItem() - .AddSeparator() - .AddPropertiesItem() - .Build() + ContextMenuStrip = (nodeData, node, treeViewControl) => Gui.Get(node, treeViewControl) + .AddExportItem() + .AddSeparator() + .AddPropertiesItem() + .Build() }; yield return new TreeNodeInfo { Text = emptyPipingOutput => PipingFormsResources.PipingOutput_DisplayName, Image = emptyPipingOutput => PipingFormsResources.PipingOutputIcon, ForeColor = emptyPipingOutput => Color.FromKnownColor(KnownColor.GrayText), - ContextMenuStrip = (nodeData, node, treeNodeInfo, treeViewControl) => Gui.Get(node, treeNodeInfo, treeViewControl) - .AddExportItem() - .AddSeparator() - .AddPropertiesItem() - .Build() + ContextMenuStrip = (nodeData, node, treeViewControl) => Gui.Get(node, treeViewControl) + .AddExportItem() + .AddSeparator() + .AddPropertiesItem() + .Build() }; yield return new TreeNodeInfo { Text = emptyPipingCalculationReport => PipingDataResources.CalculationReport_DisplayName, Image = emptyPipingCalculationReport => PipingFormsResources.PipingCalculationReportIcon, ForeColor = emptyPipingCalculationReport => Color.FromKnownColor(KnownColor.GrayText), - ContextMenuStrip = (nodeData, node, treeNodeInfo, treeViewControl) => Gui.Get(node, treeNodeInfo, treeViewControl) - .AddOpenItem() - .AddSeparator() - .AddExportItem() - .AddSeparator() - .AddPropertiesItem() - .Build() + ContextMenuStrip = (nodeData, node, treeViewControl) => Gui.Get(node, treeViewControl) + .AddOpenItem() + .AddSeparator() + .AddExportItem() + .AddSeparator() + .AddPropertiesItem() + .Build() }; } # region PipingFailureMechanism TreeNodeInfo - private ContextMenuStrip FailureMechanismContextMenuStrip(PipingFailureMechanism failureMechanism, TreeNode node, TreeNodeInfo treeNodeInfo, TreeViewControl treeViewControl) + private ContextMenuStrip FailureMechanismContextMenuStrip(PipingFailureMechanism failureMechanism, TreeNode node, TreeViewControl treeViewControl) { var addCalculationGroupItem = new StrictContextMenuItem( PipingFormsResources.PipingCalculationGroup_Add_PipingCalculationGroup, @@ -236,7 +236,7 @@ clearAllItem.ToolTipText = PipingFormsResources.PipingCalculationGroup_ClearOutput_No_calculation_with_output_to_clear; } - return Gui.Get(node, treeNodeInfo, treeViewControl) + return Gui.Get(node, treeViewControl) .AddCustomItem(addCalculationGroupItem) .AddCustomItem(addCalculationItem) .AddSeparator() @@ -396,7 +396,7 @@ # region PipingCalculationContext TreeNodeInfo - private ContextMenuStrip PipingCalculationContextContextMenuStrip(PipingCalculationContext nodeData, TreeNode node, TreeNodeInfo treeNodeInfo, TreeViewControl treeViewControl) + private ContextMenuStrip PipingCalculationContextContextMenuStrip(PipingCalculationContext nodeData, TreeNode node, TreeViewControl treeViewControl) { PipingCalculation calculation = nodeData.WrappedData; var validateItem = new StrictContextMenuItem(RingtoetsFormsResources.Validate, @@ -419,7 +419,7 @@ clearOutputItem.ToolTipText = PipingFormsResources.ClearOutput_No_output_to_clear; } - return Gui.Get(node, treeNodeInfo, treeViewControl) + return Gui.Get(node, treeViewControl) .AddCustomItem(validateItem) .AddCustomItem(calculateItem) .AddCustomItem(clearOutputItem) @@ -536,7 +536,7 @@ return childNodeObjects.ToArray(); } - private ContextMenuStrip PipingCalculationGroupContextContextMenuStrip(PipingCalculationGroupContext nodeData, TreeNode node, TreeNodeInfo treeNodeInfo, TreeViewControl treeViewControl) + private ContextMenuStrip PipingCalculationGroupContextContextMenuStrip(PipingCalculationGroupContext nodeData, TreeNode node, TreeViewControl treeViewControl) { var group = nodeData.WrappedData; var addCalculationGroupItem = new StrictContextMenuItem( @@ -598,7 +598,7 @@ clearAllItem.ToolTipText = PipingFormsResources.PipingCalculationGroup_ClearOutput_No_calculation_with_output_to_clear; } - var builder = Gui.Get(node, treeNodeInfo, treeViewControl) + var builder = Gui.Get(node, treeViewControl) .AddCustomItem(addCalculationGroupItem) .AddCustomItem(addCalculationItem) .AddSeparator() Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/EmptyPipingCalculationReportTreeNodeInfoTest.cs =================================================================== diff -u -rb3db013105d10992eeefea39f5ecbdacdd57b4d4 -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/EmptyPipingCalculationReportTreeNodeInfoTest.cs (.../EmptyPipingCalculationReportTreeNodeInfoTest.cs) (revision b3db013105d10992eeefea39f5ecbdacdd57b4d4) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/EmptyPipingCalculationReportTreeNodeInfoTest.cs (.../EmptyPipingCalculationReportTreeNodeInfoTest.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -96,14 +96,14 @@ menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); - gui.Expect(cmp => cmp.Get(nodeMock, info, treeViewControlMock)).Return(menuBuilderMock); + gui.Expect(cmp => cmp.Get(nodeMock, treeViewControlMock)).Return(menuBuilderMock); mocks.ReplayAll(); plugin.Gui = gui; // Call - info.ContextMenuStrip(null, nodeMock, info, treeViewControlMock); + info.ContextMenuStrip(null, nodeMock, treeViewControlMock); // Assert mocks.VerifyAll(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/EmptyPipingOutputTreeNodeInfoTest.cs =================================================================== diff -u -rb3db013105d10992eeefea39f5ecbdacdd57b4d4 -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/EmptyPipingOutputTreeNodeInfoTest.cs (.../EmptyPipingOutputTreeNodeInfoTest.cs) (revision b3db013105d10992eeefea39f5ecbdacdd57b4d4) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/EmptyPipingOutputTreeNodeInfoTest.cs (.../EmptyPipingOutputTreeNodeInfoTest.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -92,13 +92,13 @@ menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); - gui.Expect(cmp => cmp.Get(nodeMock, info, treeViewControlMock)).Return(menuBuilderMock); + gui.Expect(cmp => cmp.Get(nodeMock, treeViewControlMock)).Return(menuBuilderMock); mocks.ReplayAll(); plugin.Gui = gui; // Call - info.ContextMenuStrip(null, nodeMock, info, treeViewControlMock); + info.ContextMenuStrip(null, nodeMock, treeViewControlMock); // Assert mocks.VerifyAll(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -rb3db013105d10992eeefea39f5ecbdacdd57b4d4 -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationContextTreeNodeInfoTest.cs (.../PipingCalculationContextTreeNodeInfoTest.cs) (revision b3db013105d10992eeefea39f5ecbdacdd57b4d4) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationContextTreeNodeInfoTest.cs (.../PipingCalculationContextTreeNodeInfoTest.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -197,7 +197,7 @@ var treeViewControlMock = mocks.StrictMock(); var nodeMock = mocks.StrictMock(); - gui.Expect(cmp => cmp.Get(nodeMock, info, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); + gui.Expect(cmp => cmp.Get(nodeMock, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); mocks.ReplayAll(); @@ -209,7 +209,7 @@ Enumerable.Empty()); // Call - var contextMenu = info.ContextMenuStrip(nodeData, nodeMock, info, treeViewControlMock); + var contextMenu = info.ContextMenuStrip(nodeData, nodeMock, treeViewControlMock); // Assert mocks.VerifyAll(); // Expect no calls on arguments @@ -226,7 +226,7 @@ var treeViewControlMock = mocks.StrictMock(); var nodeMock = mocks.StrictMock(); - gui.Expect(cmp => cmp.Get(nodeMock, info, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); + gui.Expect(cmp => cmp.Get(nodeMock, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); mocks.ReplayAll(); @@ -242,7 +242,7 @@ // Call - var contextMenu = info.ContextMenuStrip(nodeData, nodeMock, info, treeViewControlMock); + var contextMenu = info.ContextMenuStrip(nodeData, nodeMock, treeViewControlMock); // Assert mocks.VerifyAll(); // Expect no calls on arguments @@ -277,7 +277,7 @@ menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); - gui.Expect(cmp => cmp.Get(nodeMock, info, treeViewControlMock)).Return(menuBuilderMock); + gui.Expect(cmp => cmp.Get(nodeMock, treeViewControlMock)).Return(menuBuilderMock); mocks.ReplayAll(); @@ -288,7 +288,7 @@ Enumerable.Empty()); // Call - info.ContextMenuStrip(nodeData, nodeMock, info, treeViewControlMock); + info.ContextMenuStrip(nodeData, nodeMock, treeViewControlMock); // Assert mocks.VerifyAll(); // Expect no calls on arguments @@ -411,7 +411,7 @@ observer.Expect(o => o.UpdateObserver()); - gui.Expect(cmp => cmp.Get(treeNodeMock, info, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); + gui.Expect(cmp => cmp.Get(treeNodeMock, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Expect(g => g.MainWindow).Return(mainWindow); var expectedValidationMessageCount = 2; // No surfaceline or soil profile selected for calculation @@ -432,7 +432,7 @@ Enumerable.Empty(), Enumerable.Empty()); - var contextMenuAdapter = info.ContextMenuStrip(pipingCalculationContext, treeNodeMock, info, treeViewControlMock); + var contextMenuAdapter = info.ContextMenuStrip(pipingCalculationContext, treeNodeMock, treeViewControlMock); // When Action action = () => @@ -468,7 +468,7 @@ var treeViewControlMock = mocks.StrictMock(); var treeNodeMock = mocks.StrictMock(); - gui.Expect(cmp => cmp.Get(treeNodeMock, info, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); + gui.Expect(cmp => cmp.Get(treeNodeMock, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); var expectedValidationMessageCount = 2; // No surfaceline or soil profile selected for calculation var expectedStatusMessageCount = 2; @@ -485,9 +485,9 @@ calculation.Attach(observer); var pipingCalculationContext = new PipingCalculationContext(calculation, - Enumerable.Empty(), - Enumerable.Empty()); - var contextMenuAdapter = info.ContextMenuStrip(pipingCalculationContext, treeNodeMock, info, treeViewControlMock); + Enumerable.Empty(), + Enumerable.Empty()); + var contextMenuAdapter = info.ContextMenuStrip(pipingCalculationContext, treeNodeMock, treeViewControlMock); // When Action action = () => contextMenuAdapter.Items[validateContextMenuItemIndex].PerformClick(); @@ -508,7 +508,7 @@ var treeViewControlMock = mocks.StrictMock(); var treeNodeMock = mocks.StrictMock(); - gui.Expect(g => g.Get(treeNodeMock, info, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); + gui.Expect(g => g.Get(treeNodeMock, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); gui.Expect(g => g.MainWindow).Return(mainWindow); observer.Expect(o => o.UpdateObserver()); @@ -554,7 +554,7 @@ Enumerable.Empty(), Enumerable.Empty()); - var contextMenuAdapter = info.ContextMenuStrip(pipingCalculationContext, treeNodeMock, info, treeViewControlMock); + var contextMenuAdapter = info.ContextMenuStrip(pipingCalculationContext, treeNodeMock, treeViewControlMock); // When Action action = () => @@ -592,7 +592,7 @@ var treeViewControlMock = mocks.StrictMock(); var treeNodeMock = mocks.StrictMock(); - gui.Expect(cmp => cmp.Get(treeNodeMock, info, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); + gui.Expect(cmp => cmp.Get(treeNodeMock, treeViewControlMock)).Return(new CustomItemsOnlyContextMenuBuilder()); int clearOutputItemPosition = 2; if (confirm) @@ -612,7 +612,7 @@ Enumerable.Empty(), Enumerable.Empty()); - var contextMenuAdapter = info.ContextMenuStrip(pipingCalculationContext, treeNodeMock, info, treeViewControlMock); + var contextMenuAdapter = info.ContextMenuStrip(pipingCalculationContext, treeNodeMock, treeViewControlMock); DialogBoxHandler = (name, wnd) => { Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -ra7344a227d40381dd9f5f2559a3402250e97a5f3 -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision a7344a227d40381dd9f5f2559a3402250e97a5f3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -744,8 +744,8 @@ var viewCommandsHandler = mocks.StrictMock(); var treeViewControl = mocks.StrictMock(); - var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler, exportImportHandler, viewCommandsHandler, node, info, treeViewControl); - gui.Expect(g => g.Get(node, info, treeViewControl)).Return(menuBuilder); + var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler, exportImportHandler, viewCommandsHandler, node, treeViewControl); + gui.Expect(g => g.Get(node, treeViewControl)).Return(menuBuilder); treeViewControl.Expect(tvc => tvc.CanRename(node)).Return(true); treeViewControl.Expect(tvc => tvc.CanRemove(node)).Return(true); @@ -755,7 +755,7 @@ plugin.Gui = gui; // Call - ContextMenuStrip menu = info.ContextMenuStrip(nodeData, node, info, treeViewControl); + ContextMenuStrip menu = info.ContextMenuStrip(nodeData, node, treeViewControl); // Assert Assert.AreEqual(17, menu.Items.Count); @@ -862,8 +862,8 @@ var viewCommandsHandler = mocks.StrictMock(); var treeViewControl = mocks.StrictMock(); - var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler, exportImportHandler, viewCommandsHandler, node, info, treeViewControl); - gui.Expect(g => g.Get(node, info, treeViewControl)).Return(menuBuilder); + var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler, exportImportHandler, viewCommandsHandler, node, treeViewControl); + gui.Expect(g => g.Get(node, treeViewControl)).Return(menuBuilder); treeViewControl.Expect(tvc => tvc.CanRename(node)).Return(true); @@ -872,7 +872,7 @@ plugin.Gui = gui; // Call - ContextMenuStrip menu = info.ContextMenuStrip(nodeData, node, info, treeViewControl); + ContextMenuStrip menu = info.ContextMenuStrip(nodeData, node, treeViewControl); // Assert Assert.AreEqual(16, menu.Items.Count); @@ -974,15 +974,15 @@ var viewCommandsHandler = mocks.StrictMock(); var treeViewControl = mocks.StrictMock(); - var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler, exportImportHandler, viewCommandsHandler, node, info, treeViewControl); - gui.Expect(g => g.Get(node, info, treeViewControl)).Return(menuBuilder); + var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler, exportImportHandler, viewCommandsHandler, node, treeViewControl); + gui.Expect(g => g.Get(node, treeViewControl)).Return(menuBuilder); mocks.ReplayAll(); plugin.Gui = gui; // Call - ContextMenuStrip menu = info.ContextMenuStrip(nodeData, node, info, treeViewControl); + ContextMenuStrip menu = info.ContextMenuStrip(nodeData, node, treeViewControl); // Assert Assert.AreEqual(14, menu.Items.Count); @@ -1070,14 +1070,14 @@ }; nodeParent.Nodes.Add(node); - gui.Expect(cmp => cmp.Get(node, info, treeViewControl)).Return(menuBuilder); + gui.Expect(cmp => cmp.Get(node, treeViewControl)).Return(menuBuilder); mocks.ReplayAll(); plugin.Gui = gui; // Call - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, node, info, treeViewControl); + ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, node, treeViewControl); // Assert ToolStripItem validateItem = contextMenu.Items[contextMenuValidateAllIndex]; @@ -1124,7 +1124,7 @@ parentNode.Nodes.Add(node); - gui.Expect(cmp => cmp.Get(node, info, treeViewControl)).Return(menuBuilder); + gui.Expect(cmp => cmp.Get(node, treeViewControl)).Return(menuBuilder); mocks.ReplayAll(); @@ -1134,7 +1134,7 @@ nodeData.Attach(observer); - ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, node, info, treeViewControl); + ContextMenuStrip contextMenu = info.ContextMenuStrip(nodeData, node, treeViewControl); // Precondition Assert.AreEqual(1, group.Children.Count); @@ -1186,7 +1186,7 @@ parentNode.Nodes.Add(node); - gui.Expect(cmp => cmp.Get(node, info, treeViewControl)).Return(menuBuilder); + gui.Expect(cmp => cmp.Get(node, treeViewControl)).Return(menuBuilder); mocks.ReplayAll(); @@ -1196,7 +1196,7 @@ nodeData.Attach(observer); - var contextMenu = info.ContextMenuStrip(nodeData, node, info, treeViewControl); + var contextMenu = info.ContextMenuStrip(nodeData, node, treeViewControl); // Precondition Assert.AreEqual(1, group.Children.Count); @@ -1226,7 +1226,7 @@ var node = new TreeNode(); parentNode.Nodes.Add(node); - gui.Expect(cmp => cmp.Get(node, info, treeViewControl)).Return(menuBuilder); + gui.Expect(cmp => cmp.Get(node, treeViewControl)).Return(menuBuilder); mocks.ReplayAll(); @@ -1250,7 +1250,7 @@ Enumerable.Empty(), Enumerable.Empty()); - var contextMenu = info.ContextMenuStrip(nodeData, node, info, treeViewControl); + var contextMenu = info.ContextMenuStrip(nodeData, node, treeViewControl); // Call Action call = () => contextMenu.Items[contextMenuValidateAllIndex].PerformClick(); @@ -1282,7 +1282,7 @@ var parentNode = mocks.Stub(); node.Expect(n => n.Parent).Return(parentNode).Repeat.Twice(); - gui.Expect(g => g.Get(node, info, treeViewControl)).Return(menuBuilder); + gui.Expect(g => g.Get(node, treeViewControl)).Return(menuBuilder); gui.Expect(g => g.MainWindow).Return(mainWindow); mocks.ReplayAll(); @@ -1309,7 +1309,7 @@ Enumerable.Empty(), Enumerable.Empty()); - var contextMenu = info.ContextMenuStrip(nodeData, node, info, treeViewControl); + var contextMenu = info.ContextMenuStrip(nodeData, node, treeViewControl); // Call contextMenu.Items[contextMenuCalculateAllIndex].PerformClick(); @@ -1339,7 +1339,7 @@ calculation1Observer.Expect(o => o.UpdateObserver()); calculation2Observer.Expect(o => o.UpdateObserver()); } - gui.Expect(cmp => cmp.Get(node, info, treeViewControl)).Return(menuBuilder); + gui.Expect(cmp => cmp.Get(node, treeViewControl)).Return(menuBuilder); mocks.ReplayAll(); @@ -1385,7 +1385,7 @@ // Precondition Assert.IsTrue(group.HasOutput); - var contextMenu = info.ContextMenuStrip(nodeData, node, info, treeViewControl); + var contextMenu = info.ContextMenuStrip(nodeData, node, treeViewControl); // Call contextMenu.Items[contextMenuClearOutputIndex].PerformClick(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs =================================================================== diff -u -r5f53f2f23d0c4145d79823c5443966ff4a5a830f -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs (.../PipingFailureMechanismTreeNodeInfoTest.cs) (revision 5f53f2f23d0c4145d79823c5443966ff4a5a830f) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismTreeNodeInfoTest.cs (.../PipingFailureMechanismTreeNodeInfoTest.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -143,7 +143,7 @@ observer.Expect(o => o.UpdateObserver()).Repeat.Twice(); } - gui.Expect(cmp => cmp.Get(nodeMock, info, treeViewControl)).Return(menuBuilder); + gui.Expect(cmp => cmp.Get(nodeMock, treeViewControl)).Return(menuBuilder); mocks.ReplayAll(); @@ -160,7 +160,7 @@ dataMock.CalculationsGroup.Children.ElementAt(0).Attach(observer); dataMock.CalculationsGroup.Children.ElementAt(1).Attach(observer); - ContextMenuStrip contextMenuAdapter = info.ContextMenuStrip(dataMock, nodeMock, info, treeViewControl); + ContextMenuStrip contextMenuAdapter = info.ContextMenuStrip(dataMock, nodeMock, treeViewControl); DialogBoxHandler = (name, wnd) => { @@ -204,15 +204,15 @@ var exportImportHandler = mocks.Stub(); var viewCommandsHandler = mocks.StrictMock(); - var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler, exportImportHandler, viewCommandsHandler, node, info, treeViewControl); - gui.Expect(cmp => cmp.Get(node, info, treeViewControl)).Return(menuBuilder); + var menuBuilder = new ContextMenuBuilder(applicationFeatureCommandHandler, exportImportHandler, viewCommandsHandler, node, treeViewControl); + gui.Expect(cmp => cmp.Get(node, treeViewControl)).Return(menuBuilder); mocks.ReplayAll(); plugin.Gui = gui; // Call - ContextMenuStrip menu = info.ContextMenuStrip(failureMechanism, node, info, treeViewControl); + ContextMenuStrip menu = info.ContextMenuStrip(failureMechanism, node, treeViewControl); // Assert Assert.AreEqual(12, menu.Items.Count); @@ -251,14 +251,14 @@ var dataMock = mocks.StrictMock(); var gui = mocks.StrictMock(); - gui.Expect(cmp => cmp.Get(nodeMock, info, treeViewControl)).Return(menuBuilder); + gui.Expect(cmp => cmp.Get(nodeMock, treeViewControl)).Return(menuBuilder); mocks.ReplayAll(); plugin.Gui = gui; // Call - ContextMenuStrip contextMenu = info.ContextMenuStrip(dataMock, nodeMock, info, treeViewControl); + ContextMenuStrip contextMenu = info.ContextMenuStrip(dataMock, nodeMock, treeViewControl); // Assert ToolStripItem clearOutputItem = contextMenu.Items[contextMenuClearIndex]; @@ -279,7 +279,7 @@ var dataMock = mocks.StrictMock(); var gui = mocks.StrictMock(); - gui.Expect(cmp => cmp.Get(nodeMock, info, treeViewControl)).Return(menuBuilder); + gui.Expect(cmp => cmp.Get(nodeMock, treeViewControl)).Return(menuBuilder); mocks.ReplayAll(); @@ -291,7 +291,7 @@ }); // Call - ContextMenuStrip contextMenu = info.ContextMenuStrip(dataMock, nodeMock, info, treeViewControl); + ContextMenuStrip contextMenu = info.ContextMenuStrip(dataMock, nodeMock, treeViewControl); // Assert ToolStripItem clearOutputItem = contextMenu.Items[contextMenuClearIndex]; @@ -312,7 +312,7 @@ var dataMock = new PipingFailureMechanism(); var gui = mocks.StrictMock(); - gui.Expect(cmp => cmp.Get(nodeMock, info, treeViewControl)).Return(menuBuilder); + gui.Expect(cmp => cmp.Get(nodeMock, treeViewControl)).Return(menuBuilder); mocks.ReplayAll(); @@ -321,7 +321,7 @@ dataMock.CalculationsGroup.Children.Clear(); // Call - ContextMenuStrip contextMenu = info.ContextMenuStrip(dataMock, nodeMock, info, treeViewControl); + ContextMenuStrip contextMenu = info.ContextMenuStrip(dataMock, nodeMock, treeViewControl); // Assert ToolStripItem validateItem = contextMenu.Items[contextMenuValidateAllIndex]; @@ -357,14 +357,14 @@ menuBuilder.Expect(mb => mb.AddCollapseAllItem()).Return(menuBuilder); menuBuilder.Expect(mb => mb.Build()).Return(null); - gui.Expect(cmp => cmp.Get(nodeMock, info, treeViewControl)).Return(menuBuilder); + gui.Expect(cmp => cmp.Get(nodeMock, treeViewControl)).Return(menuBuilder); mocks.ReplayAll(); plugin.Gui = gui; // Call - info.ContextMenuStrip(new PipingFailureMechanism(), nodeMock, info, treeViewControl); + info.ContextMenuStrip(new PipingFailureMechanism(), nodeMock, treeViewControl); // Assert mocks.VerifyAll(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs =================================================================== diff -u -r5f53f2f23d0c4145d79823c5443966ff4a5a830f -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs (.../PipingInputContextTreeNodeInfoTest.cs) (revision 5f53f2f23d0c4145d79823c5443966ff4a5a830f) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingInputContextTreeNodeInfoTest.cs (.../PipingInputContextTreeNodeInfoTest.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -91,7 +91,7 @@ var treeViewControl = mocks.StrictMock(); var menuBuilderMock = mocks.StrictMock(); - gui.Expect(g => g.Get(treeNode, info, treeViewControl)).Return(menuBuilderMock); + gui.Expect(g => g.Get(treeNode, treeViewControl)).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock); @@ -104,7 +104,7 @@ plugin.Gui = gui; // Call - info.ContextMenuStrip(null, treeNode, info, treeViewControl); + info.ContextMenuStrip(null, treeNode, treeViewControl); // Assert mocks.VerifyAll(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingOutputTreeNodeInfoTest.cs =================================================================== diff -u -rb3db013105d10992eeefea39f5ecbdacdd57b4d4 -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingOutputTreeNodeInfoTest.cs (.../PipingOutputTreeNodeInfoTest.cs) (revision b3db013105d10992eeefea39f5ecbdacdd57b4d4) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingOutputTreeNodeInfoTest.cs (.../PipingOutputTreeNodeInfoTest.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -90,7 +90,7 @@ var treeViewControl = mocks.StrictMock(); var menuBuilderMock = mocks.StrictMock(); - gui.Expect(g => g.Get(treeNode, info, treeViewControl)).Return(menuBuilderMock); + gui.Expect(g => g.Get(treeNode, treeViewControl)).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddSeparator()).Return(menuBuilderMock); @@ -102,7 +102,7 @@ plugin.Gui = gui; // Call - info.ContextMenuStrip(null, treeNode, info, treeViewControl); + info.ContextMenuStrip(null, treeNode, treeViewControl); // Assert mocks.VerifyAll(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingSoilProfileCollectionTreeNodeInfoTest.cs =================================================================== diff -u -rb3db013105d10992eeefea39f5ecbdacdd57b4d4 -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingSoilProfileCollectionTreeNodeInfoTest.cs (.../PipingSoilProfileCollectionTreeNodeInfoTest.cs) (revision b3db013105d10992eeefea39f5ecbdacdd57b4d4) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingSoilProfileCollectionTreeNodeInfoTest.cs (.../PipingSoilProfileCollectionTreeNodeInfoTest.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -151,7 +151,7 @@ var treeViewControl = mocks.StrictMock(); var menuBuilderMock = mocks.StrictMock(); - gui.Expect(g => g.Get(treeNode, info, treeViewControl)).Return(menuBuilderMock); + gui.Expect(g => g.Get(treeNode, treeViewControl)).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock); @@ -165,7 +165,7 @@ plugin.Gui = gui; // Call - info.ContextMenuStrip(null, treeNode, info, treeViewControl); + info.ContextMenuStrip(null, treeNode, treeViewControl); // Assert mocks.VerifyAll(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingSoilProfileTreeNodeInfoTest.cs =================================================================== diff -u -rb3db013105d10992eeefea39f5ecbdacdd57b4d4 -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingSoilProfileTreeNodeInfoTest.cs (.../PipingSoilProfileTreeNodeInfoTest.cs) (revision b3db013105d10992eeefea39f5ecbdacdd57b4d4) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingSoilProfileTreeNodeInfoTest.cs (.../PipingSoilProfileTreeNodeInfoTest.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -93,7 +93,7 @@ var treeViewControl = mocks.StrictMock(); var menuBuilderMock = mocks.StrictMock(); - gui.Expect(g => g.Get(treeNode, info, treeViewControl)).Return(menuBuilderMock); + gui.Expect(g => g.Get(treeNode, treeViewControl)).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); @@ -103,7 +103,7 @@ plugin.Gui = gui; // Call - info.ContextMenuStrip(null, treeNode, info, treeViewControl); + info.ContextMenuStrip(null, treeNode, treeViewControl); // Assert mocks.VerifyAll(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs =================================================================== diff -u -rb3db013105d10992eeefea39f5ecbdacdd57b4d4 -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs (.../RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs) (revision b3db013105d10992eeefea39f5ecbdacdd57b4d4) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs (.../RingtoetsPipingSurfaceLineCollectionTreeNodeInfoTest.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -151,7 +151,7 @@ var treeViewControl = mocks.StrictMock(); var menuBuilderMock = mocks.StrictMock(); - gui.Expect(g => g.Get(treeNode, info, treeViewControl)).Return(menuBuilderMock); + gui.Expect(g => g.Get(treeNode, treeViewControl)).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddImportItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddExportItem()).Return(menuBuilderMock); @@ -165,7 +165,7 @@ plugin.Gui = gui; // Call - info.ContextMenuStrip(null, treeNode, info, treeViewControl); + info.ContextMenuStrip(null, treeNode, treeViewControl); // Assert mocks.VerifyAll(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineTreeNodeInfoTest.cs =================================================================== diff -u -rb3db013105d10992eeefea39f5ecbdacdd57b4d4 -rc07c8243b6c74fa79a77f2edbc1799375064b057 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineTreeNodeInfoTest.cs (.../RingtoetsPipingSurfaceLineTreeNodeInfoTest.cs) (revision b3db013105d10992eeefea39f5ecbdacdd57b4d4) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/RingtoetsPipingSurfaceLineTreeNodeInfoTest.cs (.../RingtoetsPipingSurfaceLineTreeNodeInfoTest.cs) (revision c07c8243b6c74fa79a77f2edbc1799375064b057) @@ -92,7 +92,7 @@ var treeViewControl = mocks.StrictMock(); var menuBuilderMock = mocks.StrictMock(); - gui.Expect(g => g.Get(treeNode, info, treeViewControl)).Return(menuBuilderMock); + gui.Expect(g => g.Get(treeNode, treeViewControl)).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.AddPropertiesItem()).Return(menuBuilderMock); menuBuilderMock.Expect(mb => mb.Build()).Return(null); @@ -102,7 +102,7 @@ plugin.Gui = gui; // Call - info.ContextMenuStrip(null, treeNode, info, treeViewControl); + info.ContextMenuStrip(null, treeNode, treeViewControl); // Assert mocks.VerifyAll();