Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs =================================================================== diff -u -r4d711e7b0e3a8e91c9afc0339e3f7dadaf619fc3 -r0a1752d24408af81508bc81d154293be23c9c4ea --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs (.../GrassCoverErosionInwardsGuiPlugin.cs) (revision 4d711e7b0e3a8e91c9afc0339e3f7dadaf619fc3) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsGuiPlugin.cs (.../GrassCoverErosionInwardsGuiPlugin.cs) (revision 0a1752d24408af81508bc81d154293be23c9c4ea) @@ -255,15 +255,13 @@ grassCoverErosionInwardsFailureMechanismContext.WrappedData.NotifyObservers(); }); - var calculateAllItem = CreateCalculateAllItem(grassCoverErosionInwardsFailureMechanismContext); - var builder = new RingtoetsContextMenuBuilder(Gui.Get(grassCoverErosionInwardsFailureMechanismContext, treeViewControl)); return builder .AddOpenItem() .AddSeparator() .AddCustomItem(changeRelevancyItem) .AddSeparator() - .AddCustomItem(calculateAllItem) + .AddPerformAllCalculationsInFailureMechanismItem(grassCoverErosionInwardsFailureMechanismContext, CalculateAll) .AddClearAllCalculationOutputInFailureMechanismItem(grassCoverErosionInwardsFailureMechanismContext.WrappedData) .AddSeparator() .AddImportItem() @@ -287,11 +285,6 @@ .Build(); } - private static IEnumerable GetAllCalculations(GrassCoverErosionInwardsFailureMechanism failureMechanism) - { - return failureMechanism.Calculations.OfType(); - } - private static void AddCalculation(GrassCoverErosionInwardsCalculationGroupContext context) { var calculation = new GrassCoverErosionInwardsCalculation(context.FailureMechanism.GeneralInput) @@ -302,27 +295,9 @@ context.WrappedData.NotifyObservers(); } - private StrictContextMenuItem CreateCalculateAllItem(GrassCoverErosionInwardsFailureMechanismContext context) - { - var menuItem = new StrictContextMenuItem( - RingtoetsCommonFormsResources.Calculate_all, - RingtoetsCommonFormsResources.Calculate_all_ToolTip, - RingtoetsCommonFormsResources.CalculateAllIcon, - (o, args) => CalculateAll(context) - ); - - if (!GetAllCalculations(context.WrappedData).Any()) - { - menuItem.Enabled = false; - menuItem.ToolTipText = RingtoetsCommonFormsResources.FailureMechanism_CreateCalculateAllItem_No_calculations_to_run; - } - - return menuItem; - } - private void CalculateAll(GrassCoverErosionInwardsFailureMechanismContext context) { - CalculateAll(context.WrappedData, GetAllCalculations(context.WrappedData), context.Parent); + CalculateAll(context.WrappedData, context.WrappedData.Calculations.OfType(), context.Parent); } #endregion