Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FaultTreeIllustrationPointChildProperty.cs
===================================================================
diff -u -rb4d70f02478eef8064cdfb381f99fc2b14e69343 -rb2228e683427f65ddc438ce86a0ab53ca07ed3b5
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FaultTreeIllustrationPointChildProperty.cs (.../FaultTreeIllustrationPointChildProperty.cs) (revision b4d70f02478eef8064cdfb381f99fc2b14e69343)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FaultTreeIllustrationPointChildProperty.cs (.../FaultTreeIllustrationPointChildProperty.cs) (revision b2228e683427f65ddc438ce86a0ab53ca07ed3b5)
@@ -37,17 +37,18 @@
public class FaultTreeIllustrationPointChildProperty : IllustrationPointChildProperty
{
///
- /// Creates a new instance of .
+ /// Creates a new instance of .
///
- /// The data to use for the properties.
+ /// The data to use for the properties.
/// String containing the wind direction for this illustration point
- /// Thrown when any input parameter is null or when faultTreeData is of the wrong type.
+ /// Thrown when any input parameter is null or when illustrationPointNode is of the wrong type.
+ /// Thrown when the illustration point node is not of type
public FaultTreeIllustrationPointChildProperty(
- IllustrationPointNode faultTreeData, string windDirection) : base(faultTreeData, windDirection)
+ IllustrationPointNode illustrationPointNode, string windDirection) : base(illustrationPointNode, windDirection)
{
if (!(data.Data is FaultTreeIllustrationPoint))
{
- throw new ArgumentException("IllustrationPoint data type has to be FaultTreeIllustrationPoint");
+ throw new ArgumentException("illustrationPointNode data type has to be FaultTreeIllustrationPoint");
}
}
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/IllustrationPointChildProperty.cs
===================================================================
diff -u -reea09a6357b41d9773a802b22f921817fda018ef -rb2228e683427f65ddc438ce86a0ab53ca07ed3b5
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/IllustrationPointChildProperty.cs (.../IllustrationPointChildProperty.cs) (revision eea09a6357b41d9773a802b22f921817fda018ef)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/IllustrationPointChildProperty.cs (.../IllustrationPointChildProperty.cs) (revision b2228e683427f65ddc438ce86a0ab53ca07ed3b5)
@@ -39,23 +39,23 @@
public class IllustrationPointChildProperty : ObjectProperties
{
///
- /// Creates a new instance of .
+ /// Creates a new instance of .
///
- /// The data to use for the properties.
+ /// The data to use for the properties.
/// String containing the wind direction for this illustration point
/// Thrown when any input parameter is null.
public IllustrationPointChildProperty(
- IllustrationPointNode faultTreeData, string windDirection)
+ IllustrationPointNode illustrationPointNode, string windDirection)
{
- if (faultTreeData == null)
+ if (illustrationPointNode == null)
{
- throw new ArgumentNullException(nameof(faultTreeData));
+ throw new ArgumentNullException(nameof(illustrationPointNode));
}
if (windDirection == null)
{
throw new ArgumentNullException(nameof(windDirection));
}
- data = faultTreeData;
+ data = illustrationPointNode;
WindDirection = windDirection;
}
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresOutputProperties.cs
===================================================================
diff -u -reea09a6357b41d9773a802b22f921817fda018ef -rb2228e683427f65ddc438ce86a0ab53ca07ed3b5
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresOutputProperties.cs (.../StructuresOutputProperties.cs) (revision eea09a6357b41d9773a802b22f921817fda018ef)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/StructuresOutputProperties.cs (.../StructuresOutputProperties.cs) (revision b2228e683427f65ddc438ce86a0ab53ca07ed3b5)
@@ -20,6 +20,7 @@
// All rights reserved.
using System;
+using System.Collections.Generic;
using System.ComponentModel;
using System.Linq;
using Core.Common.Base.Data;
@@ -74,7 +75,7 @@
[ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_AlphaValues_Description))]
[TypeConverter(typeof(KeyValueExpandableArrayConverter))]
[KeyValueElement(nameof(Stochast.Name), nameof(Stochast.Alpha))]
- public Stochast[] AlphaValues
+ public IEnumerable AlphaValues
{
get
{
@@ -89,7 +90,7 @@
[ResourcesDescription(typeof(Resources), nameof(Resources.HydraulicBoundaryDatabase_Durations_Description))]
[TypeConverter(typeof(KeyValueExpandableArrayConverter))]
[KeyValueElement(nameof(Stochast.Name), nameof(Stochast.Duration))]
- public Stochast[] Durations
+ public IEnumerable Durations
{
get
{
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/SubMechanismIllustrationPointChildProperty.cs
===================================================================
diff -u -rb4d70f02478eef8064cdfb381f99fc2b14e69343 -rb2228e683427f65ddc438ce86a0ab53ca07ed3b5
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/SubMechanismIllustrationPointChildProperty.cs (.../SubMechanismIllustrationPointChildProperty.cs) (revision b4d70f02478eef8064cdfb381f99fc2b14e69343)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/SubMechanismIllustrationPointChildProperty.cs (.../SubMechanismIllustrationPointChildProperty.cs) (revision b2228e683427f65ddc438ce86a0ab53ca07ed3b5)
@@ -37,17 +37,18 @@
public class SubMechanismIllustrationPointChildProperty : IllustrationPointChildProperty
{
///
- /// Creates a new instance of .
+ /// Creates a new instance of .
///
- /// The data to use for the properties.
+ /// The data to use for the properties.
/// String containing the wind direction for this illustration point
/// Thrown when any input parameter is null.
+ /// Thrown when the illustration point node is not of type
public SubMechanismIllustrationPointChildProperty(
- IllustrationPointNode faultTreeData, string windDirection) : base(faultTreeData, windDirection)
+ IllustrationPointNode illustrationPointNode, string windDirection) : base(illustrationPointNode, windDirection)
{
if (!(data.Data is SubMechanismIllustrationPoint))
{
- throw new ArgumentException("IllustrationPoint data type has to be SubMechanismIllustrationPoint");
+ throw new ArgumentException("illustrationPointNode data type has to be SubMechanismIllustrationPoint");
}
}
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FaultTreeIllustrationPointChildPropertyTest.cs
===================================================================
diff -u -reea09a6357b41d9773a802b22f921817fda018ef -rb2228e683427f65ddc438ce86a0ab53ca07ed3b5
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FaultTreeIllustrationPointChildPropertyTest.cs (.../FaultTreeIllustrationPointChildPropertyTest.cs) (revision eea09a6357b41d9773a802b22f921817fda018ef)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/FaultTreeIllustrationPointChildPropertyTest.cs (.../FaultTreeIllustrationPointChildPropertyTest.cs) (revision b2228e683427f65ddc438ce86a0ab53ca07ed3b5)
@@ -36,7 +36,7 @@
public void Constructor_InvalidIllustrationPointType_ThrowsException()
{
// Setup
- const string expectedMessage = "IllustrationPoint data type has to be FaultTreeIllustrationPoint";
+ const string expectedMessage = "illustrationPointNode data type has to be FaultTreeIllustrationPoint";
// Call
TestDelegate test = () => new FaultTreeIllustrationPointChildProperty(new IllustrationPointNode(new TestSubMechanismIllustrationPoint()), "N");
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/SubMechanismIllustrationPointChildPropertyTest.cs
===================================================================
diff -u -r83c091ef77a14dc5b4116c628876f49243544aba -rb2228e683427f65ddc438ce86a0ab53ca07ed3b5
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/SubMechanismIllustrationPointChildPropertyTest.cs (.../SubMechanismIllustrationPointChildPropertyTest.cs) (revision 83c091ef77a14dc5b4116c628876f49243544aba)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/PropertyClasses/SubMechanismIllustrationPointChildPropertyTest.cs (.../SubMechanismIllustrationPointChildPropertyTest.cs) (revision b2228e683427f65ddc438ce86a0ab53ca07ed3b5)
@@ -35,7 +35,7 @@
public void Constructor_InvalidIllustrationPointType_ThrowsException()
{
// Setup
- const string expectedMessage = "IllustrationPoint data type has to be SubMechanismIllustrationPoint";
+ const string expectedMessage = "illustrationPointNode data type has to be SubMechanismIllustrationPoint";
// Call
TestDelegate test = () => new SubMechanismIllustrationPointChildProperty(new IllustrationPointNode(