Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs =================================================================== diff -u -r8f228044569bcff77f25f658a7e5277e78b6b6a8 -r309837df48178bbae93c412badfda6c0de5da6a4 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs (.../PipingConfigurationImporter.cs) (revision 8f228044569bcff77f25f658a7e5277e78b6b6a8) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs (.../PipingConfigurationImporter.cs) (revision 309837df48178bbae93c412badfda6c0de5da6a4) @@ -35,15 +35,14 @@ using Ringtoets.Piping.IO.Readers; using Ringtoets.Piping.IO.Schema; using Ringtoets.Piping.Primitives; -using RingtoetsCommonIOResources = Ringtoets.Common.IO.Properties.Resources; namespace Ringtoets.Piping.IO.Importers { /// /// Imports a piping configuration from an XML file and stores it on a /// . /// - public class PipingConfigurationImporter : CalculationConfigurationImporter + public class PipingConfigurationImporter : CalculationConfigurationImporter { private static readonly ILog log = LogManager.GetLogger(typeof(PipingConfigurationImporter)); @@ -79,46 +78,13 @@ this.failureMechanism = failureMechanism; } - protected override ICalculationBase ProcessReadItem(IReadConfigurationItem readItem) - { - var readCalculationGroup = readItem as ReadCalculationGroup; - if (readCalculationGroup != null) - { - return ProcessCalculationGroup(readCalculationGroup); - } - - var readCalculation = readItem as ReadPipingCalculation; - if (readCalculation != null) - { - return ProcessCalculation(readCalculation); - } - - return null; - } - protected override ICollection ReadConfigurationItems(string filePath) { return new PipingConfigurationReader(FilePath).Read().ToList(); } - private CalculationGroup ProcessCalculationGroup(ReadCalculationGroup readCalculationGroup) + protected override ICalculationBase ProcessCalculation(ReadPipingCalculation readCalculation) { - var group = new CalculationGroup(readCalculationGroup.Name, true); - - foreach (IReadConfigurationItem item in readCalculationGroup.Items) - { - ICalculationBase processedItem = ProcessReadItem(item); - if (processedItem != null) - { - group.Children.Add(processedItem); - } - } - - return group; - } - - private PipingCalculationScenario ProcessCalculation(ReadPipingCalculation readCalculation) - { var pipingCalculation = new PipingCalculationScenario(new GeneralPipingInput()) { Name = readCalculation.Name