Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FaultTreeIllustrationPointProperties.cs
===================================================================
diff -u -ra49798da6ac2176d2e8b28ec6fec8a2494d8ee91 -r3e5d6f7c7f61eb17c81d1f80d2e55fda103f766d
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FaultTreeIllustrationPointProperties.cs (.../FaultTreeIllustrationPointProperties.cs) (revision a49798da6ac2176d2e8b28ec6fec8a2494d8ee91)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/FaultTreeIllustrationPointProperties.cs (.../FaultTreeIllustrationPointProperties.cs) (revision 3e5d6f7c7f61eb17c81d1f80d2e55fda103f766d)
@@ -45,9 +45,8 @@
///
/// The fault tree illustration point to use for the properties.
/// The child nodes that belongs to the .
- /// String containing the wind direction for this illustration point.
- /// String containing the name of the closing situation. If empty
- /// the property will not be visible.
+ /// The wind direction of the illustration point.
+ /// The closing situation of the illustration point.
/// Thrown when any input parameter is null.
public FaultTreeIllustrationPointProperties(FaultTreeIllustrationPoint illustrationPoint, IEnumerable childNodes,
string windDirection, string closingSituation)
@@ -62,7 +61,7 @@
this.childNodes = childNodes;
}
- [PropertyOrder(4)]
+ [PropertyOrder(5)]
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_AlphaValues_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_AlphaValues_Description))]
@@ -76,7 +75,7 @@
}
}
- [PropertyOrder(5)]
+ [PropertyOrder(6)]
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_Durations_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_Durations_Description))]
@@ -91,7 +90,7 @@
}
[DynamicVisible]
- [PropertyOrder(6)]
+ [PropertyOrder(7)]
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPointProperty_IllustrationPoints_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPointProperty_IllustrationPoints_Description))]
@@ -121,7 +120,6 @@
continue;
}
- // If type is not supported, throw exception (currently not possible, safeguard for future)
throw new NotSupportedException($"IllustrationPointNode of type {illustrationPointNode.Data.GetType().Name} is not supported. " +
$"Supported types: {nameof(FaultTreeIllustrationPoint)} and {nameof(SubMechanismIllustrationPoint)}");
}
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/IllustrationPointProperties.cs
===================================================================
diff -u -ra49798da6ac2176d2e8b28ec6fec8a2494d8ee91 -r3e5d6f7c7f61eb17c81d1f80d2e55fda103f766d
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/IllustrationPointProperties.cs (.../IllustrationPointProperties.cs) (revision a49798da6ac2176d2e8b28ec6fec8a2494d8ee91)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/IllustrationPointProperties.cs (.../IllustrationPointProperties.cs) (revision 3e5d6f7c7f61eb17c81d1f80d2e55fda103f766d)
@@ -42,9 +42,8 @@
/// Creates a new instance of .
///
/// The data to use for the properties.
- /// String containing the wind direction for this illustration point.
- /// String containing the name of the closing situation. If empty
- /// the property will not be visible.
+ /// The wind direction of the illustration point.
+ /// The closing situation of the illustration point.
/// Thrown when any input parameter is null.
public IllustrationPointProperties(IllustrationPointBase illustrationPoint,
string windDirection, string closingSituation)
@@ -66,7 +65,7 @@
ClosingSituation = closingSituation;
}
- [PropertyOrder(0)]
+ [PropertyOrder(1)]
[TypeConverter(typeof(NoProbabilityValueDoubleConverter))]
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.CalculationOutput_CalculatedProbability_DisplayName))]
@@ -79,7 +78,7 @@
}
}
- [PropertyOrder(1)]
+ [PropertyOrder(2)]
[TypeConverter(typeof(NoValueRoundedDoubleConverter))]
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.CalculationOutput_CalculatedReliability_DisplayName))]
@@ -92,14 +91,14 @@
}
}
- [PropertyOrder(2)]
+ [PropertyOrder(3)]
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_WindDirection_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_WindDirection_Description))]
public string WindDirection { get; }
[DynamicVisible]
- [PropertyOrder(3)]
+ [PropertyOrder(4)]
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_ClosingSituation_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_ClosingSituation_Description))]
@@ -113,7 +112,7 @@
public override string ToString()
{
- return $"{data.Name}";
+ return data.Name;
}
}
}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/SubMechanismIllustrationPointProperties.cs
===================================================================
diff -u -ra49798da6ac2176d2e8b28ec6fec8a2494d8ee91 -r3e5d6f7c7f61eb17c81d1f80d2e55fda103f766d
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/SubMechanismIllustrationPointProperties.cs (.../SubMechanismIllustrationPointProperties.cs) (revision a49798da6ac2176d2e8b28ec6fec8a2494d8ee91)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/SubMechanismIllustrationPointProperties.cs (.../SubMechanismIllustrationPointProperties.cs) (revision 3e5d6f7c7f61eb17c81d1f80d2e55fda103f766d)
@@ -42,9 +42,8 @@
/// Creates a new instance of .
///
/// The sub mechanism illustration point to use for the properties.
- /// String containing the wind direction for this illustration point.
- /// String containing the name of the closing situation. If empty
- /// the property will not be visible.
+ /// The wind direction of the illustration point.
+ /// The closing situation of the illustration point.
/// Thrown when any input parameter is null.
public SubMechanismIllustrationPointProperties(SubMechanismIllustrationPoint illustrationPoint,
string windDirection,
@@ -54,7 +53,7 @@
subMechanismIllustrationPoint = illustrationPoint;
}
- [PropertyOrder(4)]
+ [PropertyOrder(5)]
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_AlphaValues_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_AlphaValues_Description))]
@@ -70,7 +69,7 @@
}
}
- [PropertyOrder(5)]
+ [PropertyOrder(6)]
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_Durations_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_Durations_Description))]
@@ -86,7 +85,7 @@
}
}
- [PropertyOrder(6)]
+ [PropertyOrder(7)]
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_Realization_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_Realization_Description))]
@@ -102,7 +101,7 @@
}
}
- [PropertyOrder(7)]
+ [PropertyOrder(8)]
[ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))]
[ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPoint_Result_DisplayName))]
[ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_Result_Description))]
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/TopLevelFaultTreeIllustrationPointProperties.cs
===================================================================
diff -u -ra49798da6ac2176d2e8b28ec6fec8a2494d8ee91 -r3e5d6f7c7f61eb17c81d1f80d2e55fda103f766d
--- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/TopLevelFaultTreeIllustrationPointProperties.cs (.../TopLevelFaultTreeIllustrationPointProperties.cs) (revision a49798da6ac2176d2e8b28ec6fec8a2494d8ee91)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/TopLevelFaultTreeIllustrationPointProperties.cs (.../TopLevelFaultTreeIllustrationPointProperties.cs) (revision 3e5d6f7c7f61eb17c81d1f80d2e55fda103f766d)
@@ -166,8 +166,8 @@
continue;
}
- // If type is not supported, throw exception (currently not possible, safeguard for future)
- throw new NotSupportedException($"IllustrationPointNode of type {nameof(FaultTreeIllustrationPoint)} is not supported. Supported types: {nameof(FaultTreeIllustrationPoint)} and {nameof(SubMechanismIllustrationPoint)}");
+ throw new NotSupportedException($"IllustrationPointNode of type {nameof(FaultTreeIllustrationPoint)} is not supported. " +
+ $"Supported types: {nameof(FaultTreeIllustrationPoint)} and {nameof(SubMechanismIllustrationPoint)}");
}
return points.ToArray();
}
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsStochasticSoilProfileProperties.cs
===================================================================
diff -u -rade9597f8f050ca97431db031d9dc7dc87f715ba -r3e5d6f7c7f61eb17c81d1f80d2e55fda103f766d
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsStochasticSoilProfileProperties.cs (.../MacroStabilityInwardsStochasticSoilProfileProperties.cs) (revision ade9597f8f050ca97431db031d9dc7dc87f715ba)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsStochasticSoilProfileProperties.cs (.../MacroStabilityInwardsStochasticSoilProfileProperties.cs) (revision 3e5d6f7c7f61eb17c81d1f80d2e55fda103f766d)
@@ -144,7 +144,6 @@
return RingtoetsCommonFormsResources.StochasticSoilProfile_Type_2D;
}
- // If type is not supported, throw exception (currently not possible, safeguard for future)
string exceptionMessage = $"{data.SoilProfile.GetType()} is not supported." +
$" Supported types: {nameof(MacroStabilityInwardsSoilProfile1D)} and {nameof(MacroStabilityInwardsSoilProfile2D)}.";
throw new NotSupportedException(exceptionMessage);