Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs =================================================================== diff -u -r5c2c711a2bd1ba6ee466a362556cdab90f6fa379 -re0dd088a47fdf5b7d7c0612cc586a5e24723133d --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs (.../HeightStructuresCalculationConfigurationImporter.cs) (revision 5c2c711a2bd1ba6ee466a362556cdab90f6fa379) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.IO/Configurations/HeightStructuresCalculationConfigurationImporter.cs (.../HeightStructuresCalculationConfigurationImporter.cs) (revision e0dd088a47fdf5b7d7c0612cc586a5e24723133d) @@ -30,7 +30,6 @@ using Riskeer.Common.IO.Configurations.Helpers; using Riskeer.Common.IO.Configurations.Import; using Riskeer.HeightStructures.Data; -using Riskeer.HeightStructures.Util; using RiskeerCommonIOResources = Riskeer.Common.IO.Properties.Resources; namespace Riskeer.HeightStructures.IO.Configurations @@ -95,13 +94,6 @@ this.failureMechanism = failureMechanism; } - protected override void DoPostImportUpdates() - { - HeightStructuresHelper.UpdateCalculationToSectionResultAssignments(failureMechanism); - - base.DoPostImportUpdates(); - } - protected override HeightStructuresCalculationConfigurationReader CreateCalculationConfigurationReader(string xmlFilePath) { return new HeightStructuresCalculationConfigurationReader(xmlFilePath); Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/FileImporters/HeightStructureUpdateDataStrategy.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -re0dd088a47fdf5b7d7c0612cc586a5e24723133d --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/FileImporters/HeightStructureUpdateDataStrategy.cs (.../HeightStructureUpdateDataStrategy.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/FileImporters/HeightStructureUpdateDataStrategy.cs (.../HeightStructureUpdateDataStrategy.cs) (revision e0dd088a47fdf5b7d7c0612cc586a5e24723133d) @@ -29,7 +29,6 @@ using Riskeer.Common.IO.Structures; using Riskeer.HeightStructures.Data; using Riskeer.HeightStructures.Service; -using Riskeer.HeightStructures.Util; namespace Riskeer.HeightStructures.Plugin.FileImporters { @@ -75,8 +74,6 @@ affectedObjects.AddRange(GetAffectedCalculationsWithHeightStructure(structure) .Select(c => c.InputParameters)); - affectedObjects.AddRange(HeightStructuresHelper.UpdateCalculationToSectionResultAssignments(FailureMechanism)); - return affectedObjects; } Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs =================================================================== diff -u -r65e9bbe5a99736fdc6e6dae703186816f07fa910 -re0dd088a47fdf5b7d7c0612cc586a5e24723133d --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision 65e9bbe5a99736fdc6e6dae703186816f07fa910) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision e0dd088a47fdf5b7d7c0612cc586a5e24723133d) @@ -57,7 +57,6 @@ using Riskeer.HeightStructures.IO.Configurations; using Riskeer.HeightStructures.Plugin.FileImporters; using Riskeer.HeightStructures.Service; -using Riskeer.HeightStructures.Util; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; using RiskeerCommonDataResources = Riskeer.Common.Data.Properties.Resources; using RiskeerCommonIOResources = Riskeer.Common.IO.Properties.Resources; @@ -618,16 +617,14 @@ if (dialog.SelectedItems.Any()) { - GenerateHeightStructuresCalculations( - nodeData.FailureMechanism, - dialog.SelectedItems.Cast(), - nodeData.WrappedData.Children); + GenerateHeightStructuresCalculations(dialog.SelectedItems.Cast(), + nodeData.WrappedData.Children); nodeData.NotifyObservers(); } } } - private static void GenerateHeightStructuresCalculations(HeightStructuresFailureMechanism failureMechanism, IEnumerable structures, List calculations) + private static void GenerateHeightStructuresCalculations(IEnumerable structures, List calculations) { foreach (HeightStructure structure in structures) { @@ -641,8 +638,6 @@ }; calculations.Add(calculation); } - - HeightStructuresHelper.UpdateCalculationToSectionResultAssignments(failureMechanism); } private static void AddCalculation(HeightStructuresCalculationGroupContext context) @@ -661,8 +656,6 @@ parentGroupContext.WrappedData.Children.Remove(context.WrappedData); - HeightStructuresHelper.UpdateCalculationToSectionResultAssignments(context.FailureMechanism); - parentGroupContext.NotifyObservers(); } @@ -762,7 +755,6 @@ if (parentData is HeightStructuresCalculationGroupContext calculationGroupContext) { calculationGroupContext.WrappedData.Children.Remove(context.WrappedData); - HeightStructuresHelper.UpdateCalculationToSectionResultAssignments(context.FailureMechanism); calculationGroupContext.NotifyObservers(); } } Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Service/HeightStructuresDataSynchronizationService.cs =================================================================== diff -u -re7f074df2c06a1c0b7d628f75dd87f0552d11e08 -re0dd088a47fdf5b7d7c0612cc586a5e24723133d --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Service/HeightStructuresDataSynchronizationService.cs (.../HeightStructuresDataSynchronizationService.cs) (revision e7f074df2c06a1c0b7d628f75dd87f0552d11e08) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Service/HeightStructuresDataSynchronizationService.cs (.../HeightStructuresDataSynchronizationService.cs) (revision e0dd088a47fdf5b7d7c0612cc586a5e24723133d) @@ -29,7 +29,6 @@ using Riskeer.Common.Data.Structures; using Riskeer.Common.Service; using Riskeer.HeightStructures.Data; -using Riskeer.HeightStructures.Util; namespace Riskeer.HeightStructures.Service { @@ -39,8 +38,7 @@ public static class HeightStructuresDataSynchronizationService { /// - /// Removes the , unassigns it from the calculations in - /// and clears all dependent data, either directly or indirectly. + /// Removes the and clears all dependent data, either directly or indirectly. /// /// The structure to be removed. /// The @@ -67,8 +65,7 @@ .Where(c => ReferenceEquals(c.InputParameters.Structure, structure)) .ToArray(); - List changedObservables = ClearStructureDependentData(failureMechanism, - calculationWithRemovedStructure); + List changedObservables = ClearStructureDependentData(calculationWithRemovedStructure); StructureCollection structures = failureMechanism.HeightStructures; structures.Remove(structure); @@ -78,8 +75,7 @@ } /// - /// Clears all structures, unassigns them from the calculations in the - /// and clears all data that depends on it, either directly or indirectly. + /// Clears all structures and clears all data that depends on it, either directly or indirectly. /// /// The to /// clear the structures from. @@ -98,8 +94,7 @@ .Where(c => c.InputParameters.Structure != null) .ToArray(); - List changedObservables = ClearStructureDependentData(failureMechanism, - calculationWithRemovedStructure); + List changedObservables = ClearStructureDependentData(calculationWithRemovedStructure); StructureCollection structures = failureMechanism.HeightStructures; structures.Clear(); @@ -208,8 +203,7 @@ return Enumerable.Empty(); } - private static List ClearStructureDependentData(HeightStructuresFailureMechanism failureMechanism, - IEnumerable> calculationWithRemovedStructure) + private static List ClearStructureDependentData(IEnumerable> calculationWithRemovedStructure) { var changedObservables = new List(); foreach (StructuresCalculation calculation in calculationWithRemovedStructure) @@ -219,11 +213,6 @@ calculation.InputParameters.ClearStructure(); changedObservables.Add(calculation.InputParameters); } - - IEnumerable affectedSectionResults = - HeightStructuresHelper.UpdateCalculationToSectionResultAssignments(failureMechanism); - - changedObservables.AddRange(affectedSectionResults); return changedObservables; } } Fisheye: Tag e0dd088a47fdf5b7d7c0612cc586a5e24723133d refers to a dead (removed) revision in file `Riskeer/HeightStructures/src/Riskeer.HeightStructures.Util/HeightStructuresHelper.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/FileImporters/HeightStructureUpdateDataStrategyTest.cs =================================================================== diff -u -rd1c333df3a55ad8baba0d1cc0c4cff54c69668d7 -re0dd088a47fdf5b7d7c0612cc586a5e24723133d --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/FileImporters/HeightStructureUpdateDataStrategyTest.cs (.../HeightStructureUpdateDataStrategyTest.cs) (revision d1c333df3a55ad8baba0d1cc0c4cff54c69668d7) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/FileImporters/HeightStructureUpdateDataStrategyTest.cs (.../HeightStructureUpdateDataStrategyTest.cs) (revision e0dd088a47fdf5b7d7c0612cc586a5e24723133d) @@ -34,7 +34,6 @@ using Riskeer.HeightStructures.Data; using Riskeer.HeightStructures.Data.TestUtil; using Riskeer.HeightStructures.Plugin.FileImporters; -using Riskeer.HeightStructures.Util; namespace Riskeer.HeightStructures.Plugin.Test.FileImporters { @@ -609,7 +608,6 @@ }) }); - HeightStructuresHelper.UpdateCalculationToSectionResultAssignments(failureMechanism); HeightStructuresFailureMechanismSectionResult[] sectionResults = failureMechanism.SectionResults.ToArray(); var strategy = new HeightStructureUpdateDataStrategy(failureMechanism); @@ -682,7 +680,6 @@ }) }); - HeightStructuresHelper.UpdateCalculationToSectionResultAssignments(failureMechanism); HeightStructuresFailureMechanismSectionResult[] sectionResults = failureMechanism.SectionResults.ToArray(); var strategy = new HeightStructureUpdateDataStrategy(failureMechanism); Fisheye: Tag e0dd088a47fdf5b7d7c0612cc586a5e24723133d refers to a dead (removed) revision in file `Riskeer/HeightStructures/test/Riskeer.HeightStructures.Util.Test/HeightStructuresHelperTest.cs'. Fisheye: No comparison available. Pass `N' to diff?