Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -r8339953df3276b6c7b4a3d9f5a278e4c19e85be3 -r7bd2733e0e439e7245a18b02b1b086bba7bc0281 --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 8339953df3276b6c7b4a3d9f5a278e4c19e85be3) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 7bd2733e0e439e7245a18b02b1b086bba7bc0281) @@ -365,9 +365,6 @@ assessmentSection)); }); - SetHydraulicsMenuItemEnabledStateAndTooltip(assessmentSection, - calculateAllItem); - return builder.AddOpenItem() .AddSeparator() .AddCustomItem(calculateAllItem) @@ -538,12 +535,10 @@ .AddSeparator() .AddValidateAllCalculationsInGroupItem( nodeData, - ValidateAllInCalculationGroup, - EnableValidateAndCalculateMenuItemForCalculationGroup) + ValidateAllInCalculationGroup) .AddPerformAllCalculationsInGroupItem( nodeData, - CalculateAllInCalculationGroup, - EnableValidateAndCalculateMenuItemForCalculationGroup) + CalculateAllInCalculationGroup) .AddSeparator() .AddClearAllCalculationOutputInGroupItem(group); @@ -631,11 +626,6 @@ parentGroupContext.NotifyObservers(); } - private static string EnableValidateAndCalculateMenuItemForCalculationGroup(GrassCoverErosionOutwardsCalculationGroupContext context) - { - return EnableValidateAndCalculateMenuItem(context.AssessmentSection); - } - private static void ValidateAllInCalculationGroup(GrassCoverErosionOutwardsCalculationGroupContext context) { CalculationGroup calculationGroup = context.WrappedData; @@ -707,12 +697,10 @@ .AddSeparator() .AddValidateCalculationItem( nodeData, - Validate, - EnableValidateAndCalculateMenuItemForCalculation) + Validate) .AddPerformCalculationItem( nodeData, - Calculate, - EnableValidateAndCalculateMenuItemForCalculation) + Calculate) .AddSeparator() .AddClearCalculationOutputItem(calculation) .AddDeleteItem() @@ -724,11 +712,6 @@ .Build(); } - private static string EnableValidateAndCalculateMenuItemForCalculation(GrassCoverErosionOutwardsWaveConditionsCalculationContext context) - { - return EnableValidateAndCalculateMenuItem(context.AssessmentSection); - } - private static void Validate(GrassCoverErosionOutwardsWaveConditionsCalculationContext context) { IAssessmentSection assessmentSection = context.AssessmentSection; @@ -762,22 +745,6 @@ #endregion - private static void SetHydraulicsMenuItemEnabledStateAndTooltip(IAssessmentSection assessmentSection, - StrictContextMenuItem menuItem) - { - string validationText = EnableValidateAndCalculateMenuItem(assessmentSection); - if (!string.IsNullOrEmpty(validationText)) - { - menuItem.Enabled = false; - menuItem.ToolTipText = validationText; - } - } - - private static string EnableValidateAndCalculateMenuItem(IAssessmentSection assessmentSection) - { - return HydraulicBoundaryDataConnectionValidator.Validate(assessmentSection.HydraulicBoundaryData); - } - #endregion } } \ No newline at end of file