Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs =================================================================== diff -u -rd9f5273ce881cc71adaf9a3fd62a6517eda39983 -r61abae678f0799bdbf16a7ed09d1f20e2709a239 --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision d9f5273ce881cc71adaf9a3fd62a6517eda39983) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision 61abae678f0799bdbf16a7ed09d1f20e2709a239) @@ -490,7 +490,7 @@ return builder.AddOpenItem() .AddSeparator() - .AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem) + .AddToggleRelevancyOfFailurePathItem(context, RemoveAllViewsForItem) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() @@ -505,7 +505,7 @@ { var builder = new RiskeerContextMenuBuilder(Gui.Get(context, treeViewControl)); - return builder.AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem) + return builder.AddToggleRelevancyOfFailurePathItem(context, RemoveAllViewsForItem) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() Index: Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs =================================================================== diff -u -r091428672ce70930856bf22a225701c6d04759b2 -r61abae678f0799bdbf16a7ed09d1f20e2709a239 --- Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs (.../RiskeerContextMenuBuilder.cs) (revision 091428672ce70930856bf22a225701c6d04759b2) +++ Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs (.../RiskeerContextMenuBuilder.cs) (revision 61abae678f0799bdbf16a7ed09d1f20e2709a239) @@ -258,18 +258,18 @@ } /// - /// Adds an item to the , which sets if the failure mechanism is relevant. + /// Adds an item to the , which sets if the failure path is relevant. /// - /// The type of the failure mechanism context. - /// The failure mechanism context belonging to the failure mechanism. + /// The type of the failure path context. + /// The failure path context belonging to the failure mechanism. /// The action to perform when relevance changes. /// The itself. - public RiskeerContextMenuBuilder AddToggleRelevancyOfFailureMechanismItem( - TFailureMechanismContext failureMechanismContext, - Action onChangeAction) - where TFailureMechanismContext : IFailureMechanismContext + public RiskeerContextMenuBuilder AddToggleRelevancyOfFailurePathItem( + TFailurePathContext failurePathContext, + Action onChangeAction) + where TFailurePathContext : IFailureMechanismContext { - contextMenuBuilder.AddCustomItem(RiskeerContextMenuItemFactory.CreateToggleRelevancyOfFailurePathItem(failureMechanismContext, onChangeAction)); + contextMenuBuilder.AddCustomItem(RiskeerContextMenuItemFactory.CreateToggleRelevancyOfFailurePathItem(failurePathContext, onChangeAction)); return this; } Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs =================================================================== diff -u -re07d30ecc9a59c83aba1cbaed15aaabda6a1e1d8 -r61abae678f0799bdbf16a7ed09d1f20e2709a239 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs (.../RiskeerContextMenuBuilderTest.cs) (revision e07d30ecc9a59c83aba1cbaed15aaabda6a1e1d8) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs (.../RiskeerContextMenuBuilderTest.cs) (revision 61abae678f0799bdbf16a7ed09d1f20e2709a239) @@ -25,17 +25,18 @@ using System.Windows.Forms; using Core.Common.Base; using Core.Common.Controls.TreeView; +using Core.Common.TestUtil; using Core.Gui.Commands; using Core.Gui.ContextMenu; using Core.Gui.Helpers; using Core.Gui.Plugin; -using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.DikeProfiles; using Riskeer.Common.Data.FailureMechanism; +using Riskeer.Common.Data.FailurePath; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Forms.ChangeHandlers; using Riskeer.Common.Forms.PresentationObjects; @@ -318,7 +319,7 @@ [Test] [TestCase(true)] [TestCase(false)] - public void AddToggleRelevancyOfFailureMechanismItem_WhenBuild_ItemAddedToContextMenuEnabled(bool isRelevant) + public void AddToggleRelevancyOfFailurePathItem_WhenBuild_ItemAddedToContextMenuEnabled(bool isRelevant) { // Setup var mocks = new MockRepository(); @@ -327,10 +328,10 @@ var exportCommandHandler = mocks.StrictMock(); var updateCommandHandler = mocks.StrictMock(); var viewCommands = mocks.StrictMock(); - var failureMechanism = mocks.StrictMock(); - failureMechanism.Expect(fm => fm.IsRelevant).Return(isRelevant); - var failureMechanismContext = mocks.StrictMock>(); - failureMechanismContext.Expect(fmc => fmc.WrappedData).Return(failureMechanism); + var failurePath = mocks.StrictMock(); + failurePath.Expect(fm => fm.IsRelevant).Return(isRelevant); + var failurePathContext = mocks.StrictMock>(); + failurePathContext.Expect(fmc => fmc.WrappedData).Return(failurePath); mocks.ReplayAll(); using (var treeViewControl = new TreeViewControl()) @@ -340,12 +341,12 @@ exportCommandHandler, updateCommandHandler, viewCommands, - failureMechanism, + failurePath, treeViewControl); var riskeerContextMenuBuilder = new RiskeerContextMenuBuilder(contextMenuBuilder); // Call - ContextMenuStrip result = riskeerContextMenuBuilder.AddToggleRelevancyOfFailureMechanismItem(failureMechanismContext, null).Build(); + ContextMenuStrip result = riskeerContextMenuBuilder.AddToggleRelevancyOfFailurePathItem(failurePathContext, null).Build(); // Assert Assert.IsInstanceOf(result); Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs =================================================================== diff -u -ra5c8e45689ee598d251eaa4bc8ae0b5186b731ea -r61abae678f0799bdbf16a7ed09d1f20e2709a239 --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision a5c8e45689ee598d251eaa4bc8ae0b5186b731ea) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision 61abae678f0799bdbf16a7ed09d1f20e2709a239) @@ -463,7 +463,7 @@ return builder.AddOpenItem() .AddSeparator() - .AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem) + .AddToggleRelevancyOfFailurePathItem(context, RemoveAllViewsForItem) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() @@ -478,7 +478,7 @@ { var builder = new RiskeerContextMenuBuilder(Gui.Get(context, treeViewControl)); - return builder.AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem) + return builder.AddToggleRelevancyOfFailurePathItem(context, RemoveAllViewsForItem) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs =================================================================== diff -u -r610384f7c58bae10e1e6dcdad2eb7afbde53ee93 -r61abae678f0799bdbf16a7ed09d1f20e2709a239 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 610384f7c58bae10e1e6dcdad2eb7afbde53ee93) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 61abae678f0799bdbf16a7ed09d1f20e2709a239) @@ -641,7 +641,7 @@ return builder.AddOpenItem() .AddSeparator() - .AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem) + .AddToggleRelevancyOfFailurePathItem(context, RemoveAllViewsForItem) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() @@ -656,7 +656,7 @@ { var builder = new RiskeerContextMenuBuilder(Gui.Get(context, treeViewControl)); - return builder.AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem) + return builder.AddToggleRelevancyOfFailurePathItem(context, RemoveAllViewsForItem) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -r7c4861326360ada93b789079b501f4f7c34572a1 -r61abae678f0799bdbf16a7ed09d1f20e2709a239 --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 7c4861326360ada93b789079b501f4f7c34572a1) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 61abae678f0799bdbf16a7ed09d1f20e2709a239) @@ -420,7 +420,7 @@ return builder.AddOpenItem() .AddSeparator() - .AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem) + .AddToggleRelevancyOfFailurePathItem(context, RemoveAllViewsForItem) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() @@ -435,7 +435,7 @@ { var builder = new RiskeerContextMenuBuilder(Gui.Get(context, treeViewControl)); - return builder.AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem) + return builder.AddToggleRelevancyOfFailurePathItem(context, RemoveAllViewsForItem) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs =================================================================== diff -u -rbe7e72912cca4f8f78e6246b8b98361a5751b1bb -r61abae678f0799bdbf16a7ed09d1f20e2709a239 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision be7e72912cca4f8f78e6246b8b98361a5751b1bb) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision 61abae678f0799bdbf16a7ed09d1f20e2709a239) @@ -495,7 +495,7 @@ return builder.AddOpenItem() .AddSeparator() - .AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem) + .AddToggleRelevancyOfFailurePathItem(context, RemoveAllViewsForItem) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() @@ -510,7 +510,7 @@ { var builder = new RiskeerContextMenuBuilder(Gui.Get(context, treeViewControl)); - return builder.AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem) + return builder.AddToggleRelevancyOfFailurePathItem(context, RemoveAllViewsForItem) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs =================================================================== diff -u -rbbc04dba5c20b53874840731bcb9abf8f6869d67 -r61abae678f0799bdbf16a7ed09d1f20e2709a239 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision bbc04dba5c20b53874840731bcb9abf8f6869d67) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 61abae678f0799bdbf16a7ed09d1f20e2709a239) @@ -2039,7 +2039,7 @@ return builder.AddOpenItem() .AddSeparator() - .AddToggleRelevancyOfFailureMechanismItem(nodeData, RemoveAllViewsForItem) + .AddToggleRelevancyOfFailurePathItem(nodeData, RemoveAllViewsForItem) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() @@ -2059,7 +2059,7 @@ { var builder = new RiskeerContextMenuBuilder(Gui.Get(nodeData, treeViewControl)); - return builder.AddToggleRelevancyOfFailureMechanismItem(nodeData, RemoveAllViewsForItem) + return builder.AddToggleRelevancyOfFailurePathItem(nodeData, RemoveAllViewsForItem) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() @@ -2069,7 +2069,16 @@ } #endregion + .AddSeparator() + .AddCollapseAllItem() + .AddExpandAllItem() + .AddSeparator() + .AddPropertiesItem() + .Build(); + } + #endregion + #region GrassCoverSlipOffInwardsFailurePathContext TreeNodeInfo private static object[] GrassCoverSlipOffInwardsFailurePathEnabledChildNodeObjects(GrassCoverSlipOffInwardsFailurePathContext nodeData) Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs =================================================================== diff -u -r6f58444a2298b80b5c51f121312321e67aad3a62 -r61abae678f0799bdbf16a7ed09d1f20e2709a239 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision 6f58444a2298b80b5c51f121312321e67aad3a62) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision 61abae678f0799bdbf16a7ed09d1f20e2709a239) @@ -722,7 +722,7 @@ return builder.AddOpenItem() .AddSeparator() - .AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem) + .AddToggleRelevancyOfFailurePathItem(context, RemoveAllViewsForItem) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() @@ -737,7 +737,7 @@ { var builder = new RiskeerContextMenuBuilder(Gui.Get(context, treeViewControl)); - return builder.AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem) + return builder.AddToggleRelevancyOfFailurePathItem(context, RemoveAllViewsForItem) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -ra5c8e45689ee598d251eaa4bc8ae0b5186b731ea -r61abae678f0799bdbf16a7ed09d1f20e2709a239 --- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision a5c8e45689ee598d251eaa4bc8ae0b5186b731ea) +++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 61abae678f0799bdbf16a7ed09d1f20e2709a239) @@ -911,7 +911,7 @@ return builder.AddOpenItem() .AddSeparator() - .AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem) + .AddToggleRelevancyOfFailurePathItem(context, RemoveAllViewsForItem) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() @@ -926,7 +926,7 @@ { var builder = new RiskeerContextMenuBuilder(Gui.Get(context, treeViewControl)); - return builder.AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem) + return builder.AddToggleRelevancyOfFailurePathItem(context, RemoveAllViewsForItem) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs =================================================================== diff -u -r61fc55ea447dac193a05384fab7be08595956456 -r61abae678f0799bdbf16a7ed09d1f20e2709a239 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision 61fc55ea447dac193a05384fab7be08595956456) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision 61abae678f0799bdbf16a7ed09d1f20e2709a239) @@ -488,7 +488,7 @@ return builder.AddOpenItem() .AddSeparator() - .AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem) + .AddToggleRelevancyOfFailurePathItem(context, RemoveAllViewsForItem) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() @@ -503,7 +503,7 @@ { var builder = new RiskeerContextMenuBuilder(Gui.Get(context, treeViewControl)); - return builder.AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem) + return builder.AddToggleRelevancyOfFailurePathItem(context, RemoveAllViewsForItem) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs =================================================================== diff -u -r82fa24f1a3d7cbcbe2cea897b43b75d4509a60de -r61abae678f0799bdbf16a7ed09d1f20e2709a239 --- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 82fa24f1a3d7cbcbe2cea897b43b75d4509a60de) +++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 61abae678f0799bdbf16a7ed09d1f20e2709a239) @@ -415,7 +415,7 @@ return builder.AddOpenItem() .AddSeparator() - .AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem) + .AddToggleRelevancyOfFailurePathItem(context, RemoveAllViewsForItem) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() @@ -430,7 +430,7 @@ { var builder = new RiskeerContextMenuBuilder(Gui.Get(context, treeViewControl)); - return builder.AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem) + return builder.AddToggleRelevancyOfFailurePathItem(context, RemoveAllViewsForItem) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -ra149b857c8f62494ab59a123646e8ab56588a06e -r61abae678f0799bdbf16a7ed09d1f20e2709a239 --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision a149b857c8f62494ab59a123646e8ab56588a06e) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 61abae678f0799bdbf16a7ed09d1f20e2709a239) @@ -416,7 +416,7 @@ return builder.AddOpenItem() .AddSeparator() - .AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem) + .AddToggleRelevancyOfFailurePathItem(context, RemoveAllViewsForItem) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem() @@ -431,7 +431,7 @@ { var builder = new RiskeerContextMenuBuilder(Gui.Get(context, treeViewControl)); - return builder.AddToggleRelevancyOfFailureMechanismItem(context, RemoveAllViewsForItem) + return builder.AddToggleRelevancyOfFailurePathItem(context, RemoveAllViewsForItem) .AddSeparator() .AddCollapseAllItem() .AddExpandAllItem()