Fisheye: Tag e50b6ad32d33acb630c391bce2a6d359cc7e2b28 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/CalculationConfigurationGroup.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/CalculationGroupConfiguration.cs =================================================================== diff -u --- Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/CalculationGroupConfiguration.cs (revision 0) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Configurations/CalculationGroupConfiguration.cs (revision e50b6ad32d33acb630c391bce2a6d359cc7e2b28) @@ -0,0 +1,50 @@ +// Copyright (C) Stichting Deltares 2016. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System.Collections.Generic; +using Ringtoets.Common.IO.Readers; + +namespace Ringtoets.Common.IO.Configurations +{ + /// + /// Class that represents a calculation group that is read via . + /// + public class CalculationGroupConfiguration : IConfigurationItem + { + /// + /// Creates a new instance of . + /// + /// The name of the calculation group. + /// The collection of nested . + public CalculationGroupConfiguration(string name, IEnumerable items) + { + Name = name; + Items = items; + } + + /// + /// Gets the collection of nested . + /// + public IEnumerable Items { get; private set; } + + public string Name { get; } + } +} \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.IO/Exporters/SchemaCalculationConfigurationExporter.cs =================================================================== diff -u -rcc1268d7cb906524d4cabcd4cbd9ae16676cf059 -re50b6ad32d33acb630c391bce2a6d359cc7e2b28 --- Ringtoets/Common/src/Ringtoets.Common.IO/Exporters/SchemaCalculationConfigurationExporter.cs (.../SchemaCalculationConfigurationExporter.cs) (revision cc1268d7cb906524d4cabcd4cbd9ae16676cf059) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Exporters/SchemaCalculationConfigurationExporter.cs (.../SchemaCalculationConfigurationExporter.cs) (revision e50b6ad32d33acb630c391bce2a6d359cc7e2b28) @@ -112,9 +112,9 @@ } } - private CalculationConfigurationGroup ToConfiguration(CalculationGroup group) + private CalculationGroupConfiguration ToConfiguration(CalculationGroup group) { - return new CalculationConfigurationGroup(group.Name, ToConfiguration(group.Children)); + return new CalculationGroupConfiguration(group.Name, ToConfiguration(group.Children)); } } } \ No newline at end of file Index: Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/CalculationConfigurationImporter.cs =================================================================== diff -u -rcc1268d7cb906524d4cabcd4cbd9ae16676cf059 -re50b6ad32d33acb630c391bce2a6d359cc7e2b28 --- Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/CalculationConfigurationImporter.cs (.../CalculationConfigurationImporter.cs) (revision cc1268d7cb906524d4cabcd4cbd9ae16676cf059) +++ Ringtoets/Common/src/Ringtoets.Common.IO/FileImporters/CalculationConfigurationImporter.cs (.../CalculationConfigurationImporter.cs) (revision e50b6ad32d33acb630c391bce2a6d359cc7e2b28) @@ -154,7 +154,7 @@ /// Thrown when the item to parse is not valid. private ICalculationBase ParseReadConfigurationItem(IConfigurationItem readConfigurationItem) { - var readCalculationGroup = readConfigurationItem as CalculationConfigurationGroup; + var readCalculationGroup = readConfigurationItem as CalculationGroupConfiguration; if (readCalculationGroup != null) { return ParseReadCalculationGroup(readCalculationGroup); @@ -176,7 +176,7 @@ /// A parsed calculation group. /// Thrown when the one of the children /// to parse is not valid. - private CalculationGroup ParseReadCalculationGroup(CalculationConfigurationGroup readCalculationGroup) + private CalculationGroup ParseReadCalculationGroup(CalculationGroupConfiguration readCalculationGroup) { var calculationGroup = new CalculationGroup(readCalculationGroup.Name, true); Index: Ringtoets/Common/src/Ringtoets.Common.IO/Readers/CalculationConfigurationReader.cs =================================================================== diff -u -rcc1268d7cb906524d4cabcd4cbd9ae16676cf059 -re50b6ad32d33acb630c391bce2a6d359cc7e2b28 --- Ringtoets/Common/src/Ringtoets.Common.IO/Readers/CalculationConfigurationReader.cs (.../CalculationConfigurationReader.cs) (revision cc1268d7cb906524d4cabcd4cbd9ae16676cf059) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Readers/CalculationConfigurationReader.cs (.../CalculationConfigurationReader.cs) (revision e50b6ad32d33acb630c391bce2a6d359cc7e2b28) @@ -228,9 +228,9 @@ } } - private CalculationConfigurationGroup ParseFolderElement(XElement folderElement) + private CalculationGroupConfiguration ParseFolderElement(XElement folderElement) { - return new CalculationConfigurationGroup(folderElement.Attribute(ConfigurationSchemaIdentifiers.NameAttribute)?.Value, + return new CalculationGroupConfiguration(folderElement.Attribute(ConfigurationSchemaIdentifiers.NameAttribute)?.Value, ParseElements(folderElement.Elements())); } } Index: Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj =================================================================== diff -u -rd393a6e22ba176f0ce9731629a37ce3272b1f433 -re50b6ad32d33acb630c391bce2a6d359cc7e2b28 --- Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj (.../Ringtoets.Common.IO.csproj) (revision d393a6e22ba176f0ce9731629a37ce3272b1f433) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Ringtoets.Common.IO.csproj (.../Ringtoets.Common.IO.csproj) (revision e50b6ad32d33acb630c391bce2a6d359cc7e2b28) @@ -90,7 +90,7 @@ - + Index: Ringtoets/Common/src/Ringtoets.Common.IO/Writers/SchemaCalculationConfigurationWriter.cs =================================================================== diff -u -rcc1268d7cb906524d4cabcd4cbd9ae16676cf059 -re50b6ad32d33acb630c391bce2a6d359cc7e2b28 --- Ringtoets/Common/src/Ringtoets.Common.IO/Writers/SchemaCalculationConfigurationWriter.cs (.../SchemaCalculationConfigurationWriter.cs) (revision cc1268d7cb906524d4cabcd4cbd9ae16676cf059) +++ Ringtoets/Common/src/Ringtoets.Common.IO/Writers/SchemaCalculationConfigurationWriter.cs (.../SchemaCalculationConfigurationWriter.cs) (revision e50b6ad32d33acb630c391bce2a6d359cc7e2b28) @@ -109,12 +109,12 @@ /// The calculation group(s) and/or calculation(s) to write. /// The writer to use for writing. /// Thrown when - /// contains a value that is neither nor . + /// contains a value that is neither nor . private void WriteConfiguration(IEnumerable configuration, XmlWriter writer) { foreach (IConfigurationItem child in configuration) { - var innerGroup = child as CalculationConfigurationGroup; + var innerGroup = child as CalculationGroupConfiguration; if (innerGroup != null) { WriteCalculationGroup(innerGroup, writer); @@ -133,7 +133,7 @@ } } - private void WriteCalculationGroup(CalculationConfigurationGroup group, XmlWriter writer) + private void WriteCalculationGroup(CalculationGroupConfiguration group, XmlWriter writer) { writer.WriteStartElement(ConfigurationSchemaIdentifiers.FolderElement); writer.WriteAttributeString(ConfigurationSchemaIdentifiers.NameAttribute, group.Name); Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Readers/CalculationConfigurationReaderTest.cs =================================================================== diff -u -rcc1268d7cb906524d4cabcd4cbd9ae16676cf059 -re50b6ad32d33acb630c391bce2a6d359cc7e2b28 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Readers/CalculationConfigurationReaderTest.cs (.../CalculationConfigurationReaderTest.cs) (revision cc1268d7cb906524d4cabcd4cbd9ae16676cf059) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Readers/CalculationConfigurationReaderTest.cs (.../CalculationConfigurationReaderTest.cs) (revision e50b6ad32d33acb630c391bce2a6d359cc7e2b28) @@ -271,7 +271,7 @@ // Assert Assert.AreEqual(1, readConfigurationItems.Count); - var group = readConfigurationItems[0] as CalculationConfigurationGroup; + var group = readConfigurationItems[0] as CalculationGroupConfiguration; Assert.IsNotNull(group); Assert.AreEqual("Calculation group", group.Name); CollectionAssert.IsEmpty(group.Items); @@ -290,23 +290,23 @@ // Assert Assert.AreEqual(5, readConfigurationItems.Count); - var group1 = readConfigurationItems[0] as CalculationConfigurationGroup; + var group1 = readConfigurationItems[0] as CalculationGroupConfiguration; Assert.IsNotNull(group1); Assert.AreEqual("Group 1", group1.Name); var calculation1 = readConfigurationItems[1] as ReadCalculation; Assert.IsNotNull(calculation1); Assert.AreEqual("Calculation 1", calculation1.Name); - var group2 = readConfigurationItems[2] as CalculationConfigurationGroup; + var group2 = readConfigurationItems[2] as CalculationGroupConfiguration; Assert.IsNotNull(group2); Assert.AreEqual("Group 2", group2.Name); var calculation2 = readConfigurationItems[3] as ReadCalculation; Assert.IsNotNull(calculation2); Assert.AreEqual("Calculation 2", calculation2.Name); - var group3 = readConfigurationItems[4] as CalculationConfigurationGroup; + var group3 = readConfigurationItems[4] as CalculationGroupConfiguration; Assert.IsNotNull(group3); Assert.AreEqual("Group 3", group3.Name); @@ -320,7 +320,7 @@ List group2Items = group2.Items.ToList(); Assert.AreEqual(2, group2Items.Count); - var group4 = group2Items[0] as CalculationConfigurationGroup; + var group4 = group2Items[0] as CalculationGroupConfiguration; Assert.IsNotNull(group4); Assert.AreEqual("Group 4", group4.Name); Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Readers/ReadCalculationGroupTest.cs =================================================================== diff -u -rcc1268d7cb906524d4cabcd4cbd9ae16676cf059 -re50b6ad32d33acb630c391bce2a6d359cc7e2b28 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Readers/ReadCalculationGroupTest.cs (.../ReadCalculationGroupTest.cs) (revision cc1268d7cb906524d4cabcd4cbd9ae16676cf059) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Readers/ReadCalculationGroupTest.cs (.../ReadCalculationGroupTest.cs) (revision e50b6ad32d33acb630c391bce2a6d359cc7e2b28) @@ -37,11 +37,11 @@ var nestedItems = new List { new TestReadConfigurationItem(), - new CalculationConfigurationGroup("Nested calculation group", Enumerable.Empty()) + new CalculationGroupConfiguration("Nested calculation group", Enumerable.Empty()) }; // Call - var readCalculationGroup = new CalculationConfigurationGroup("Calculation group", nestedItems); + var readCalculationGroup = new CalculationGroupConfiguration("Calculation group", nestedItems); // Assert Assert.IsInstanceOf(readCalculationGroup); Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Writers/SchemaCalculationConfigurationWriterTest.cs =================================================================== diff -u -rcc1268d7cb906524d4cabcd4cbd9ae16676cf059 -re50b6ad32d33acb630c391bce2a6d359cc7e2b28 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Writers/SchemaCalculationConfigurationWriterTest.cs (.../SchemaCalculationConfigurationWriterTest.cs) (revision cc1268d7cb906524d4cabcd4cbd9ae16676cf059) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Writers/SchemaCalculationConfigurationWriterTest.cs (.../SchemaCalculationConfigurationWriterTest.cs) (revision e50b6ad32d33acb630c391bce2a6d359cc7e2b28) @@ -81,8 +81,8 @@ Name = "calculation2" }; - var calculationGroup1 = new CalculationConfigurationGroup("group1", Enumerable.Empty()); - var calculationGroup2 = new CalculationConfigurationGroup("group2", new IConfigurationItem[] + var calculationGroup1 = new CalculationGroupConfiguration("group1", Enumerable.Empty()); + var calculationGroup2 = new CalculationGroupConfiguration("group2", new IConfigurationItem[] { calculation2, calculationGroup1 Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/HeightStructuresCalculationConfigurationWriterTest.cs =================================================================== diff -u -rd393a6e22ba176f0ce9731629a37ce3272b1f433 -re50b6ad32d33acb630c391bce2a6d359cc7e2b28 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/HeightStructuresCalculationConfigurationWriterTest.cs (.../HeightStructuresCalculationConfigurationWriterTest.cs) (revision d393a6e22ba176f0ce9731629a37ce3272b1f433) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.IO.Test/HeightStructuresCalculationConfigurationWriterTest.cs (.../HeightStructuresCalculationConfigurationWriterTest.cs) (revision e50b6ad32d33acb630c391bce2a6d359cc7e2b28) @@ -57,10 +57,10 @@ .SetName("Calculation configuration with none of its parameters set"); yield return new TestCaseData("folderWithSubfolderAndCalculation", new IConfigurationItem[] { - new CalculationConfigurationGroup("Testmap", new IConfigurationItem[] + new CalculationGroupConfiguration("Testmap", new IConfigurationItem[] { CreateFullCalculation(), - new CalculationConfigurationGroup("Nested", new IConfigurationItem[] + new CalculationGroupConfiguration("Nested", new IConfigurationItem[] { new HeightStructuresCalculationConfiguration("Berekening 2") })