Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) @@ -202,6 +202,15 @@ } /// + /// Looks up a localized string similar to Gras. + /// + public static string GrassCoverErosionOutwardsWaveConditionsInputContext_RevetmentType { + get { + return ResourceManager.GetString("GrassCoverErosionOutwardsWaveConditionsInputContext_RevetmentType", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Berekende waterstand bij doorsnede-eis op de geselecteerde locatie.. /// public static string GrassCoverErosionOutwardsWaveConditionsInputContextProperties_DesignWaterLevel_Description { Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.resx =================================================================== diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) @@ -174,4 +174,7 @@ Berekende waterstand bij doorsnede-eis op de geselecteerde locatie. + + Gras + \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextProperties.cs =================================================================== diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextProperties.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextProperties.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Forms/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextProperties.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextProperties.cs) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) @@ -23,7 +23,6 @@ using Core.Common.Utils.Attributes; using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; using Ringtoets.GrassCoverErosionOutwards.Forms.Properties; -using Ringtoets.Revetment.Data; using Ringtoets.Revetment.Forms.PropertyClasses; namespace Ringtoets.GrassCoverErosionOutwards.Forms.PropertyClasses @@ -54,11 +53,11 @@ } } - public override WaveConditionsRevetment RevetmentType + public override string RevetmentType { get { - return WaveConditionsRevetment.Grass; + return Resources.GrassCoverErosionOutwardsWaveConditionsInputContext_RevetmentType; } } } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsInputContextPropertiesTest.cs) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) @@ -107,7 +107,7 @@ Assert.AreEqual(0, properties.Orientation.Value); Assert.AreSame(input, properties.BreakWater.Data); Assert.AreSame(input, properties.ForeshoreGeometry.Data); - Assert.AreEqual(input.RevetmentType, properties.RevetmentType); + Assert.AreEqual("Gras", properties.RevetmentType); } [Test] Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.Designer.cs =================================================================== diff -u -r50fc099174271a6f72ed94a8f024cd5377b37a53 -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) @@ -136,32 +136,5 @@ return ResourceManager.GetString("WaveConditionsInputStepSize_Two", resourceCulture); } } - - /// - /// Looks up a localized string similar to Asfalt. - /// - internal static string WaveConditionsRevetment_AsphaltRevetment { - get { - return ResourceManager.GetString("WaveConditionsRevetment_AsphaltRevetment", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Gras. - /// - internal static string WaveConditionsRevetment_GrassRevetment { - get { - return ResourceManager.GetString("WaveConditionsRevetment_GrassRevetment", resourceCulture); - } - } - - /// - /// Looks up a localized string similar to Steen (blokken en zuilen). - /// - internal static string WaveConditionsRevetment_StoneRevetment { - get { - return ResourceManager.GetString("WaveConditionsRevetment_StoneRevetment", resourceCulture); - } - } } } Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.resx =================================================================== diff -u -r50fc099174271a6f72ed94a8f024cd5377b37a53 -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.resx (.../Resources.resx) (revision 50fc099174271a6f72ed94a8f024cd5377b37a53) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Data/Properties/Resources.resx (.../Resources.resx) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) @@ -135,13 +135,4 @@ 2.0 - - Asfalt - - - Gras - - - Steen (blokken en zuilen) - \ No newline at end of file Index: Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs =================================================================== diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 --- Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs (.../WaveConditionsInputContextProperties.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9) +++ Ringtoets/Revetment/src/Ringtoets.Revetment.Forms/PropertyClasses/WaveConditionsInputContextProperties.cs (.../WaveConditionsInputContextProperties.cs) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) @@ -43,7 +43,8 @@ /// /// ViewModel of for properties panel. /// - public class WaveConditionsInputContextProperties : ObjectProperties, IWaveConditionsInputContextProperties where T : WaveConditionsInputContext + public abstract class WaveConditionsInputContextProperties : ObjectProperties, IWaveConditionsInputContextProperties + where T : WaveConditionsInputContext { private const int hydraulicBoundaryLocationPropertyIndex = 0; private const int assessmentLevelPropertyIndex = 1; @@ -286,17 +287,10 @@ } [PropertyOrder(revetmentTypePropertyIndex)] - [TypeConverter(typeof(EnumTypeConverter))] [ResourcesCategory(typeof(RingtoetsCommonFormsResources), "Categories_Schematization")] [ResourcesDisplayName(typeof(Resources), "WaveConditionsInput_RevetmentType_DisplayName")] [ResourcesDescription(typeof(Resources), "WaveConditionsInput_RevetmentType_Description")] - public virtual WaveConditionsRevetment RevetmentType - { - get - { - return data.WrappedData.RevetmentType; - } - } + public abstract string RevetmentType { get; } public virtual IEnumerable GetAvailableHydraulicBoundaryLocations() { Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs (.../WaveConditionsInputContextPropertiesTest.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs (.../WaveConditionsInputContextPropertiesTest.cs) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) @@ -64,7 +64,7 @@ public void Constructor_ExpectedValues() { // Call - var properties = new WaveConditionsInputContextProperties(); + var properties = new TestWaveConditionsInputContextProperties(); // Assert Assert.IsInstanceOf>(properties); @@ -80,7 +80,7 @@ var inputContext = new TestWaveConditionsInputContext(input, new ForeshoreProfile[0], new HydraulicBoundaryLocation[0]); // Call - var properties = new WaveConditionsInputContextProperties + var properties = new TestWaveConditionsInputContextProperties { Data = inputContext }; @@ -106,7 +106,7 @@ Assert.AreEqual(0, properties.Orientation.Value); Assert.AreSame(input, properties.BreakWater.Data); Assert.AreSame(input, properties.ForeshoreGeometry.Data); - Assert.AreEqual(input.RevetmentType, properties.RevetmentType); + Assert.AreEqual("Test", properties.RevetmentType); } [Test] @@ -159,7 +159,7 @@ }); // Call - var properties = new WaveConditionsInputContextProperties + var properties = new TestWaveConditionsInputContextProperties { Data = inputContext }; @@ -213,7 +213,7 @@ new BreakWater(BreakWaterType.Dam, (RoundedDouble) random.NextDouble()), new ForeshoreProfile.ConstructionProperties()); - var properties = new WaveConditionsInputContextProperties + var properties = new TestWaveConditionsInputContextProperties { Data = inputContext }; @@ -269,7 +269,7 @@ }, new HydraulicBoundaryLocation[0]); // Call - var properties = new WaveConditionsInputContextProperties + var properties = new TestWaveConditionsInputContextProperties { Data = inputContext }; @@ -424,5 +424,16 @@ } } } + + private class TestWaveConditionsInputContextProperties : WaveConditionsInputContextProperties + { + public override string RevetmentType + { + get + { + return "Test"; + } + } + } } } \ No newline at end of file Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/UITypeEditors/WaveConditionsInputContextForeshoreProfileEditorTest.cs =================================================================== diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/UITypeEditors/WaveConditionsInputContextForeshoreProfileEditorTest.cs (.../WaveConditionsInputContextForeshoreProfileEditorTest.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/UITypeEditors/WaveConditionsInputContextForeshoreProfileEditorTest.cs (.../WaveConditionsInputContextForeshoreProfileEditorTest.cs) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) @@ -63,7 +63,7 @@ var inputContext = new TestWaveConditionsInputContext(grassCoverErosionInwardsInput, foreshoreProfiles); - var properties = new WaveConditionsInputContextProperties + var properties = new TestWaveConditionsInputContextProperties { Data = inputContext }; @@ -108,7 +108,7 @@ foreshoreProfile }); - var properties = new WaveConditionsInputContextProperties + var properties = new TestWaveConditionsInputContextProperties { Data = inputContext }; @@ -161,5 +161,16 @@ } } } + + private class TestWaveConditionsInputContextProperties : WaveConditionsInputContextProperties + { + public override string RevetmentType + { + get + { + return "test"; + } + } + } } } \ No newline at end of file Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/UITypeEditors/WaveConditionsInputContextHydraulicBoundaryLocationEditorTest.cs =================================================================== diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/UITypeEditors/WaveConditionsInputContextHydraulicBoundaryLocationEditorTest.cs (.../WaveConditionsInputContextHydraulicBoundaryLocationEditorTest.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Forms.Test/UITypeEditors/WaveConditionsInputContextHydraulicBoundaryLocationEditorTest.cs (.../WaveConditionsInputContextHydraulicBoundaryLocationEditorTest.cs) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) @@ -58,7 +58,7 @@ new TestHydraulicBoundaryLocation() }); - var properties = new WaveConditionsInputContextProperties + var properties = new TestWaveConditionsInputContextProperties { Data = inputContext }; @@ -101,7 +101,7 @@ hydraulicBoundaryLocation }); - var properties = new WaveConditionsInputContextProperties + var properties = new TestWaveConditionsInputContextProperties { Data = inputContext }; @@ -158,5 +158,16 @@ } } } + + private class TestWaveConditionsInputContextProperties : WaveConditionsInputContextProperties + { + public override string RevetmentType + { + get + { + return "test"; + } + } + } } } \ No newline at end of file Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r5144a0cdb812048a94e9d812b30018415eebb07d -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5144a0cdb812048a94e9d812b30018415eebb07d) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) @@ -118,6 +118,15 @@ } /// + /// Looks up a localized string similar to Steen (blokken en zuilen). + /// + public static string StabilityStoneCoverWaveConditionsInputContextPorperties_RevetmentType { + get { + return ResourceManager.GetString("StabilityStoneCoverWaveConditionsInputContextPorperties_RevetmentType", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Berekende resultaten voor de hydraulische randvoorwaarden voor blokken.. /// public static string StabilityStoneCoverWaveConditionsOutputProperties_Blocks_Description { Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Properties/Resources.resx =================================================================== diff -u -r5144a0cdb812048a94e9d812b30018415eebb07d -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Properties/Resources.resx (.../Resources.resx) (revision 5144a0cdb812048a94e9d812b30018415eebb07d) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/Properties/Resources.resx (.../Resources.resx) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) @@ -141,4 +141,7 @@ Hydraulische randvoorwaarden voor zuilen + + Steen (blokken en zuilen) + \ No newline at end of file Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextProperties.cs =================================================================== diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextProperties.cs (.../StabilityStoneCoverWaveConditionsInputContextProperties.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextProperties.cs (.../StabilityStoneCoverWaveConditionsInputContextProperties.cs) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) @@ -19,9 +19,9 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using Ringtoets.Revetment.Data; using Ringtoets.Revetment.Forms.PropertyClasses; using Ringtoets.StabilityStoneCover.Forms.PresentationObjects; +using Ringtoets.StabilityStoneCover.Forms.Properties; namespace Ringtoets.StabilityStoneCover.Forms.PropertyClasses { @@ -31,11 +31,11 @@ public class StabilityStoneCoverWaveConditionsInputContextProperties : WaveConditionsInputContextProperties { - public override WaveConditionsRevetment RevetmentType + public override string RevetmentType { get { - return WaveConditionsRevetment.StabilityStone; + return Resources.StabilityStoneCoverWaveConditionsInputContextPorperties_RevetmentType; } } } Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs (.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs (.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) @@ -114,7 +114,7 @@ Assert.AreEqual(0, properties.Orientation.Value); Assert.AreSame(input, properties.BreakWater.Data); Assert.AreSame(input, properties.ForeshoreGeometry.Data); - Assert.AreEqual(input.RevetmentType, properties.RevetmentType); + Assert.AreEqual("Steen (blokken en zuilen)", properties.RevetmentType); mocks.VerifyAll(); } Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r1d8a218ddfc990be2d637dfdafd9e6969ff9ae7e -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1d8a218ddfc990be2d637dfdafd9e6969ff9ae7e) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) @@ -22,7 +22,7 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.42000 +// Runtime Version:4.0.30319.17929 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -92,6 +92,15 @@ } /// + /// Looks up a localized string similar to Asfalt. + /// + public static string WaveImpactAsphaltCoverWaveConditionsInputContextProperties_RevetmentType { + get { + return ResourceManager.GetString("WaveImpactAsphaltCoverWaveConditionsInputContextProperties_RevetmentType", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Berekende resultaten voor de hydraulische randvoorwaarden voor asfalt.. /// public static string WaveImpactAsphaltCoverWaveConditionsOutputProperties_HydraulicBoundaryLocationResult_Description { Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Properties/Resources.resx =================================================================== diff -u -r1d8a218ddfc990be2d637dfdafd9e6969ff9ae7e -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Properties/Resources.resx (.../Resources.resx) (revision 1d8a218ddfc990be2d637dfdafd9e6969ff9ae7e) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Properties/Resources.resx (.../Resources.resx) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) @@ -120,6 +120,9 @@ Het golfklappen op asfalt toetsspoor + + Asfalt + Berekende resultaten voor de hydraulische randvoorwaarden voor asfalt. Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextProperties.cs =================================================================== diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextProperties.cs (.../WaveImpactAsphaltCoverWaveConditionsInputContextProperties.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsInputContextProperties.cs (.../WaveImpactAsphaltCoverWaveConditionsInputContextProperties.cs) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) @@ -19,9 +19,9 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using Ringtoets.Revetment.Data; using Ringtoets.Revetment.Forms.PropertyClasses; using Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects; +using Ringtoets.WaveImpactAsphaltCover.Forms.Properties; namespace Ringtoets.WaveImpactAsphaltCover.Forms.PropertyClasses { @@ -31,11 +31,11 @@ public class WaveImpactAsphaltCoverWaveConditionsInputContextProperties : WaveConditionsInputContextProperties { - public override WaveConditionsRevetment RevetmentType + public override string RevetmentType { get { - return WaveConditionsRevetment.Asphalt; + return Resources.WaveImpactAsphaltCoverWaveConditionsInputContextProperties_RevetmentType; } } } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -r172f313c5afd8dafa9756d9d1600c78ea2e9fcf9 -rdc0514a27cbec73b00a8465a1b15ab207dca4a84 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs (.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs) (revision 172f313c5afd8dafa9756d9d1600c78ea2e9fcf9) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs (.../StabilityStoneCoverWaveConditionsInputContextPropertiesTest.cs) (revision dc0514a27cbec73b00a8465a1b15ab207dca4a84) @@ -114,7 +114,7 @@ Assert.AreEqual(0, properties.Orientation.Value); Assert.AreSame(input, properties.BreakWater.Data); Assert.AreSame(input, properties.ForeshoreGeometry.Data); - Assert.AreEqual(input.RevetmentType, properties.RevetmentType); + Assert.AreEqual("Asfalt", properties.RevetmentType); mocks.VerifyAll(); }