Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PresentationObjects/ClosingStructuresFailureMechanismSectionsContext.cs =================================================================== diff -u -r767fd4c880443be2882b7510b290bd690c938fdc -r8b8b8024a091ac35ac8b4e0be7a6ea702a698c27 --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PresentationObjects/ClosingStructuresFailureMechanismSectionsContext.cs (.../ClosingStructuresFailureMechanismSectionsContext.cs) (revision 767fd4c880443be2882b7510b290bd690c938fdc) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PresentationObjects/ClosingStructuresFailureMechanismSectionsContext.cs (.../ClosingStructuresFailureMechanismSectionsContext.cs) (revision 8b8b8024a091ac35ac8b4e0be7a6ea702a698c27) @@ -20,14 +20,15 @@ // All rights reserved. using System; +using Data; using Riskeer.ClosingStructures.Data; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Forms.PresentationObjects; namespace Riskeer.ClosingStructures.Forms.PresentationObjects { /// - /// This class is a presentation object for . + /// This class is a presentation object for . /// public class ClosingStructuresFailureMechanismSectionsContext : FailureMechanismSectionsContext { Index: Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismBase.cs =================================================================== diff -u -r348d0d5efb2ef940bb8e6cca570296cd19ec3809 -r8b8b8024a091ac35ac8b4e0be7a6ea702a698c27 --- Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismBase.cs (.../FailureMechanismBase.cs) (revision 348d0d5efb2ef940bb8e6cca570296cd19ec3809) +++ Riskeer/Common/src/Riskeer.Common.Data/FailureMechanism/FailureMechanismBase.cs (.../FailureMechanismBase.cs) (revision 8b8b8024a091ac35ac8b4e0be7a6ea702a698c27) @@ -37,7 +37,6 @@ public abstract class FailureMechanismBase : Observable, IFailureMechanism { private static readonly Range contributionValidityRange = new Range(0, 100); - private readonly FailureMechanismSectionCollection sectionCollection; private double contribution; /// @@ -59,7 +58,6 @@ Name = name; Code = failureMechanismCode; Group = group; - sectionCollection = new FailureMechanismSectionCollection(); IsRelevant = true; InputComments = new Comment(); NotRelevantComments = new Comment(); @@ -92,43 +90,12 @@ public abstract IEnumerable Calculations { get; } - public IEnumerable Sections - { - get - { - return sectionCollection; - } - } - - public string FailureMechanismSectionSourcePath - { - get - { - return sectionCollection.SourcePath; - } - } - public Comment InputComments { get; } public Comment NotRelevantComments { get; } public bool IsRelevant { get; set; } - public void SetSections(IEnumerable sections, string sourcePath) - { - if (sections == null) - { - throw new ArgumentNullException(nameof(sections)); - } - - if (sourcePath == null) - { - throw new ArgumentNullException(nameof(sourcePath)); - } - - sectionCollection.SetSections(sections, sourcePath); - } - private static void ValidateParameters(string failureMechanismName, string failureMechanismCode) { const string parameterIsRequired = "Parameter is required."; Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PresentationObjects/DuneErosionFailureMechanismSectionsContext.cs =================================================================== diff -u -re3c8135a137a664bc323012ca829d606ebee6bff -r8b8b8024a091ac35ac8b4e0be7a6ea702a698c27 --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PresentationObjects/DuneErosionFailureMechanismSectionsContext.cs (.../DuneErosionFailureMechanismSectionsContext.cs) (revision e3c8135a137a664bc323012ca829d606ebee6bff) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PresentationObjects/DuneErosionFailureMechanismSectionsContext.cs (.../DuneErosionFailureMechanismSectionsContext.cs) (revision 8b8b8024a091ac35ac8b4e0be7a6ea702a698c27) @@ -20,14 +20,15 @@ // All rights reserved. using System; +using Data; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.DuneErosion.Data; namespace Riskeer.DuneErosion.Forms.PresentationObjects { /// - /// This class is a presentation object for . + /// This class is a presentation object for . /// public class DuneErosionFailureMechanismSectionsContext : FailureMechanismSectionsContext { Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsFailureMechanismSectionsContext.cs =================================================================== diff -u -ra4e3b2745a48598260107bb5bfca7485205cdcc2 -r8b8b8024a091ac35ac8b4e0be7a6ea702a698c27 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsFailureMechanismSectionsContext.cs (.../GrassCoverErosionInwardsFailureMechanismSectionsContext.cs) (revision a4e3b2745a48598260107bb5bfca7485205cdcc2) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PresentationObjects/GrassCoverErosionInwardsFailureMechanismSectionsContext.cs (.../GrassCoverErosionInwardsFailureMechanismSectionsContext.cs) (revision 8b8b8024a091ac35ac8b4e0be7a6ea702a698c27) @@ -20,14 +20,15 @@ // All rights reserved. using System; +using Data; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.GrassCoverErosionInwards.Data; namespace Riskeer.GrassCoverErosionInwards.Forms.PresentationObjects { /// - /// This class is a presentation object for . + /// This class is a presentation object for . /// public class GrassCoverErosionInwardsFailureMechanismSectionsContext : FailureMechanismSectionsContext { Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsFailureMechanismSectionsContext.cs =================================================================== diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -r8b8b8024a091ac35ac8b4e0be7a6ea702a698c27 --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsFailureMechanismSectionsContext.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionsContext.cs) (revision 87bd836d55d336e37e3d80f9a1521feb83ddc475) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Forms/PresentationObjects/GrassCoverErosionOutwardsFailureMechanismSectionsContext.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionsContext.cs) (revision 8b8b8024a091ac35ac8b4e0be7a6ea702a698c27) @@ -20,14 +20,15 @@ // All rights reserved. using System; +using Data; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.GrassCoverErosionOutwards.Data; namespace Riskeer.GrassCoverErosionOutwards.Forms.PresentationObjects { /// - /// This class is a presentation object for . + /// This class is a presentation object for . /// public class GrassCoverErosionOutwardsFailureMechanismSectionsContext : FailureMechanismSectionsContext { Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/PresentationObjects/HeightStructuresFailureMechanismSectionsContext.cs =================================================================== diff -u -r35349144a21f4e3627505605840f286b21b2d004 -r8b8b8024a091ac35ac8b4e0be7a6ea702a698c27 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/PresentationObjects/HeightStructuresFailureMechanismSectionsContext.cs (.../HeightStructuresFailureMechanismSectionsContext.cs) (revision 35349144a21f4e3627505605840f286b21b2d004) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/PresentationObjects/HeightStructuresFailureMechanismSectionsContext.cs (.../HeightStructuresFailureMechanismSectionsContext.cs) (revision 8b8b8024a091ac35ac8b4e0be7a6ea702a698c27) @@ -20,14 +20,15 @@ // All rights reserved. using System; +using Data; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.HeightStructures.Data; namespace Riskeer.HeightStructures.Forms.PresentationObjects { /// - /// This class is a presentation object for . + /// This class is a presentation object for . /// public class HeightStructuresFailureMechanismSectionsContext : FailureMechanismSectionsContext { Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs =================================================================== diff -u -r1aae96d4b4b4a26f69437dc376b78656a92f2592 -r8b8b8024a091ac35ac8b4e0be7a6ea702a698c27 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs (.../MacroStabilityInwardsFailureMechanism.cs) (revision 1aae96d4b4b4a26f69437dc376b78656a92f2592) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanism.cs (.../MacroStabilityInwardsFailureMechanism.cs) (revision 8b8b8024a091ac35ac8b4e0be7a6ea702a698c27) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using System.Collections.Generic; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; @@ -34,6 +35,8 @@ public class MacroStabilityInwardsFailureMechanism : FailureMechanismBase, ICalculatableFailureMechanism { + private FailureMechanismSectionCollection sectionCollection; + /// /// Initializes a new instance of the class. /// @@ -48,6 +51,7 @@ { Name = RiskeerCommonDataResources.FailureMechanism_Calculations_DisplayName }; + sectionCollection = new FailureMechanismSectionCollection(); } /// @@ -80,5 +84,36 @@ return CalculationsGroup.GetCalculations(); } } + + public IEnumerable Sections + { + get + { + return sectionCollection; + } + } + + public string FailureMechanismSectionSourcePath + { + get + { + return sectionCollection.SourcePath; + } + } + + public void SetSections(IEnumerable sections, string sourcePath) + { + if (sections == null) + { + throw new ArgumentNullException(nameof(sections)); + } + + if (sourcePath == null) + { + throw new ArgumentNullException(nameof(sourcePath)); + } + + sectionCollection.SetSections(sections, sourcePath); + } } } \ No newline at end of file Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsFailureMechanismSectionsContext.cs =================================================================== diff -u -r80c53924c7488a48f8148ba8b73260446a262883 -r8b8b8024a091ac35ac8b4e0be7a6ea702a698c27 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsFailureMechanismSectionsContext.cs (.../MacroStabilityInwardsFailureMechanismSectionsContext.cs) (revision 80c53924c7488a48f8148ba8b73260446a262883) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsFailureMechanismSectionsContext.cs (.../MacroStabilityInwardsFailureMechanismSectionsContext.cs) (revision 8b8b8024a091ac35ac8b4e0be7a6ea702a698c27) @@ -27,7 +27,7 @@ namespace Riskeer.MacroStabilityInwards.Forms.PresentationObjects { /// - /// This class is a presentation object for . + /// This class is a presentation object for . /// public class MacroStabilityInwardsFailureMechanismSectionsContext : FailureMechanismSectionsContext { Index: Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanism.cs =================================================================== diff -u -r1aae96d4b4b4a26f69437dc376b78656a92f2592 -r8b8b8024a091ac35ac8b4e0be7a6ea702a698c27 --- Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision 1aae96d4b4b4a26f69437dc376b78656a92f2592) +++ Riskeer/Piping/src/Riskeer.Piping.Data/PipingFailureMechanism.cs (.../PipingFailureMechanism.cs) (revision 8b8b8024a091ac35ac8b4e0be7a6ea702a698c27) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using System.Collections.Generic; using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.FailureMechanism; @@ -33,6 +34,8 @@ /// public class PipingFailureMechanism : FailureMechanismBase, ICalculatableFailureMechanism { + private FailureMechanismSectionCollection sectionCollection; + /// /// Initializes a new instance of the class. /// @@ -47,6 +50,7 @@ { Name = RiskeerCommonDataResources.FailureMechanism_Calculations_DisplayName }; + sectionCollection = new FailureMechanismSectionCollection(); } /// @@ -79,5 +83,36 @@ return CalculationsGroup.GetCalculations(); } } + + public IEnumerable Sections + { + get + { + return sectionCollection; + } + } + + public string FailureMechanismSectionSourcePath + { + get + { + return sectionCollection.SourcePath; + } + } + + public void SetSections(IEnumerable sections, string sourcePath) + { + if (sections == null) + { + throw new ArgumentNullException(nameof(sections)); + } + + if (sourcePath == null) + { + throw new ArgumentNullException(nameof(sourcePath)); + } + + sectionCollection.SetSections(sections, sourcePath); + } } } \ No newline at end of file Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresFailureMechanismSectionsContext.cs =================================================================== diff -u -r68ec97043e735b40f5f6fa555ad53ef7cc43527d -r8b8b8024a091ac35ac8b4e0be7a6ea702a698c27 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresFailureMechanismSectionsContext.cs (.../StabilityPointStructuresFailureMechanismSectionsContext.cs) (revision 68ec97043e735b40f5f6fa555ad53ef7cc43527d) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PresentationObjects/StabilityPointStructuresFailureMechanismSectionsContext.cs (.../StabilityPointStructuresFailureMechanismSectionsContext.cs) (revision 8b8b8024a091ac35ac8b4e0be7a6ea702a698c27) @@ -27,7 +27,7 @@ namespace Riskeer.StabilityPointStructures.Forms.PresentationObjects { /// - /// This class is a presentation object for . + /// This class is a presentation object for . /// public class StabilityPointStructuresFailureMechanismSectionsContext : FailureMechanismSectionsContext { Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverFailureMechanismSectionsContext.cs =================================================================== diff -u -r2ef21b0f4d85a5c9689720d539254a1d5c907be7 -r8b8b8024a091ac35ac8b4e0be7a6ea702a698c27 --- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverFailureMechanismSectionsContext.cs (.../StabilityStoneCoverFailureMechanismSectionsContext.cs) (revision 2ef21b0f4d85a5c9689720d539254a1d5c907be7) +++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/PresentationObjects/StabilityStoneCoverFailureMechanismSectionsContext.cs (.../StabilityStoneCoverFailureMechanismSectionsContext.cs) (revision 8b8b8024a091ac35ac8b4e0be7a6ea702a698c27) @@ -20,14 +20,15 @@ // All rights reserved. using System; +using Data; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.StabilityStoneCover.Data; namespace Riskeer.StabilityStoneCover.Forms.PresentationObjects { /// - /// This class is a presentation object for . + /// This class is a presentation object for . /// public class StabilityStoneCoverFailureMechanismSectionsContext : FailureMechanismSectionsContext { Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverFailureMechanismSectionsContext.cs =================================================================== diff -u -r4f4daebe59ab925c98cef039101ec70544530bbe -r8b8b8024a091ac35ac8b4e0be7a6ea702a698c27 --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverFailureMechanismSectionsContext.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionsContext.cs) (revision 4f4daebe59ab925c98cef039101ec70544530bbe) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PresentationObjects/WaveImpactAsphaltCoverFailureMechanismSectionsContext.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionsContext.cs) (revision 8b8b8024a091ac35ac8b4e0be7a6ea702a698c27) @@ -20,14 +20,15 @@ // All rights reserved. using System; +using Data; using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.WaveImpactAsphaltCover.Data; namespace Riskeer.WaveImpactAsphaltCover.Forms.PresentationObjects { /// - /// This class is a presentation object for . + /// This class is a presentation object for . /// public class WaveImpactAsphaltCoverFailureMechanismSectionsContext : FailureMechanismSectionsContext {