Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -rf9aefa56762ac1dd731bc4bfed955d651781d598 -r4e9f27f907fa0cc1b78d41d0caba53b359d4c99c --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision f9aefa56762ac1dd731bc4bfed955d651781d598) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 4e9f27f907fa0cc1b78d41d0caba53b359d4c99c) @@ -388,10 +388,10 @@ /// /// Looks up a localized string similar to {0} - {1}. /// - public static string GrassCoverErosionInwardsChartDataFactory_Create_DatatTypeDisplayName_0_DataIdentifier_1_ { + public static string GrassCoverErosionInwardsChartDataFactory_Create_DataIdentifier_0_DataTypeDisplayName_1_ { get { - return ResourceManager.GetString("GrassCoverErosionInwardsChartDataFactory_Create_DatatTypeDisplayName_0_DataIdenti" + - "fier_1_", resourceCulture); + return ResourceManager.GetString("GrassCoverErosionInwardsChartDataFactory_Create_DataIdentifier_0_DataTypeDisplayN" + + "ame_1_", resourceCulture); } } Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx =================================================================== diff -u -rf9aefa56762ac1dd731bc4bfed955d651781d598 -r4e9f27f907fa0cc1b78d41d0caba53b359d4c99c --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision f9aefa56762ac1dd731bc4bfed955d651781d598) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 4e9f27f907fa0cc1b78d41d0caba53b359d4c99c) @@ -283,7 +283,7 @@ Dijkhoogte - + {0} - {1} \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsChartDataFactory.cs =================================================================== diff -u -rf9aefa56762ac1dd731bc4bfed955d651781d598 -r4e9f27f907fa0cc1b78d41d0caba53b359d4c99c --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsChartDataFactory.cs (.../GrassCoverErosionInwardsChartDataFactory.cs) (revision f9aefa56762ac1dd731bc4bfed955d651781d598) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Views/GrassCoverErosionInwardsChartDataFactory.cs (.../GrassCoverErosionInwardsChartDataFactory.cs) (revision 4e9f27f907fa0cc1b78d41d0caba53b359d4c99c) @@ -56,9 +56,9 @@ } return new ChartLineData(dikeGeometry.Select(dg => dg.Point), - string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DatatTypeDisplayName_0_DataIdentifier_1_, - Resources.DikeProfile_DisplayName, - name)) + string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DataIdentifier_0_DataTypeDisplayName_1_, + name, + Resources.DikeProfile_DisplayName)) { Style = new ChartLineStyle(Color.SaddleBrown, 2, DashStyle.Solid) }; @@ -81,9 +81,9 @@ } return new ChartLineData(foreshoreGeometry, - string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DatatTypeDisplayName_0_DataIdentifier_1_, - Resources.Foreshore_DisplayName, - name)) + string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DataIdentifier_0_DataTypeDisplayName_1_, + name, + Resources.Foreshore_DisplayName)) { Style = new ChartLineStyle(Color.DarkOrange, 2, DashStyle.Solid) }; @@ -113,10 +113,7 @@ throw new ArgumentNullException("dikeGeometry"); } - return new ChartLineData(CreateDikeHeightData(dikeHeight, dikeGeometry), - string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DatatTypeDisplayName_0_DataIdentifier_1_, - Resources.DikeHeight_ChartName, - name)) + return new ChartLineData(CreateDikeHeightData(dikeHeight, dikeGeometry), Resources.DikeHeight_ChartName) { Style = new ChartLineStyle(Color.MediumSeaGreen, 2, DashStyle.Dash) }; Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsChartDataFactoryTest.cs =================================================================== diff -u -rf9aefa56762ac1dd731bc4bfed955d651781d598 -r4e9f27f907fa0cc1b78d41d0caba53b359d4c99c --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsChartDataFactoryTest.cs (.../GrassCoverErosionInwardsChartDataFactoryTest.cs) (revision f9aefa56762ac1dd731bc4bfed955d651781d598) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsChartDataFactoryTest.cs (.../GrassCoverErosionInwardsChartDataFactoryTest.cs) (revision 4e9f27f907fa0cc1b78d41d0caba53b359d4c99c) @@ -65,9 +65,9 @@ Assert.IsInstanceOf(data); ChartLineData chartLineData = (ChartLineData) data; Assert.AreEqual(3, chartLineData.Points.Count()); - var expectedName = string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DatatTypeDisplayName_0_DataIdentifier_1_, - Resources.DikeProfile_DisplayName, - dikeProfile.Name); + var expectedName = string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DataIdentifier_0_DataTypeDisplayName_1_, + dikeProfile.Name, + Resources.DikeProfile_DisplayName); Assert.AreEqual(expectedName, data.Name); AssertEqualPointCollections(dikeProfile.DikeGeometry.Select(dg => dg.Point), chartLineData.Points); @@ -100,9 +100,9 @@ Assert.IsInstanceOf(data); ChartLineData chartLineData = (ChartLineData) data; Assert.AreEqual(3, chartLineData.Points.Count()); - var expectedName = string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DatatTypeDisplayName_0_DataIdentifier_1_, - Resources.Foreshore_DisplayName, - dikeProfile.Name); + var expectedName = string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DataIdentifier_0_DataTypeDisplayName_1_, + dikeProfile.Name, + Resources.Foreshore_DisplayName); Assert.AreEqual(expectedName, data.Name); AssertEqualPointCollections(dikeProfile.ForeshoreGeometry, chartLineData.Points); @@ -146,10 +146,7 @@ Assert.IsInstanceOf(data); ChartLineData chartLineData = (ChartLineData) data; Assert.AreEqual(2, chartLineData.Points.Count()); - var expectedName = string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DatatTypeDisplayName_0_DataIdentifier_1_, - Resources.DikeHeight_ChartName, - name); - Assert.AreEqual(expectedName, data.Name); + Assert.AreEqual(Resources.DikeHeight_ChartName, data.Name); var dikeHeightPoints = new[] { Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs =================================================================== diff -u -rf9aefa56762ac1dd731bc4bfed955d651781d598 -r4e9f27f907fa0cc1b78d41d0caba53b359d4c99c --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs (.../GrassCoverErosionInwardsInputViewTest.cs) (revision f9aefa56762ac1dd731bc4bfed955d651781d598) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsInputViewTest.cs (.../GrassCoverErosionInwardsInputViewTest.cs) (revision 4e9f27f907fa0cc1b78d41d0caba53b359d4c99c) @@ -475,7 +475,9 @@ Assert.AreEqual(dikeGeometry.Length, dikeProfileChartData.Points.Count()); CollectionAssert.AreEqual(dikeGeometry.Select(dg => dg.Point), dikeProfileChartData.Points); - string expectedName = string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DatatTypeDisplayName_0_DataIdentifier_1_, Resources.DikeProfile_DisplayName, dikeProfile.Name); + string expectedName = string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DataIdentifier_0_DataTypeDisplayName_1_, + dikeProfile.Name, + Resources.DikeProfile_DisplayName); Assert.AreEqual(expectedName, chartData.Name); } @@ -488,7 +490,9 @@ Assert.AreEqual(foreshoreGeometry.Length, foreshoreChartData.Points.Count()); CollectionAssert.AreEqual(foreshoreGeometry, foreshoreChartData.Points); - string expectedName = string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DatatTypeDisplayName_0_DataIdentifier_1_, Resources.Foreshore_DisplayName, dikeProfile.Name); + string expectedName = string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DataIdentifier_0_DataTypeDisplayName_1_, + dikeProfile.Name, + Resources.Foreshore_DisplayName); Assert.AreEqual(expectedName, chartData.Name); } @@ -506,8 +510,7 @@ Assert.AreEqual(dikeHeightGeometry.Length, dikeHeightChartData.Points.Count()); CollectionAssert.AreEqual(dikeHeightGeometry, dikeHeightChartData.Points); - string expectedName = string.Format(Resources.GrassCoverErosionInwardsChartDataFactory_Create_DatatTypeDisplayName_0_DataIdentifier_1_, Resources.DikeHeight_ChartName, dikeProfile.Name); - Assert.AreEqual(expectedName, chartData.Name); + Assert.AreEqual(Resources.DikeHeight_ChartName, chartData.Name); } } } \ No newline at end of file