Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/HydraulicBoundaryDatabaseContext.cs
===================================================================
diff -u -rc114776ae9eae9848dd5841211bbe2105ae57dc7 -r70469282dce77d4fc9da5a17b13679bbe579c586
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/HydraulicBoundaryDatabaseContext.cs (.../HydraulicBoundaryDatabaseContext.cs) (revision c114776ae9eae9848dd5841211bbe2105ae57dc7)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/HydraulicBoundaryDatabaseContext.cs (.../HydraulicBoundaryDatabaseContext.cs) (revision 70469282dce77d4fc9da5a17b13679bbe579c586)
@@ -39,7 +39,8 @@
/// The that the belongs to.
/// Thrown when any parameter is null.
public HydraulicBoundaryDatabaseContext(HydraulicBoundaryDatabase wrappedData,
- AssessmentSection assessmentSection) : base(wrappedData)
+ AssessmentSection assessmentSection)
+ : base(wrappedData)
{
if (assessmentSection == null)
{
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -re7a8412d2e46f508cd5653810d5a28f13cceeb9a -r70469282dce77d4fc9da5a17b13679bbe579c586
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision e7a8412d2e46f508cd5653810d5a28f13cceeb9a)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 70469282dce77d4fc9da5a17b13679bbe579c586)
@@ -88,6 +88,7 @@
using Ringtoets.Integration.IO.Exporters;
using Ringtoets.Integration.Plugin.FileImporters;
using Ringtoets.Integration.Plugin.Handlers;
+using Ringtoets.Integration.Plugin.Properties;
using Ringtoets.Integration.Service;
using Ringtoets.Integration.Service.MessageProviders;
using Ringtoets.MacroStabilityInwards.Data;
@@ -111,7 +112,6 @@
using RingtoetsCommonIOResources = Ringtoets.Common.IO.Properties.Resources;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
-using RingtoetsIntegrationPluginResources = Ringtoets.Integration.Plugin.Properties.Resources;
using BaseResources = Core.Common.Base.Properties.Resources;
using GuiResources = Core.Common.Gui.Properties.Resources;
@@ -531,7 +531,7 @@
yield return new ViewInfo
{
- GetViewName = (view, comment) => RingtoetsIntegrationPluginResources.Comment_DisplayName,
+ GetViewName = (view, comment) => Resources.Comment_DisplayName,
GetViewData = comment => comment,
Image = RingtoetsCommonFormsResources.EditDocumentIcon,
CloseForData = CloseCommentViewForData
@@ -601,12 +601,12 @@
new ForeshoreProfileReplaceDataStrategy(context.ParentFailureMechanism,
context.WrappedData),
new ImportMessageProvider()),
- Name = RingtoetsIntegrationPluginResources.ForeshoreProfilesImporter_DisplayName,
+ Name = Resources.ForeshoreProfilesImporter_DisplayName,
Category = RingtoetsCommonFormsResources.Ringtoets_Category,
- Image = RingtoetsIntegrationPluginResources.Foreshore,
+ Image = Resources.Foreshore,
FileFilterGenerator = CreateForeshoreProfileFileFilterGenerator,
IsEnabled = context => context.ParentAssessmentSection.ReferenceLine != null,
- VerifyUpdates = context => VerifyForeshoreProfileUpdates(context, RingtoetsIntegrationPluginResources.RingtoetsPlugin_VerifyForeshoreProfileUpdates_When_importing_ForeshoreProfile_definitions_assigned_to_calculations_output_will_be_cleared_confirm)
+ VerifyUpdates = context => VerifyForeshoreProfileUpdates(context, Resources.RingtoetsPlugin_VerifyForeshoreProfileUpdates_When_importing_ForeshoreProfile_definitions_assigned_to_calculations_output_will_be_cleared_confirm)
};
}
@@ -641,13 +641,13 @@
filePath,
new ForeshoreProfileUpdateDataStrategy(context.ParentFailureMechanism, context.WrappedData),
new UpdateMessageProvider()),
- Name = RingtoetsIntegrationPluginResources.ForeshoreProfilesImporter_DisplayName,
+ Name = Resources.ForeshoreProfilesImporter_DisplayName,
Category = RingtoetsCommonFormsResources.Ringtoets_Category,
- Image = RingtoetsIntegrationPluginResources.Foreshore,
+ Image = Resources.Foreshore,
FileFilterGenerator = CreateForeshoreProfileFileFilterGenerator,
CurrentPath = context => context.WrappedData.SourcePath,
IsEnabled = context => context.WrappedData.SourcePath != null,
- VerifyUpdates = context => VerifyForeshoreProfileUpdates(context, RingtoetsIntegrationPluginResources.RingtoetsPlugin_VerifyForeshoreProfileUpdates_When_updating_ForeshoreProfile_definitions_assigned_to_calculations_output_will_be_cleared_confirm)
+ VerifyUpdates = context => VerifyForeshoreProfileUpdates(context, Resources.RingtoetsPlugin_VerifyForeshoreProfileUpdates_When_updating_ForeshoreProfile_definitions_assigned_to_calculations_output_will_be_cleared_confirm)
};
}
@@ -695,7 +695,7 @@
yield return new TreeNodeInfo
{
- Text = data => RingtoetsIntegrationPluginResources.RingtoetsPlugin_BackgroundDataContext_Text,
+ Text = data => Resources.RingtoetsPlugin_BackgroundDataContext_Text,
Image = data => RingtoetsFormsResources.Map,
ContextMenuStrip = BackgroundDataMenuStrip,
ForeColor = data =>
@@ -848,7 +848,7 @@
yield return new TreeNodeInfo
{
Text = foreshoreProfile => foreshoreProfile.Name,
- Image = context => RingtoetsIntegrationPluginResources.Foreshore,
+ Image = context => Resources.Foreshore,
ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
.AddPropertiesItem()
.Build()
@@ -873,7 +873,7 @@
yield return new TreeNodeInfo
{
- Text = comment => RingtoetsIntegrationPluginResources.Comment_DisplayName,
+ Text = comment => Resources.Comment_DisplayName,
Image = context => RingtoetsCommonFormsResources.EditDocumentIcon,
ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
.AddOpenItem()
@@ -1296,8 +1296,8 @@
var assessmentSection = parentData as IAssessmentSection;
var mapDataItem = new StrictContextMenuItem(
- RingtoetsIntegrationPluginResources.BackgroundData_SelectMapData,
- RingtoetsIntegrationPluginResources.BackgroundData_SelectMapData_Tooltip,
+ Resources.BackgroundData_SelectMapData,
+ Resources.BackgroundData_SelectMapData_Tooltip,
RingtoetsCommonFormsResources.MapsIcon, (sender, args) => SelectMapData(assessmentSection, nodeData));
return Gui.Get(nodeData, treeViewControl)
@@ -1963,19 +1963,19 @@
new DesignWaterLevelCalculationsContext(context.AssessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm,
context.AssessmentSection,
() => GetFirstHydraulicBoundaryNorm(context.AssessmentSection),
- RingtoetsIntegrationPluginResources.Hydraulic_category_boundary_name_1),
+ Resources.Hydraulic_category_boundary_name_1),
new DesignWaterLevelCalculationsContext(context.AssessmentSection.WaterLevelCalculationsForSignalingNorm,
context.AssessmentSection,
() => GetSecondHydraulicBoundaryNorm(context.AssessmentSection),
- RingtoetsIntegrationPluginResources.Hydraulic_category_boundary_name_2),
+ Resources.Hydraulic_category_boundary_name_2),
new DesignWaterLevelCalculationsContext(context.AssessmentSection.WaterLevelCalculationsForLowerLimitNorm,
context.AssessmentSection,
() => GetThirdHydraulicBoundaryNorm(context.AssessmentSection),
- RingtoetsIntegrationPluginResources.Hydraulic_category_boundary_name_3),
+ Resources.Hydraulic_category_boundary_name_3),
new DesignWaterLevelCalculationsContext(context.AssessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm,
context.AssessmentSection,
() => GetFourthHydraulicBoundaryNorm(context.AssessmentSection),
- RingtoetsIntegrationPluginResources.Hydraulic_category_boundary_name_4)
+ Resources.Hydraulic_category_boundary_name_4)
};
}
@@ -1986,19 +1986,19 @@
new WaveHeightCalculationsContext(context.AssessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm,
context.AssessmentSection,
() => GetFirstHydraulicBoundaryNorm(context.AssessmentSection),
- RingtoetsIntegrationPluginResources.Hydraulic_category_boundary_name_1),
+ Resources.Hydraulic_category_boundary_name_1),
new WaveHeightCalculationsContext(context.AssessmentSection.WaveHeightCalculationsForSignalingNorm,
context.AssessmentSection,
() => GetSecondHydraulicBoundaryNorm(context.AssessmentSection),
- RingtoetsIntegrationPluginResources.Hydraulic_category_boundary_name_2),
+ Resources.Hydraulic_category_boundary_name_2),
new WaveHeightCalculationsContext(context.AssessmentSection.WaveHeightCalculationsForLowerLimitNorm,
context.AssessmentSection,
() => GetThirdHydraulicBoundaryNorm(context.AssessmentSection),
- RingtoetsIntegrationPluginResources.Hydraulic_category_boundary_name_3),
+ Resources.Hydraulic_category_boundary_name_3),
new WaveHeightCalculationsContext(context.AssessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm,
context.AssessmentSection,
() => GetFourthHydraulicBoundaryNorm(context.AssessmentSection),
- RingtoetsIntegrationPluginResources.Hydraulic_category_boundary_name_4)
+ Resources.Hydraulic_category_boundary_name_4)
};
}