Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresCalculation.cs
===================================================================
diff -u -r67d6a305cec6967c1247f3d9cba8a817499d2a1d -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresCalculation.cs (.../ClosingStructuresCalculation.cs) (revision 67d6a305cec6967c1247f3d9cba8a817499d2a1d)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresCalculation.cs (.../ClosingStructuresCalculation.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -37,7 +37,7 @@
public ClosingStructuresCalculation()
{
InputParameters = new ClosingStructuresInput();
- Name = Resources.ClosingStructuresCalculation_DefaultName;
+ Name = Resources.Calculation_DefaultName;
}
///
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -ra6e0409b281c46630100de22ec860d3a3d4d8fa5 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a6e0409b281c46630100de22ec860d3a3d4d8fa5)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -82,15 +82,6 @@
}
///
- /// Looks up a localized string similar to Nieuwe berekening.
- ///
- public static string ClosingStructuresCalculation_DefaultName {
- get {
- return ResourceManager.GetString("ClosingStructuresCalculation_DefaultName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to BSKW.
///
public static string ClosingStructuresFailureMechanism_Code {
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.resx
===================================================================
diff -u -ra6e0409b281c46630100de22ec860d3a3d4d8fa5 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.resx (.../Resources.resx) (revision a6e0409b281c46630100de22ec860d3a3d4d8fa5)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.resx (.../Resources.resx) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -126,7 +126,4 @@
Verticale wand
-
- Nieuwe berekening
-
\ No newline at end of file
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -ra93ba11191996bb57cebb49cb3cb1cdcf2e217f7 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a93ba11191996bb57cebb49cb3cb1cdcf2e217f7)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -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.
@@ -82,15 +82,6 @@
}
///
- /// Looks up a localized string similar to Invoer.
- ///
- public static string ClosingStructuresInputContext_NodeDisplayName {
- get {
- return ResourceManager.GetString("ClosingStructuresInputContext_NodeDisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Instroommodel van het kunstwerk..
///
public static string ClosingStructureType_Description {
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx
===================================================================
diff -u -ra93ba11191996bb57cebb49cb3cb1cdcf2e217f7 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision a93ba11191996bb57cebb49cb3cb1cdcf2e217f7)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -117,9 +117,6 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Invoer
-
Instroommodel van het kunstwerk.
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs
===================================================================
diff -u -rc6b1371c973eedaa7267dab274ac9d5cb3c8171b -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision c6b1371c973eedaa7267dab274ac9d5cb3c8171b)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -40,9 +40,9 @@
using Ringtoets.Common.Forms.TreeNodeInfos;
using Ringtoets.HydraRing.IO;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
+using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
using RingtoetsCommonIOResources = Ringtoets.Common.IO.Properties.Resources;
-using ClosingStructuresDataResources = Ringtoets.ClosingStructures.Data.Properties.Resources;
using ClosingStructuresFormsResources = Ringtoets.ClosingStructures.Forms.Properties.Resources;
namespace Ringtoets.ClosingStructures.Plugin
@@ -124,7 +124,7 @@
yield return new TreeNodeInfo
{
- Text = inputContext => ClosingStructuresFormsResources.ClosingStructuresInputContext_NodeDisplayName,
+ Text = inputContext => RingtoetsCommonFormsResources.FailureMechanism_Inputs_DisplayName,
Image = inputContext => RingtoetsCommonFormsResources.GenericInputOutputIcon,
ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
.AddPropertiesItem()
@@ -351,7 +351,7 @@
{
var calculation = new ClosingStructuresCalculation
{
- Name = NamingHelper.GetUniqueName(context.WrappedData.Children, ClosingStructuresDataResources.ClosingStructuresCalculation_DefaultName, c => c.Name)
+ Name = NamingHelper.GetUniqueName(context.WrappedData.Children, RingtoetsCommonDataResources.Calculation_DefaultName, c => c.Name)
};
context.WrappedData.Children.Add(calculation);
context.WrappedData.NotifyObservers();
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresInputContextTreeNodeInfoTest.cs
===================================================================
diff -u -ree5ab18ca7554ffb2ce9546dd72b341da59f0345 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresInputContextTreeNodeInfoTest.cs (.../ClosingStructuresInputContextTreeNodeInfoTest.cs) (revision ee5ab18ca7554ffb2ce9546dd72b341da59f0345)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/TreeNodeInfos/ClosingStructuresInputContextTreeNodeInfoTest.cs (.../ClosingStructuresInputContextTreeNodeInfoTest.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -100,7 +100,7 @@
var text = info.Text(context);
// Assert
- Assert.AreEqual(ClosingStructuresFormsResources.ClosingStructuresInputContext_NodeDisplayName, text);
+ Assert.AreEqual("Invoer", text);
}
[Test]
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r277b68e1c58f97f527567f5500be6bc39efacd97 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 277b68e1c58f97f527567f5500be6bc39efacd97)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -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.
@@ -155,6 +155,15 @@
}
///
+ /// Looks up a localized string similar to Nieuwe berekening.
+ ///
+ public static string Calculation_DefaultName {
+ get {
+ return ResourceManager.GetString("Calculation_DefaultName", resourceCulture);
+ }
+ }
+
+ ///
/// Looks up a localized string similar to Nieuwe map.
///
public static string CalculationGroup_DefaultName {
@@ -173,15 +182,6 @@
}
///
- /// Looks up a localized string similar to Nieuwe berekening.
- ///
- public static string ClosingStructuresCalculation_DefaultName {
- get {
- return ResourceManager.GetString("ClosingStructuresCalculation_DefaultName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Variatiecoëfficiënt (CV) moet groter of gelijk zijn aan 0..
///
public static string CoefficientOfVariation_Should_be_greater_or_equal_to_zero {
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx
===================================================================
diff -u -r277b68e1c58f97f527567f5500be6bc39efacd97 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision 277b68e1c58f97f527567f5500be6bc39efacd97)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx (.../Resources.resx) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -219,7 +219,7 @@
De waarde voor de faalkans moet in het bereik tussen [0, 1] liggen.
-
+
Nieuwe berekening
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs
===================================================================
diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs (.../GrassCoverErosionInwardsCalculation.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/GrassCoverErosionInwardsCalculation.cs (.../GrassCoverErosionInwardsCalculation.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -22,7 +22,7 @@
using Core.Common.Base;
using Ringtoets.Common.Data.Calculation;
using Ringtoets.Common.Data.Probability;
-using Ringtoets.GrassCoverErosionInwards.Data.Properties;
+using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
namespace Ringtoets.GrassCoverErosionInwards.Data
{
@@ -36,7 +36,7 @@
///
public GrassCoverErosionInwardsCalculation()
{
- Name = Resources.GrassCoverErosionInwardsCalculation_DefaultName;
+ Name = RingtoetsCommonDataResources.Calculation_DefaultName;
InputParameters = new GrassCoverErosionInwardsInput();
}
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r30b8231f92b90ea4b05e98e3d0285368f6dfe2e4 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 30b8231f92b90ea4b05e98e3d0285368f6dfe2e4)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -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.
@@ -82,15 +82,6 @@
}
///
- /// Looks up a localized string similar to Nieuwe berekening.
- ///
- public static string GrassCoverErosionInwardsCalculation_DefaultName {
- get {
- return ResourceManager.GetString("GrassCoverErosionInwardsCalculation_DefaultName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to GEKB.
///
public static string GrassCoverErosionInwardsFailureMechanism_DisplayCode {
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Properties/Resources.resx
===================================================================
diff -u -r30b8231f92b90ea4b05e98e3d0285368f6dfe2e4 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Properties/Resources.resx (.../Resources.resx) (revision 30b8231f92b90ea4b05e98e3d0285368f6dfe2e4)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Data/Properties/Resources.resx (.../Resources.resx) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -120,9 +120,6 @@
Dijken en dammen - Grasbekleding erosie kruin en binnentalud
-
- Nieuwe berekening
-
GEKB
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs
===================================================================
diff -u -r6b9fda141298524c0910937dd090d82be420c52b -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 6b9fda141298524c0910937dd090d82be420c52b)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -45,7 +45,6 @@
using Ringtoets.GrassCoverErosionInwards.Service;
using Ringtoets.GrassCoverErosionInwards.Utils;
using Ringtoets.HydraRing.IO;
-using GrassCoverErosionInwardsDataResources = Ringtoets.GrassCoverErosionInwards.Data.Properties.Resources;
using GrassCoverErosionInwardsFormsResources = Ringtoets.GrassCoverErosionInwards.Forms.Properties.Resources;
using GrassCoverErosionInwardsPluginResources = Ringtoets.GrassCoverErosionInwards.Plugin.Properties.Resources;
using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
@@ -534,7 +533,7 @@
{
var calculation = new GrassCoverErosionInwardsCalculation
{
- Name = NamingHelper.GetUniqueName(context.WrappedData.Children, GrassCoverErosionInwardsDataResources.GrassCoverErosionInwardsCalculation_DefaultName, c => c.Name)
+ Name = NamingHelper.GetUniqueName(context.WrappedData.Children, RingtoetsCommonDataResources.Calculation_DefaultName, c => c.Name)
};
context.WrappedData.Children.Add(calculation);
context.WrappedData.NotifyObservers();
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs
===================================================================
diff -u -re92866220b9db723bb193729dc1928015e02f200 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision e92866220b9db723bb193729dc1928015e02f200)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -53,7 +53,7 @@
namespace Ringtoets.GrassCoverErosionInwards.Forms.Test.TreeNodeInfos
{
[TestFixture]
- public class GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest : NUnitFormTest
+ public class LGrassCoverErosionInwardsCalculationContextTreeNodeInfoTest : NUnitFormTest
{
private const int contextMenuValidateIndex = 0;
private const int contextMenuCalculateIndex = 1;
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsCalculation.cs
===================================================================
diff -u -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsCalculation.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculation.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/GrassCoverErosionOutwardsWaveConditionsCalculation.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculation.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -21,8 +21,8 @@
using Core.Common.Base;
using Ringtoets.Common.Data.Calculation;
-using Ringtoets.GrassCoverErosionOutwards.Data.Properties;
using Ringtoets.Revetment.Data;
+using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
namespace Ringtoets.GrassCoverErosionOutwards.Data
{
@@ -36,7 +36,7 @@
///
public GrassCoverErosionOutwardsWaveConditionsCalculation()
{
- Name = Resources.GrassCoverErosionOutwardsWaveConditionsCalculation_DefaultName;
+ Name = RingtoetsCommonDataResources.Calculation_DefaultName;
InputParameters = new WaveConditionsInput();
}
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r26c61097587b8bd3d7070c1458cacd03147e4b7c -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 26c61097587b8bd3d7070c1458cacd03147e4b7c)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -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.
@@ -108,14 +108,5 @@
"is_zero", resourceCulture);
}
}
-
- ///
- /// Looks up a localized string similar to Nieuwe berekening.
- ///
- public static string GrassCoverErosionOutwardsWaveConditionsCalculation_DefaultName {
- get {
- return ResourceManager.GetString("GrassCoverErosionOutwardsWaveConditionsCalculation_DefaultName", resourceCulture);
- }
- }
}
}
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/Properties/Resources.resx
===================================================================
diff -u -r26c61097587b8bd3d7070c1458cacd03147e4b7c -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/Properties/Resources.resx (.../Resources.resx) (revision 26c61097587b8bd3d7070c1458cacd03147e4b7c)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Data/Properties/Resources.resx (.../Resources.resx) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -126,7 +126,4 @@
Dijken en dammen - Grasbekleding erosie buitentalud
-
- Nieuwe berekening
-
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -23,7 +23,6 @@
using System.Collections;
using System.Collections.Generic;
using System.Drawing;
-using System.IO;
using System.Linq;
using System.Windows.Forms;
using Core.Common.Base;
@@ -52,9 +51,7 @@
using Ringtoets.GrassCoverErosionOutwards.Service.MessageProviders;
using Ringtoets.HydraRing.Data;
using Ringtoets.HydraRing.IO;
-using Ringtoets.Revetment.Service;
using RingtoetsGrassCoverErosionOutwardsFormsResources = Ringtoets.GrassCoverErosionOutwards.Forms.Properties.Resources;
-using RingtoetsGrassCoverErosionOutwardsDataResources = Ringtoets.GrassCoverErosionOutwards.Data.Properties.Resources;
using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
using RingtoetsCommonIoResources = Ringtoets.Common.IO.Properties.Resources;
@@ -694,7 +691,7 @@
var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation
{
Name = NamingHelper.GetUniqueName(nodeData.WrappedData.Children,
- RingtoetsGrassCoverErosionOutwardsDataResources.GrassCoverErosionOutwardsWaveConditionsCalculation_DefaultName,
+ RingtoetsCommonDataResources.Calculation_DefaultName,
c => c.Name)
};
nodeData.WrappedData.Children.Add(calculation);
Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs
===================================================================
diff -u -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3)
+++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationTest.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -23,8 +23,8 @@
using Core.Common.Base;
using NUnit.Framework;
using Ringtoets.Common.Data.Calculation;
-using Ringtoets.GrassCoverErosionOutwards.Data.Properties;
using Ringtoets.Revetment.Data;
+using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
namespace Ringtoets.GrassCoverErosionOutwards.Data.Test
{
@@ -41,7 +41,7 @@
Assert.IsInstanceOf(calculation);
Assert.IsInstanceOf(calculation);
- Assert.AreEqual(Resources.GrassCoverErosionOutwardsWaveConditionsCalculation_DefaultName, calculation.Name);
+ Assert.AreEqual(RingtoetsCommonDataResources.Calculation_DefaultName, calculation.Name);
Assert.IsNotNull(calculation.InputParameters);
Assert.IsFalse(calculation.HasOutput);
Assert.IsNull(calculation.Comments);
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresCalculation.cs
===================================================================
diff -u -rc3c2bba57ff003c569aefa73e42ac6122fcf5bfa -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresCalculation.cs (.../HeightStructuresCalculation.cs) (revision c3c2bba57ff003c569aefa73e42ac6122fcf5bfa)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/HeightStructuresCalculation.cs (.../HeightStructuresCalculation.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -22,7 +22,7 @@
using Core.Common.Base;
using Ringtoets.Common.Data.Calculation;
using Ringtoets.Common.Data.Probability;
-using Ringtoets.HeightStructures.Data.Properties;
+using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
namespace Ringtoets.HeightStructures.Data
{
@@ -37,7 +37,7 @@
public HeightStructuresCalculation()
{
InputParameters = new HeightStructuresInput();
- Name = Resources.HeightStructuresCalculation_DefaultName;
+ Name = RingtoetsCommonDataResources.Calculation_DefaultName;
}
///
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r6a35b370e2b97f2ce1ba0092c59905913a49dde0 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6a35b370e2b97f2ce1ba0092c59905913a49dde0)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -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.
@@ -82,15 +82,6 @@
}
///
- /// Looks up a localized string similar to Nieuwe berekening.
- ///
- public static string HeightStructuresCalculation_DefaultName {
- get {
- return ResourceManager.GetString("HeightStructuresCalculation_DefaultName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to HTKW.
///
public static string HeightStructuresFailureMechanism_Code {
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/Resources.resx
===================================================================
diff -u -r6a35b370e2b97f2ce1ba0092c59905913a49dde0 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/Resources.resx (.../Resources.resx) (revision 6a35b370e2b97f2ce1ba0092c59905913a49dde0)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Data/Properties/Resources.resx (.../Resources.resx) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -123,7 +123,4 @@
Kunstwerken - Hoogte kunstwerk
-
- Nieuwe berekening
-
\ No newline at end of file
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -re4e10b26e837005d099292386a004c53f168d3c0 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision e4e10b26e837005d099292386a004c53f168d3c0)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -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.
@@ -163,15 +163,6 @@
}
///
- /// Looks up a localized string similar to Invoer.
- ///
- public static string HeightStructuresInputContext_NodeDisplayName {
- get {
- return ResourceManager.GetString("HeightStructuresInputContext_NodeDisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Modelfactor voor het overslagdebiet..
///
public static string HeightStructuresInputFailureMechanismContext_ModelFactorOvertoppingFlow_Description {
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx
===================================================================
diff -u -re4e10b26e837005d099292386a004c53f168d3c0 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision e4e10b26e837005d099292386a004c53f168d3c0)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Forms/Properties/Resources.resx (.../Resources.resx) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -117,9 +117,6 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Invoer
-
Modelfactor kombergend vermogen.
Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs
===================================================================
diff -u -r2f94a4a9a4058aa718129ba8d399e5944a994070 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision 2f94a4a9a4058aa718129ba8d399e5944a994070)
+++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -48,7 +48,6 @@
using Ringtoets.HydraRing.IO;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
-using HeightStructuresDataResources = Ringtoets.HeightStructures.Data.Properties.Resources;
using HeightStructuresFormsResources = Ringtoets.HeightStructures.Forms.Properties.Resources;
using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
using RingtoetsCommonIOResources = Ringtoets.Common.IO.Properties.Resources;
@@ -117,7 +116,7 @@
yield return new TreeNodeInfo
{
- Text = inputContext => HeightStructuresFormsResources.HeightStructuresInputContext_NodeDisplayName,
+ Text = inputContext => RingtoetsCommonFormsResources.FailureMechanism_Inputs_DisplayName,
Image = inputContext => RingtoetsCommonFormsResources.GenericInputOutputIcon,
ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
.AddPropertiesItem()
@@ -460,7 +459,7 @@
{
var calculation = new HeightStructuresCalculation
{
- Name = NamingHelper.GetUniqueName(context.WrappedData.Children, HeightStructuresDataResources.HeightStructuresCalculation_DefaultName, c => c.Name)
+ Name = NamingHelper.GetUniqueName(context.WrappedData.Children, RingtoetsCommonDataResources.Calculation_DefaultName, c => c.Name)
};
context.WrappedData.Children.Add(calculation);
context.WrappedData.NotifyObservers();
Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs
===================================================================
diff -u -r6b9fda141298524c0910937dd090d82be420c52b -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs (.../HeightStructuresInputContextTreeNodeInfoTest.cs) (revision 6b9fda141298524c0910937dd090d82be420c52b)
+++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/TreeNodeInfos/HeightStructuresInputContextTreeNodeInfoTest.cs (.../HeightStructuresInputContextTreeNodeInfoTest.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -100,7 +100,7 @@
var text = info.Text(heightStructuresInputContext);
// Assert
- Assert.AreEqual(HeightStructuresFormsResources.HeightStructuresInputContext_NodeDisplayName, text);
+ Assert.AreEqual("Invoer", text);
}
[Test]
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs
===================================================================
diff -u -r1051f838aebbd5977351542027ce6330583b0d43 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs (.../PipingCalculation.cs) (revision 1051f838aebbd5977351542027ce6330583b0d43)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingCalculation.cs (.../PipingCalculation.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -22,7 +22,7 @@
using System;
using Core.Common.Base;
using Ringtoets.Common.Data.Calculation;
-using Ringtoets.Piping.Data.Properties;
+using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
namespace Ringtoets.Piping.Data
{
@@ -39,7 +39,7 @@
/// Thrown when is null.
public PipingCalculation(GeneralPipingInput generalInputParameters)
{
- Name = Resources.PipingCalculation_DefaultName;
+ Name = RingtoetsCommonDataResources.Calculation_DefaultName;
InputParameters = new PipingInput(generalInputParameters);
}
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -rd1c832128168938c7cb5ed4b1ac54382e0fc96fe -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d1c832128168938c7cb5ed4b1ac54382e0fc96fe)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -136,15 +136,6 @@
}
///
- /// Looks up a localized string similar to Nieuwe berekening.
- ///
- public static string PipingCalculation_DefaultName {
- get {
- return ResourceManager.GetString("PipingCalculation_DefaultName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to STPH.
///
public static string PipingFailureMechanism_DisplayCode {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx
===================================================================
diff -u -rd1c832128168938c7cb5ed4b1ac54382e0fc96fe -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision d1c832128168938c7cb5ed4b1ac54382e0fc96fe)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/Properties/Resources.resx (.../Resources.resx) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -117,9 +117,6 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- Nieuwe berekening
-
Slootbodem dijkzijde
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs
===================================================================
diff -u -r2973c5f790a5131e427bd5f73e2a620044199639 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 2973c5f790a5131e427bd5f73e2a620044199639)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -701,7 +701,7 @@
{
var calculation = new PipingCalculationScenario(nodeData.FailureMechanism.GeneralInput)
{
- Name = NamingHelper.GetUniqueName(nodeData.WrappedData.Children, PipingDataResources.PipingCalculation_DefaultName, c => c.Name)
+ Name = NamingHelper.GetUniqueName(nodeData.WrappedData.Children, RingtoetsCommonDataResources.Calculation_DefaultName, c => c.Name)
};
nodeData.WrappedData.Children.Add(calculation);
Index: Ringtoets/Piping/src/Ringtoets.Piping.Primitives/Properties/Resources.Designer.cs
===================================================================
diff -u -r6ff5627de1417abb8e24a22d47ad126f6e9dd77b -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/Piping/src/Ringtoets.Piping.Primitives/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 6ff5627de1417abb8e24a22d47ad126f6e9dd77b)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Primitives/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -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.
@@ -163,15 +163,6 @@
}
///
- /// Looks up a localized string similar to Nieuwe berekening.
- ///
- public static string PipingCalculation_DefaultName {
- get {
- return ResourceManager.GetString("PipingCalculation_DefaultName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to Eén of meerdere lagen hebben een top onder de bodem van de ondergrondschematisatie..
///
public static string PipingSoilProfile_Layers_Layer_top_below_profile_bottom {
Index: Ringtoets/Piping/src/Ringtoets.Piping.Primitives/Properties/Resources.resx
===================================================================
diff -u -r6ff5627de1417abb8e24a22d47ad126f6e9dd77b -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/Piping/src/Ringtoets.Piping.Primitives/Properties/Resources.resx (.../Resources.resx) (revision 6ff5627de1417abb8e24a22d47ad126f6e9dd77b)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Primitives/Properties/Resources.resx (.../Resources.resx) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -135,9 +135,6 @@
De geometrie die opgegeven werd voor de profielschematisatie heeft geen waarde.
-
- Nieuwe berekening
-
{0} De lokale coördinaat moet in het bereik [{1}, {2}] liggen.
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -ra6e0409b281c46630100de22ec860d3a3d4d8fa5 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a6e0409b281c46630100de22ec860d3a3d4d8fa5)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -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.
@@ -100,15 +100,6 @@
}
///
- /// Looks up a localized string similar to Nieuwe berekening.
- ///
- public static string StabilityPointStructuresCalculation_DefaultName {
- get {
- return ResourceManager.GetString("StabilityPointStructuresCalculation_DefaultName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to STKWp.
///
public static string StabilityPointStructuresFailureMechanism_Code {
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Properties/Resources.resx
===================================================================
diff -u -ra6e0409b281c46630100de22ec860d3a3d4d8fa5 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Properties/Resources.resx (.../Resources.resx) (revision a6e0409b281c46630100de22ec860d3a3d4d8fa5)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/Properties/Resources.resx (.../Resources.resx) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -123,9 +123,6 @@
Kwadratisch
-
- Nieuwe berekening
-
STKWp
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresCalculation.cs
===================================================================
diff -u -r2efa0fbe22fee2482e1583a7d6f5ccfdf168f660 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresCalculation.cs (.../StabilityPointStructuresCalculation.cs) (revision 2efa0fbe22fee2482e1583a7d6f5ccfdf168f660)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Data/StabilityPointStructuresCalculation.cs (.../StabilityPointStructuresCalculation.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -22,7 +22,7 @@
using Core.Common.Base;
using Ringtoets.Common.Data.Calculation;
using Ringtoets.Common.Data.Probability;
-using Ringtoets.StabilityPointStructures.Data.Properties;
+using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
namespace Ringtoets.StabilityPointStructures.Data
{
@@ -36,7 +36,7 @@
///
public StabilityPointStructuresCalculation()
{
- Name = Resources.StabilityPointStructuresCalculation_DefaultName;
+ Name = RingtoetsCommonDataResources.Calculation_DefaultName;
InputParameters = new StabilityPointStructuresInput();
}
Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs
===================================================================
diff -u -rb70abd70f1cd326d1a753c5879a065149ac2ae84 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision b70abd70f1cd326d1a753c5879a065149ac2ae84)
+++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -41,7 +41,6 @@
using Ringtoets.StabilityPointStructures.Plugin.Properties;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
-using StabilityPointStructuresDataResources = Ringtoets.StabilityPointStructures.Data.Properties.Resources;
using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
using RingtoetsCommonIOResources = Ringtoets.Common.IO.Properties.Resources;
@@ -398,7 +397,7 @@
{
var calculation = new StabilityPointStructuresCalculation
{
- Name = NamingHelper.GetUniqueName(context.WrappedData.Children, StabilityPointStructuresDataResources.StabilityPointStructuresCalculation_DefaultName, c => c.Name)
+ Name = NamingHelper.GetUniqueName(context.WrappedData.Children, RingtoetsCommonDataResources.Calculation_DefaultName, c => c.Name)
};
context.WrappedData.Children.Add(calculation);
context.WrappedData.NotifyObservers();
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r0d98073e4ba2bdc6b69b7f875508488d1fa0148a -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 0d98073e4ba2bdc6b69b7f875508488d1fa0148a)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -22,7 +22,7 @@
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
-// Runtime Version:4.0.30319.18444
+// Runtime Version:4.0.30319.17929
//
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
@@ -98,14 +98,5 @@
return ResourceManager.GetString("StabilityStoneCoverFailureMechanism_DisplayName", resourceCulture);
}
}
-
- ///
- /// Looks up a localized string similar to Nieuwe berekening.
- ///
- public static string StabilityStoneCoverWaveConditionsCalculation_DefaultName {
- get {
- return ResourceManager.GetString("StabilityStoneCoverWaveConditionsCalculation_DefaultName", resourceCulture);
- }
- }
}
}
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/Properties/Resources.resx
===================================================================
diff -u -rb5a0b841029bd7b3639328aab27707477bdc3d12 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/Properties/Resources.resx (.../Resources.resx) (revision b5a0b841029bd7b3639328aab27707477bdc3d12)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/Properties/Resources.resx (.../Resources.resx) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -123,7 +123,4 @@
Dijken en dammen - Stabiliteit steenzetting
-
- Nieuwe berekening
-
\ No newline at end of file
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverWaveConditionsCalculation.cs
===================================================================
diff -u -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverWaveConditionsCalculation.cs (.../StabilityStoneCoverWaveConditionsCalculation.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Data/StabilityStoneCoverWaveConditionsCalculation.cs (.../StabilityStoneCoverWaveConditionsCalculation.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -22,7 +22,7 @@
using Core.Common.Base;
using Ringtoets.Common.Data.Calculation;
using Ringtoets.Revetment.Data;
-using Ringtoets.StabilityStoneCover.Data.Properties;
+using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
namespace Ringtoets.StabilityStoneCover.Data
{
@@ -36,7 +36,7 @@
///
public StabilityStoneCoverWaveConditionsCalculation()
{
- Name = Resources.StabilityStoneCoverWaveConditionsCalculation_DefaultName;
+ Name = RingtoetsCommonDataResources.Calculation_DefaultName;
InputParameters = new WaveConditionsInput();
}
Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs
===================================================================
diff -u -r7164a642dc83ca7a1fd78513cbff9da53c052602 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 7164a642dc83ca7a1fd78513cbff9da53c052602)
+++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -22,7 +22,6 @@
using System.Collections;
using System.Collections.Generic;
using System.Drawing;
-using System.IO;
using System.Linq;
using System.Windows.Forms;
using Core.Common.Controls.TreeView;
@@ -38,7 +37,6 @@
using Ringtoets.Common.Forms.TreeNodeInfos;
using Ringtoets.HydraRing.Data;
using Ringtoets.HydraRing.IO;
-using Ringtoets.Revetment.Service;
using Ringtoets.StabilityStoneCover.Data;
using Ringtoets.StabilityStoneCover.Forms;
using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
@@ -48,7 +46,6 @@
using Ringtoets.StabilityStoneCover.Service;
using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
-using StabilityStoneCoverDataResources = Ringtoets.StabilityStoneCover.Data.Properties.Resources;
using StabilityStoneCoverFormsResources = Ringtoets.StabilityStoneCover.Forms.Properties.Resources;
using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
using RingtoetsRevetmentServiceResources = Ringtoets.Revetment.Service.Properties.Resources;
@@ -413,7 +410,7 @@
var calculation = new StabilityStoneCoverWaveConditionsCalculation
{
Name = NamingHelper.GetUniqueName(nodeData.WrappedData.Children,
- StabilityStoneCoverDataResources.StabilityStoneCoverWaveConditionsCalculation_DefaultName,
+ RingtoetsCommonDataResources.Calculation_DefaultName,
c => c.Name)
};
nodeData.WrappedData.Children.Add(calculation);
Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs
===================================================================
diff -u -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3)
+++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsCalculationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationTest.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -24,7 +24,6 @@
using NUnit.Framework;
using Ringtoets.Common.Data.Calculation;
using Ringtoets.Revetment.Data;
-using Ringtoets.StabilityStoneCover.Data.Properties;
namespace Ringtoets.StabilityStoneCover.Data.Test
{
@@ -41,7 +40,7 @@
Assert.IsInstanceOf(calculation);
Assert.IsInstanceOf(calculation);
- Assert.AreEqual(Resources.StabilityStoneCoverWaveConditionsCalculation_DefaultName, calculation.Name);
+ Assert.AreEqual("Nieuwe berekening", calculation.Name);
Assert.IsNotNull(calculation.InputParameters);
Assert.IsFalse(calculation.HasOutput);
Assert.IsNull(calculation.Comments);
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r047a56dd0274ea50de6f06ebad47fbe75ba86ba5 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 047a56dd0274ea50de6f06ebad47fbe75ba86ba5)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -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.
@@ -98,14 +98,5 @@
return ResourceManager.GetString("WaveImpactAsphaltCoverFailureMechanism_DisplayName", resourceCulture);
}
}
-
- ///
- /// Looks up a localized string similar to Nieuwe berekening.
- ///
- public static string WaveImpactAsphaltCoverWaveConditionsCalculation_DefaultName {
- get {
- return ResourceManager.GetString("WaveImpactAsphaltCoverWaveConditionsCalculation_DefaultName", resourceCulture);
- }
- }
}
}
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/Properties/Resources.resx
===================================================================
diff -u -ra481b019d025f649cd52d4714aebcf7d323d0ecb -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/Properties/Resources.resx (.../Resources.resx) (revision a481b019d025f649cd52d4714aebcf7d323d0ecb)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/Properties/Resources.resx (.../Resources.resx) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -123,7 +123,4 @@
Dijken en dammen - Golfklappen op asfaltbekleding
-
- Nieuwe berekening
-
\ No newline at end of file
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsCalculation.cs
===================================================================
diff -u -r2973c5f790a5131e427bd5f73e2a620044199639 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsCalculation.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculation.cs) (revision 2973c5f790a5131e427bd5f73e2a620044199639)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Data/WaveImpactAsphaltCoverWaveConditionsCalculation.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculation.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -22,7 +22,7 @@
using Core.Common.Base;
using Ringtoets.Common.Data.Calculation;
using Ringtoets.Revetment.Data;
-using Ringtoets.WaveImpactAsphaltCover.Data.Properties;
+using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
namespace Ringtoets.WaveImpactAsphaltCover.Data
{
@@ -36,7 +36,7 @@
///
public WaveImpactAsphaltCoverWaveConditionsCalculation()
{
- Name = Resources.WaveImpactAsphaltCoverWaveConditionsCalculation_DefaultName;
+ Name = RingtoetsCommonDataResources.Calculation_DefaultName;
InputParameters = new WaveConditionsInput();
}
Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs
===================================================================
diff -u -r02670d8c9fceeaea5f829937a2eb269f3488c6b1 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 02670d8c9fceeaea5f829937a2eb269f3488c6b1)
+++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -22,7 +22,6 @@
using System.Collections;
using System.Collections.Generic;
using System.Drawing;
-using System.IO;
using System.Linq;
using System.Windows.Forms;
using Core.Common.Controls.TreeView;
@@ -38,18 +37,17 @@
using Ringtoets.Common.Forms.TreeNodeInfos;
using Ringtoets.HydraRing.Data;
using Ringtoets.HydraRing.IO;
-using Ringtoets.Revetment.Service;
using Ringtoets.WaveImpactAsphaltCover.Data;
using Ringtoets.WaveImpactAsphaltCover.Forms;
using Ringtoets.WaveImpactAsphaltCover.Forms.PresentationObjects;
using Ringtoets.WaveImpactAsphaltCover.Forms.PropertyClasses;
using Ringtoets.WaveImpactAsphaltCover.Forms.Views;
using Ringtoets.WaveImpactAsphaltCover.IO;
using Ringtoets.WaveImpactAsphaltCover.Service;
+using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
using RingtoetsRevetmentServiceResources = Ringtoets.Revetment.Service.Properties.Resources;
-using WaveImpactAsphaltCoverDataResources = Ringtoets.WaveImpactAsphaltCover.Data.Properties.Resources;
namespace Ringtoets.WaveImpactAsphaltCover.Plugin
{
@@ -418,7 +416,7 @@
var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation
{
Name = NamingHelper.GetUniqueName(nodeData.WrappedData.Children,
- WaveImpactAsphaltCoverDataResources.WaveImpactAsphaltCoverWaveConditionsCalculation_DefaultName,
+ RingtoetsCommonDataResources.Calculation_DefaultName,
c => c.Name)
};
nodeData.WrappedData.Children.Add(calculation);
Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs
===================================================================
diff -u -rf53b435bc3cb5fb70ffac3844ae56e90373cf4d3 -r98929f84fbf311bd19d8e61cc8499cdb40b22ea0
--- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs) (revision f53b435bc3cb5fb70ffac3844ae56e90373cf4d3)
+++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationTest.cs) (revision 98929f84fbf311bd19d8e61cc8499cdb40b22ea0)
@@ -24,7 +24,6 @@
using NUnit.Framework;
using Ringtoets.Common.Data.Calculation;
using Ringtoets.Revetment.Data;
-using Ringtoets.WaveImpactAsphaltCover.Data.Properties;
namespace Ringtoets.WaveImpactAsphaltCover.Data.Test
{
@@ -41,7 +40,7 @@
Assert.IsInstanceOf(calculation);
Assert.IsInstanceOf(calculation);
- Assert.AreEqual(Resources.WaveImpactAsphaltCoverWaveConditionsCalculation_DefaultName, calculation.Name);
+ Assert.AreEqual("Nieuwe berekening", calculation.Name);
Assert.IsNotNull(calculation.InputParameters);
Assert.IsFalse(calculation.HasOutput);
Assert.IsNull(calculation.Comments);