Index: Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/IllustrationPointProperties.cs =================================================================== diff -u -r9c8a4be86a9b3659738256e8f1c0542339d7b16a -ra49798da6ac2176d2e8b28ec6fec8a2494d8ee91 --- Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/IllustrationPointProperties.cs (.../IllustrationPointProperties.cs) (revision 9c8a4be86a9b3659738256e8f1c0542339d7b16a) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/IllustrationPointProperties.cs (.../IllustrationPointProperties.cs) (revision a49798da6ac2176d2e8b28ec6fec8a2494d8ee91) @@ -20,12 +20,9 @@ // All rights reserved. using System; -using System.Collections.Generic; using System.ComponentModel; -using System.Linq; using Core.Common.Base.Data; using Core.Common.Gui.Attributes; -using Core.Common.Gui.Converters; using Core.Common.Gui.PropertyBag; using Core.Common.Utils; using Core.Common.Utils.Attributes; @@ -41,28 +38,21 @@ [TypeConverter(typeof(ExpandableObjectConverter))] public class IllustrationPointProperties : ObjectProperties { - private readonly IEnumerable childNodes; - /// /// Creates a new instance of . /// /// The data 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. /// Thrown when any input parameter is null. - public IllustrationPointProperties(IllustrationPointBase illustrationPoint, IEnumerable childNodes, + public IllustrationPointProperties(IllustrationPointBase illustrationPoint, string windDirection, string closingSituation) { if (illustrationPoint == null) { throw new ArgumentNullException(nameof(illustrationPoint)); } - if (childNodes == null) - { - throw new ArgumentNullException(nameof(childNodes)); - } if (windDirection == null) { throw new ArgumentNullException(nameof(windDirection)); @@ -72,7 +62,6 @@ throw new ArgumentNullException(nameof(closingSituation)); } data = illustrationPoint; - this.childNodes = childNodes; WindDirection = windDirection; ClosingSituation = closingSituation; } @@ -116,58 +105,10 @@ [ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPoint_ClosingSituation_Description))] public string ClosingSituation { get; } - [DynamicVisible] - [PropertyOrder(6)] - [ResourcesCategory(typeof(Resources), nameof(Resources.Categories_IllustrationPoints))] - [ResourcesDisplayName(typeof(Resources), nameof(Resources.IllustrationPointProperty_IllustrationPoints_DisplayName))] - [ResourcesDescription(typeof(Resources), nameof(Resources.IllustrationPointProperty_IllustrationPoints_Description))] - [TypeConverter(typeof(ExpandableArrayConverter))] - [KeyValueElement(nameof(WindDirection), "")] - public IllustrationPointProperties[] IllustrationPoints - { - get - { - var points = new List(); - foreach (IllustrationPointNode illustrationPointNode in childNodes) - { - if (illustrationPointNode.Data is FaultTreeIllustrationPoint) - { - points.Add(new FaultTreeIllustrationPointProperties(illustrationPointNode.Data, - illustrationPointNode.Children, - WindDirection, ClosingSituation)); - continue; - } - - if (illustrationPointNode.Data is SubMechanismIllustrationPoint) - { - points.Add(new SubMechanismIllustrationPointProperties(illustrationPointNode.Data, - illustrationPointNode.Children, - WindDirection, ClosingSituation)); - 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)}"); - } - return points.ToArray(); - } - } - [DynamicVisibleValidationMethod] - public bool IsDynamicVisible(string propertyName) + public virtual bool IsDynamicVisible(string propertyName) { - if (propertyName.Equals(nameof(IllustrationPoints))) - { - return childNodes.Any(); - } - - if (propertyName.Equals(nameof(ClosingSituation))) - { - return ClosingSituation != string.Empty; - } - - return false; + return propertyName.Equals(nameof(ClosingSituation)) && ClosingSituation != string.Empty; } public override string ToString()