Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r8df74f53ba0cda71ee52547adf4df6379bcddd42 -r8718443ea3c96338f5049cefbe6ab9213246dff0
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 8df74f53ba0cda71ee52547adf4df6379bcddd42)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 8718443ea3c96338f5049cefbe6ab9213246dff0)
@@ -278,7 +278,7 @@
}
///
- /// Looks up a localized string similar to Eigenschappen van het voorland..
+ /// Looks up a localized string similar to Eigenschappen van de voorlandgeometrie..
///
public static string ForeshoreProperties_Description {
get {
@@ -287,7 +287,7 @@
}
///
- /// Looks up a localized string similar to Voorland.
+ /// Looks up a localized string similar to Voorlandgeometrie.
///
public static string ForeshoreProperties_DisplayName {
get {
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx
===================================================================
diff -u -r8df74f53ba0cda71ee52547adf4df6379bcddd42 -r8718443ea3c96338f5049cefbe6ab9213246dff0
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 8df74f53ba0cda71ee52547adf4df6379bcddd42)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/Properties/Resources.resx (.../Resources.resx) (revision 8718443ea3c96338f5049cefbe6ab9213246dff0)
@@ -203,10 +203,10 @@
Dijkhoogte [m+NAP]
- Eigenschappen van het voorland.
+ Eigenschappen van de voorlandgeometrie.
- Voorland
+ Voorlandgeometrie
Is er een voorland aanwezig?
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs
===================================================================
diff -u -r26359a31a29af21b6690cacd9b810b1565af9e4b -r8718443ea3c96338f5049cefbe6ab9213246dff0
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs (.../GrassCoverErosionInwardsInputContextProperties.cs) (revision 26359a31a29af21b6690cacd9b810b1565af9e4b)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsInputContextProperties.cs (.../GrassCoverErosionInwardsInputContextProperties.cs) (revision 8718443ea3c96338f5049cefbe6ab9213246dff0)
@@ -39,44 +39,44 @@
///
public class GrassCoverErosionInwardsInputContextProperties : ObjectProperties
{
- private const int dikeGeometryPropertyIndex = 1;
- private const int dikeHeightPropertyIndex = 2;
+ private const int orientationPropertyIndex = 1;
+ private const int breakWaterPropertyIndex = 2;
private const int foreshorePropertyIndex = 3;
- private const int orientationPropertyIndex = 4;
- private const int breakWaterPropertyIndex = 5;
+ private const int dikeGeometryPropertyIndex = 4;
+ private const int dikeHeightPropertyIndex = 5;
private const int criticalFlowRatePropertyIndex = 6;
private const int hydraulicBoundaryLocationPropertyIndex = 7;
- [PropertyOrder(dikeGeometryPropertyIndex)]
+ [PropertyOrder(orientationPropertyIndex)]
[ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
- [ResourcesDisplayName(typeof(Resources), "DikeGeometryProperties_DisplayName")]
- [ResourcesDescription(typeof(Resources), "DikeGeometryProperties_Description")]
- public DikeGeometryProperties DikeGeometry
+ [ResourcesDisplayName(typeof(Resources), "Orientation_DisplayName")]
+ [ResourcesDescription(typeof(Resources), "Orientation_Description")]
+ public RoundedDouble Orientation
{
get
{
- return new DikeGeometryProperties
- {
- Data = data
- };
+ return data.WrappedData.Orientation;
}
+ set
+ {
+ data.WrappedData.Orientation = value;
+ data.WrappedData.NotifyObservers();
+ }
}
- [PropertyOrder(dikeHeightPropertyIndex)]
+ [PropertyOrder(breakWaterPropertyIndex)]
[ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
- [ResourcesDisplayName(typeof(Resources), "DikeHeight_DisplayName")]
- [ResourcesDescription(typeof(Resources), "DikeHeight_Description")]
- public RoundedDouble DikeHeight
+ [ResourcesDisplayName(typeof(Resources), "BreakWaterProperties_DisplayName")]
+ [ResourcesDescription(typeof(Resources), "BreakWaterProperties_Description")]
+ public BreakWaterProperties BreakWater
{
get
{
- return data.WrappedData.DikeHeight;
+ return new BreakWaterProperties
+ {
+ Data = data
+ };
}
- set
- {
- data.WrappedData.DikeHeight = value;
- data.WrappedData.NotifyObservers();
- }
}
[PropertyOrder(foreshorePropertyIndex)]
@@ -94,36 +94,36 @@
}
}
- [PropertyOrder(orientationPropertyIndex)]
+ [PropertyOrder(dikeGeometryPropertyIndex)]
[ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
- [ResourcesDisplayName(typeof(Resources), "Orientation_DisplayName")]
- [ResourcesDescription(typeof(Resources), "Orientation_Description")]
- public RoundedDouble Orientation
+ [ResourcesDisplayName(typeof(Resources), "DikeGeometryProperties_DisplayName")]
+ [ResourcesDescription(typeof(Resources), "DikeGeometryProperties_Description")]
+ public DikeGeometryProperties DikeGeometry
{
get
{
- return data.WrappedData.Orientation;
+ return new DikeGeometryProperties
+ {
+ Data = data
+ };
}
- set
- {
- data.WrappedData.Orientation = value;
- data.WrappedData.NotifyObservers();
- }
}
- [PropertyOrder(breakWaterPropertyIndex)]
+ [PropertyOrder(dikeHeightPropertyIndex)]
[ResourcesCategory(typeof(Resources), "Categories_Schematisation")]
- [ResourcesDisplayName(typeof(Resources), "BreakWaterProperties_DisplayName")]
- [ResourcesDescription(typeof(Resources), "BreakWaterProperties_Description")]
- public BreakWaterProperties BreakWater
+ [ResourcesDisplayName(typeof(Resources), "DikeHeight_DisplayName")]
+ [ResourcesDescription(typeof(Resources), "DikeHeight_Description")]
+ public RoundedDouble DikeHeight
{
get
{
- return new BreakWaterProperties
- {
- Data = data
- };
+ return data.WrappedData.DikeHeight;
}
+ set
+ {
+ data.WrappedData.DikeHeight = value;
+ data.WrappedData.NotifyObservers();
+ }
}
[PropertyOrder(criticalFlowRatePropertyIndex)]
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs
===================================================================
diff -u -r8df74f53ba0cda71ee52547adf4df6379bcddd42 -r8718443ea3c96338f5049cefbe6ab9213246dff0
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs (.../GrassCoverErosionInwardsInputContextPropertiesTest.cs) (revision 8df74f53ba0cda71ee52547adf4df6379bcddd42)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/PropertyClasses/GrassCoverErosionInwardsInputContextPropertiesTest.cs (.../GrassCoverErosionInwardsInputContextPropertiesTest.cs) (revision 8718443ea3c96338f5049cefbe6ab9213246dff0)
@@ -182,8 +182,8 @@
Assert.IsNotNull(foreshoreProperty);
Assert.IsTrue(foreshoreProperty.IsReadOnly);
Assert.AreEqual("Schematisatie", foreshoreProperty.Category);
- Assert.AreEqual("Voorland", foreshoreProperty.DisplayName);
- Assert.AreEqual("Eigenschappen van het voorland.", foreshoreProperty.Description);
+ Assert.AreEqual("Voorlandgeometrie", foreshoreProperty.DisplayName);
+ Assert.AreEqual("Eigenschappen van de voorlandgeometrie.", foreshoreProperty.Description);
PropertyDescriptor orientationProperty = dynamicProperties[orientationPropertyIndex];
Assert.IsNotNull(orientationProperty);
@@ -215,11 +215,11 @@
mockRepository.VerifyAll();
}
- private const int dikeGeometryPropertyIndex = 0;
- private const int dikeHeightPropertyIndex = 1;
+ private const int orientationPropertyIndex = 0;
+ private const int breakWaterPropertyIndex = 1;
private const int foreshorePropertyIndex = 2;
- private const int orientationPropertyIndex = 3;
- private const int breakWaterPropertyIndex = 4;
+ private const int dikeGeometryPropertyIndex = 3;
+ private const int dikeHeightPropertyIndex = 4;
private const int criticalFlowRatePropertyIndex = 5;
private const int hydraulicBoundaryLocationPropertyIndex = 6;
}