Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/ClosingStructuresImporter.cs =================================================================== diff -u -rad75a347a7586757599297f2b2e776100d827264 -r2f6400116d57c2b49f7089dbc9c8cd935c185a36 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/ClosingStructuresImporter.cs (.../ClosingStructuresImporter.cs) (revision ad75a347a7586757599297f2b2e776100d827264) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.IO/ClosingStructuresImporter.cs (.../ClosingStructuresImporter.cs) (revision 2f6400116d57c2b49f7089dbc9c8cd935c185a36) @@ -37,8 +37,6 @@ /// public class ClosingStructuresImporter : StructuresImporter> { - private readonly ObservableList importTarget; - /// /// Creates a new instance of . /// @@ -49,10 +47,7 @@ /// Thrown when , /// or is null. public ClosingStructuresImporter(ObservableList importTarget, ReferenceLine referenceLine, string filePath) - : base(importTarget, referenceLine, filePath) - { - this.importTarget = importTarget; - } + : base(importTarget, referenceLine, filePath) {} protected override void CreateSpecificStructures(ICollection structureLocations, Dictionary> groupedStructureParameterRows) @@ -61,10 +56,16 @@ foreach (ClosingStructure closingStructure in importedClosingStructures) { - importTarget.Add(closingStructure); + ImportTarget.Add(closingStructure); } } + protected override void HandleUserCancellingImport() + { + log.Info(RingtoetsCommonIOResources.StructuresImporter_User_cancelled); + base.HandleUserCancellingImport(); + } + private IEnumerable CreateClosingStructures(IList structureLocations, Dictionary> groupedStructureParameterRows) { @@ -77,8 +78,8 @@ if (!groupedStructureParameterRows.ContainsKey(id)) { - log.WarnFormat(RingtoetsCommonIOResources.StructuresImporter_CreateSpecificStructures_no_structuresdata_for_location_0_, id); - log.ErrorFormat("Kunstwerk nummer {0} wordt overgeslagen.", i + 1); + log.WarnFormat(RingtoetsCommonIOResources.StructuresImporter_CreateSpecificStructures_no_structuresdata_for_Location_0_, id); + log.ErrorFormat(RingtoetsCommonIOResources.StructuresImporter_Structure_number_0_is_skipped, i + 1); continue; } @@ -91,6 +92,8 @@ continue; } + ConvertVarianceToStandardDeviation(structureParameterRows); + ClosingStructure closingStructure = CreateClosingStructure(structureLocation, structureParameterRows); closingStructures.Add(closingStructure); }