Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs =================================================================== diff -u -r389868939500c397bb8f18faee20ad540a19a1fe -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision 389868939500c397bb8f18faee20ad540a19a1fe) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6) @@ -558,7 +558,6 @@ ValidateAllInCalculationGroup, EnableValidateAndCalculateMenuItemForCalculationGroup) .AddPerformAllCalculationsInGroupItem( - group, context, CalculateAllInCalculationGroup, EnableValidateAndCalculateMenuItemForCalculationGroup) @@ -681,10 +680,10 @@ ValidateAll(context.WrappedData.GetCalculations().OfType>(), context.AssessmentSection); } - private void CalculateAllInCalculationGroup(CalculationGroup group, ClosingStructuresCalculationGroupContext context) + private void CalculateAllInCalculationGroup(ClosingStructuresCalculationGroupContext context) { ActivityProgressDialogRunner.Run(Gui.MainWindow, - ClosingStructuresCalculationActivityFactory.CreateCalculationActivities(group, + ClosingStructuresCalculationActivityFactory.CreateCalculationActivities(context.WrappedData, context.FailureMechanism, context.AssessmentSection)); } Index: Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs =================================================================== diff -u -r389868939500c397bb8f18faee20ad540a19a1fe -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 --- Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs (.../RiskeerContextMenuBuilder.cs) (revision 389868939500c397bb8f18faee20ad540a19a1fe) +++ Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuBuilder.cs (.../RiskeerContextMenuBuilder.cs) (revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6) @@ -93,21 +93,19 @@ /// Adds an item to the , which performs all calculations in a calculation group. /// /// The type of the calculation group context. - /// The calculation group to perform all calculations for. /// The calculation group context belonging to the calculation group. /// The action that performs all calculations. /// An optional function which determines whether the item should be enabled. If the /// item should not be enabled, then the reason for that should be returned by the function and will be shown as a tooltip. /// If the item should be enabled then the function should return a null or empty string. /// The itself. public RiskeerContextMenuBuilder AddPerformAllCalculationsInGroupItem( - CalculationGroup calculationGroup, TCalculationContext calculationGroupContext, - Action calculateAllAction, + Action calculateAllAction, Func enableMenuItemFunction = null) where TCalculationContext : ICalculationContext { - contextMenuBuilder.AddCustomItem(RiskeerContextMenuItemFactory.CreatePerformAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, calculateAllAction, enableMenuItemFunction)); + contextMenuBuilder.AddCustomItem(RiskeerContextMenuItemFactory.CreatePerformAllCalculationsInGroupItem(calculationGroupContext, calculateAllAction, enableMenuItemFunction)); return this; } Index: Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuItemFactory.cs =================================================================== diff -u -r389868939500c397bb8f18faee20ad540a19a1fe -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 --- Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuItemFactory.cs (.../RiskeerContextMenuItemFactory.cs) (revision 389868939500c397bb8f18faee20ad540a19a1fe) +++ Riskeer/Common/src/Riskeer.Common.Forms/TreeNodeInfos/RiskeerContextMenuItemFactory.cs (.../RiskeerContextMenuItemFactory.cs) (revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6) @@ -106,25 +106,23 @@ /// Creates a which is bound to the action of performing all calculations in a calculation group. /// /// The type of the calculation group context. - /// The calculation group to perform all calculations for. /// The calculation group context belonging to the calculation group. /// The action that performs all calculations. /// The function which determines whether the item should be enabled. If the /// item should not be enabled, then the reason for that should be returned by the function and will be shown as a tooltip. /// If the item should be enabled then the function should return a null or empty string. /// The created . public static StrictContextMenuItem CreatePerformAllCalculationsInGroupItem( - CalculationGroup calculationGroup, TCalculationGroupContext calculationGroupContext, - Action calculateAllAction, + Action calculateAllAction, Func enableMenuItemFunction) where TCalculationGroupContext : ICalculationContext { var menuItem = new StrictContextMenuItem( Resources.Calculate_All, Resources.CalculationGroup_Calculate_All_ToolTip, Resources.CalculateAllIcon, - (o, args) => calculateAllAction(calculationGroup, calculationGroupContext)); + (o, args) => calculateAllAction(calculationGroupContext)); if (!calculationGroupContext.WrappedData.GetCalculations().Any()) { Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs =================================================================== diff -u -r05d0f7280719c98be98d7c41b100a9bb8030afee -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs (.../RiskeerContextMenuBuilderTest.cs) (revision 05d0f7280719c98be98d7c41b100a9bb8030afee) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuBuilderTest.cs (.../RiskeerContextMenuBuilderTest.cs) (revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6) @@ -1260,7 +1260,7 @@ var riskeerContextMenuBuilder = new RiskeerContextMenuBuilder(contextMenuBuilder); // Call - ContextMenuStrip result = riskeerContextMenuBuilder.AddPerformAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => null).Build(); + ContextMenuStrip result = riskeerContextMenuBuilder.AddPerformAllCalculationsInGroupItem(calculationGroupContext, null, context => null).Build(); // Assert Assert.IsInstanceOf(result); @@ -1305,7 +1305,7 @@ var riskeerContextMenuBuilder = new RiskeerContextMenuBuilder(contextMenuBuilder); // Call - ContextMenuStrip result = riskeerContextMenuBuilder.AddPerformAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => null).Build(); + ContextMenuStrip result = riskeerContextMenuBuilder.AddPerformAllCalculationsInGroupItem(calculationGroupContext, null, context => null).Build(); // Assert Assert.IsInstanceOf(result); @@ -1364,7 +1364,7 @@ const string errorMessage = "Additional validation failed."; // Call - ContextMenuStrip result = riskeerContextMenuBuilder.AddPerformAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => errorMessage).Build(); + ContextMenuStrip result = riskeerContextMenuBuilder.AddPerformAllCalculationsInGroupItem(calculationGroupContext, null, context => errorMessage).Build(); // Assert Assert.IsInstanceOf(result); @@ -1412,7 +1412,7 @@ const string errorMessage = "Additional validation failed."; // Call - ContextMenuStrip result = riskeerContextMenuBuilder.AddPerformAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => errorMessage).Build(); + ContextMenuStrip result = riskeerContextMenuBuilder.AddPerformAllCalculationsInGroupItem(calculationGroupContext, null, context => errorMessage).Build(); // Assert Assert.IsInstanceOf(result); Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuItemFactoryTest.cs =================================================================== diff -u -r05d0f7280719c98be98d7c41b100a9bb8030afee -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuItemFactoryTest.cs (.../RiskeerContextMenuItemFactoryTest.cs) (revision 05d0f7280719c98be98d7c41b100a9bb8030afee) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/TreeNodeInfos/RiskeerContextMenuItemFactoryTest.cs (.../RiskeerContextMenuItemFactoryTest.cs) (revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6) @@ -123,7 +123,7 @@ var mocks = new MockRepository(); var failureMechanism = mocks.StrictMock(); mocks.ReplayAll(); - + var calculationType = new Random(21).NextEnumValue(); var counter = 0; @@ -1156,7 +1156,7 @@ var calculationGroupContext = new TestCalculationGroupContext(calculationGroup, parent, failureMechanism); // Call - StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreatePerformAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => null); + StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreatePerformAllCalculationsInGroupItem(calculationGroupContext, null, context => null); // Assert Assert.AreEqual("Alles be&rekenen", toolStripItem.Text); @@ -1183,7 +1183,7 @@ var calculationGroupContext = new TestCalculationGroupContext(calculationGroup, parent, failureMechanism); // Call - StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreatePerformAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => null); + StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreatePerformAllCalculationsInGroupItem(calculationGroupContext, null, context => null); // Assert Assert.AreEqual("Alles be&rekenen", toolStripItem.Text); @@ -1216,7 +1216,7 @@ const string errorMessage = "Additional check failed."; // Call - StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreatePerformAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => errorMessage); + StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreatePerformAllCalculationsInGroupItem(calculationGroupContext, null, context => errorMessage); // Assert Assert.AreEqual("Alles be&rekenen", toolStripItem.Text); @@ -1238,7 +1238,7 @@ const string errorMessage = "Additional check failed."; // Call - StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreatePerformAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, null, context => errorMessage); + StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreatePerformAllCalculationsInGroupItem(calculationGroupContext, null, context => errorMessage); // Assert Assert.AreEqual("Alles be&rekenen", toolStripItem.Text); @@ -1269,7 +1269,7 @@ var calculationGroupContext = new TestCalculationGroupContext(calculationGroup, parent, failureMechanism); - StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreatePerformAllCalculationsInGroupItem(calculationGroup, calculationGroupContext, (group, context) => counter++, context => null); + StrictContextMenuItem toolStripItem = RiskeerContextMenuItemFactory.CreatePerformAllCalculationsInGroupItem(calculationGroupContext, context => counter++, context => null); // Call toolStripItem.PerformClick(); Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs =================================================================== diff -u -rd7e77718d81d97c8f62bafbda742760acf837bbe -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision d7e77718d81d97c8f62bafbda742760acf837bbe) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6) @@ -708,7 +708,6 @@ ValidateAllInCalculationGroup, EnableValidateAndCalculateMenuItemForCalculationGroup) .AddPerformAllCalculationsInGroupItem( - group, context, CalculateAllInCalculationGroup, EnableValidateAndCalculateMenuItemForCalculationGroup) @@ -834,7 +833,7 @@ context.AssessmentSection); } - private void CalculateAllInCalculationGroup(CalculationGroup group, GrassCoverErosionInwardsCalculationGroupContext context) + private void CalculateAllInCalculationGroup(GrassCoverErosionInwardsCalculationGroupContext context) { ActivityProgressDialogRunner.Run( Gui.MainWindow, Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -r389868939500c397bb8f18faee20ad540a19a1fe -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 389868939500c397bb8f18faee20ad540a19a1fe) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6) @@ -771,7 +771,6 @@ ValidateAllInCalculationGroup, EnableValidateAndCalculateMenuItemForCalculationGroup) .AddPerformAllCalculationsInGroupItem( - group, nodeData, CalculateAllInCalculationGroup, EnableValidateAndCalculateMenuItemForCalculationGroup) @@ -884,12 +883,13 @@ } } - private void CalculateAllInCalculationGroup(CalculationGroup group, GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext context) + private void CalculateAllInCalculationGroup(GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext context) { ActivityProgressDialogRunner.Run( Gui.MainWindow, - GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivities( - group, context.FailureMechanism, context.AssessmentSection)); + GrassCoverErosionOutwardsCalculationActivityFactory.CreateWaveConditionsCalculationActivities(context.WrappedData, + context.FailureMechanism, + context.AssessmentSection)); } #endregion Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs =================================================================== diff -u -r389868939500c397bb8f18faee20ad540a19a1fe -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision 389868939500c397bb8f18faee20ad540a19a1fe) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6) @@ -562,7 +562,6 @@ ValidateAllInCalculationGroup, EnableValidateAndCalculateMenuItemForCalculationGroup) .AddPerformAllCalculationsInGroupItem( - group, context, CalculateAllInCalculationGroup, EnableValidateAndCalculateMenuItemForCalculationGroup) @@ -687,11 +686,13 @@ ValidateAll(context.WrappedData.GetCalculations().OfType>(), context.AssessmentSection); } - private void CalculateAllInCalculationGroup(CalculationGroup group, HeightStructuresCalculationGroupContext context) + private void CalculateAllInCalculationGroup(HeightStructuresCalculationGroupContext context) { ActivityProgressDialogRunner.Run( Gui.MainWindow, - HeightStructuresCalculationActivityFactory.CreateCalculationActivities(group, context.FailureMechanism, context.AssessmentSection)); + HeightStructuresCalculationActivityFactory.CreateCalculationActivities(context.WrappedData, + context.FailureMechanism, + context.AssessmentSection)); } #endregion Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs =================================================================== diff -u -r389868939500c397bb8f18faee20ad540a19a1fe -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision 389868939500c397bb8f18faee20ad540a19a1fe) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Plugin/MacroStabilityInwardsPlugin.cs (.../MacroStabilityInwardsPlugin.cs) (revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6) @@ -779,7 +779,6 @@ nodeData, ValidateAllInCalculationGroup) .AddPerformAllCalculationsInGroupItem( - group, nodeData, CalculateAllInCalculationGroup) .AddSeparator() @@ -866,11 +865,12 @@ ValidateAll(context.WrappedData.GetCalculations().OfType(), context.AssessmentSection); } - private void CalculateAllInCalculationGroup(CalculationGroup group, MacroStabilityInwardsCalculationGroupContext context) + private void CalculateAllInCalculationGroup(MacroStabilityInwardsCalculationGroupContext context) { ActivityProgressDialogRunner.Run( Gui.MainWindow, - MacroStabilityInwardsCalculationActivityFactory.CreateCalculationActivities(group, context.AssessmentSection)); + MacroStabilityInwardsCalculationActivityFactory.CreateCalculationActivities(context.WrappedData, + context.AssessmentSection)); } #endregion Index: Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -r6f9faf2191aaab7e438551794102cbdadf386b1e -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 --- Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 6f9faf2191aaab7e438551794102cbdadf386b1e) +++ Riskeer/Piping/src/Riskeer.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6) @@ -877,7 +877,6 @@ nodeData, ValidateAllInCalculationGroup) .AddPerformAllCalculationsInGroupItem( - group, nodeData, CalculateAllInCalculationGroup) .AddSeparator() @@ -1030,13 +1029,12 @@ } /// - /// Performs all calculations in . + /// Performs all calculations in the calculation group wrapped by . /// - /// The group to perform the calculations from. - /// The context containing additional data to use during the calculations. + /// The context that wraps the calculation group. /// Thrown when any of the calculations in /// is of a type that is not supported. - private void CalculateAllInCalculationGroup(CalculationGroup group, PipingCalculationGroupContext calculationGroupContext) + private void CalculateAllInCalculationGroup(PipingCalculationGroupContext calculationGroupContext) { ActivityProgressDialogRunner.Run( Gui.MainWindow, PipingCalculationActivityFactory.CreateCalculationActivities(calculationGroupContext.WrappedData, Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs =================================================================== diff -u -r389868939500c397bb8f18faee20ad540a19a1fe -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision 389868939500c397bb8f18faee20ad540a19a1fe) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6) @@ -330,7 +330,6 @@ private static bool CloseCalculationsViewForData(StabilityPointStructuresCalculationsView view, object o) { - var failureMechanism = o as StabilityPointStructuresFailureMechanism; if (o is StabilityPointStructuresFailureMechanismContext failureMechanismContext) @@ -564,7 +563,6 @@ ValidateAllInCalculationGroup, EnableValidateAndCalculateMenuItemForCalculationGroup) .AddPerformAllCalculationsInGroupItem( - group, context, CalculateAllInCalculationGroup, EnableValidateAndCalculateMenuItemForCalculationGroup) @@ -690,10 +688,10 @@ context.AssessmentSection); } - private void CalculateAllInCalculationGroup(CalculationGroup group, StabilityPointStructuresCalculationGroupContext context) + private void CalculateAllInCalculationGroup(StabilityPointStructuresCalculationGroupContext context) { ActivityProgressDialogRunner.Run(Gui.MainWindow, - StabilityPointStructuresCalculationActivityFactory.CreateCalculationActivities(group, + StabilityPointStructuresCalculationActivityFactory.CreateCalculationActivities(context.WrappedData, context.FailureMechanism, context.AssessmentSection)); } Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs =================================================================== diff -u -r389868939500c397bb8f18faee20ad540a19a1fe -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 --- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 389868939500c397bb8f18faee20ad540a19a1fe) +++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6) @@ -464,7 +464,9 @@ .AddValidateAllCalculationsInGroupItem(nodeData, ValidateAllInCalculationGroup, EnableValidateAndCalculateMenuItemForCalculationGroup) - .AddPerformAllCalculationsInGroupItem(group, nodeData, CalculateAllInCalculationGroup, EnableValidateAndCalculateMenuItemForCalculationGroup) + .AddPerformAllCalculationsInGroupItem(nodeData, + CalculateAllInCalculationGroup, + EnableValidateAndCalculateMenuItemForCalculationGroup) .AddSeparator() .AddClearAllCalculationOutputInGroupItem(group); @@ -569,11 +571,11 @@ } } - private void CalculateAllInCalculationGroup(CalculationGroup group, StabilityStoneCoverWaveConditionsCalculationGroupContext context) + private void CalculateAllInCalculationGroup(StabilityStoneCoverWaveConditionsCalculationGroupContext context) { ActivityProgressDialogRunner.Run( Gui.MainWindow, - StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivities(group, + StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivities(context.WrappedData, context.FailureMechanism, context.AssessmentSection)); } Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -r389868939500c397bb8f18faee20ad540a19a1fe -radadc631ccc42cb15f6fb6b81cccf46229e31ed6 --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 389868939500c397bb8f18faee20ad540a19a1fe) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision adadc631ccc42cb15f6fb6b81cccf46229e31ed6) @@ -466,7 +466,9 @@ .AddValidateAllCalculationsInGroupItem(nodeData, ValidateAllInCalculationGroup, EnableValidateAndCalculateMenuItemForCalculationGroup) - .AddPerformAllCalculationsInGroupItem(group, nodeData, CalculateAllInCalculationGroup, EnableValidateAndCalculateMenuItemForCalculationGroup) + .AddPerformAllCalculationsInGroupItem(nodeData, + CalculateAllInCalculationGroup, + EnableValidateAndCalculateMenuItemForCalculationGroup) .AddSeparator() .AddClearAllCalculationOutputInGroupItem(group); @@ -570,11 +572,11 @@ } } - private void CalculateAllInCalculationGroup(CalculationGroup group, WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext context) + private void CalculateAllInCalculationGroup(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext context) { ActivityProgressDialogRunner.Run( Gui.MainWindow, - WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivities(group, + WaveImpactAsphaltCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivities(context.WrappedData, context.FailureMechanism, context.AssessmentSection)); }