Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision b3af39ba024b8e12fe238d85130697255db28c59) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6) @@ -35,6 +35,8 @@ using Core.Common.IO.Exceptions; using Core.Common.Utils.Extensions; using log4net; +using Ringtoets.ClosingStructures.Data; +using Ringtoets.ClosingStructures.Forms.Views; using Ringtoets.Common.Data; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Calculation; @@ -52,7 +54,6 @@ using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects; using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects; -using Ringtoets.GrassCoverErosionOutwards.Plugin; using Ringtoets.HeightStructures.Data; using Ringtoets.HeightStructures.Forms.PresentationObjects; using Ringtoets.HydraRing.Data; @@ -66,13 +67,10 @@ using Ringtoets.Integration.Forms.Views; using Ringtoets.Integration.Forms.Views.SectionResultViews; using Ringtoets.Integration.Plugin.FileImporters; -using Ringtoets.Integration.Plugin.Properties; using Ringtoets.Integration.Service; using Ringtoets.Integration.Service.MessageProviders; using Ringtoets.Piping.Data; using Ringtoets.Piping.Forms.PresentationObjects; -using Ringtoets.Revetment.Forms.PresentationObjects; -using Ringtoets.Revetment.Forms.PropertyClasses; using Ringtoets.StabilityStoneCover.Data; using Ringtoets.StabilityStoneCover.Forms.PresentationObjects; using Ringtoets.WaveImpactAsphaltCover.Data; @@ -386,7 +384,7 @@ yield return new ViewInfo, ICommentable, CommentView> { - GetViewName = (v, o) => Resources.Comment_DisplayName, + GetViewName = (v, o) => RingtoetsIntegrationPluginResources.Comment_DisplayName, GetViewData = context => context.WrappedData, Image = RingtoetsCommonFormsResources.EditDocumentIcon, CloseForData = CloseCommentViewForData @@ -418,8 +416,8 @@ yield return new ImportInfo { CreateFileImporter = (context, filePath) => new ForeshoreProfilesImporter(context.WrappedData, - context.ParentAssessmentSection.ReferenceLine, - filePath), + context.ParentAssessmentSection.ReferenceLine, + filePath), Name = RingtoetsIntegrationPluginResources.ForeshoreProfilesImporter_DisplayName, Category = RingtoetsCommonFormsResources.Ringtoets_Category, Image = RingtoetsIntegrationPluginResources.Foreshore, @@ -452,8 +450,8 @@ yield return new ExportInfo { CreateFileExporter = (context, filePath) => new HydraulicBoundaryLocationsExporter( - context.WrappedData.HydraulicBoundaryDatabase.Locations, filePath, - Resources.DesignWaterLevel_Description, Resources.WaveHeight_Description), + context.WrappedData.HydraulicBoundaryDatabase.Locations, filePath, + RingtoetsIntegrationPluginResources.DesignWaterLevel_Description, RingtoetsIntegrationPluginResources.WaveHeight_Description), IsEnabled = context => context.WrappedData.HydraulicBoundaryDatabase != null, FileFilter = RingtoetsCommonIoResources.DataTypeDisplayName_shape_file_filter }; @@ -608,7 +606,7 @@ yield return new TreeNodeInfo { Text = foreshoreProfile => foreshoreProfile.Name, - Image = context => Resources.Foreshore, + Image = context => RingtoetsIntegrationPluginResources.Foreshore, ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) .AddPropertiesItem() .Build() @@ -629,7 +627,7 @@ yield return new TreeNodeInfo> { - Text = comment => Resources.Comment_DisplayName, + Text = comment => RingtoetsIntegrationPluginResources.Comment_DisplayName, Image = context => RingtoetsCommonFormsResources.EditDocumentIcon, ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) .AddOpenItem() @@ -1148,7 +1146,7 @@ bool successfulCalculation = hydraulicBoundaryLocationCalculationGuiService.CalculateDesignWaterLevels(assessmentSection.HydraulicBoundaryDatabase.FilePath, assessmentSection.HydraulicBoundaryDatabase.Locations, assessmentSection.Id, - assessmentSection.FailureMechanismContribution.Norm, + assessmentSection.FailureMechanismContribution.Norm, new DesignWaterLevelCalculationMessageProvider()); if (successfulCalculation) { @@ -1185,10 +1183,10 @@ } IAssessmentSection assessmentSection = nodeData.WrappedData; bool successfulCalculation = hydraulicBoundaryLocationCalculationGuiService.CalculateWaveHeights(assessmentSection.HydraulicBoundaryDatabase.FilePath, - assessmentSection.HydraulicBoundaryDatabase.Locations, - assessmentSection.Id, - assessmentSection.FailureMechanismContribution.Norm, - new WaveHeightCalculationMessageProvider()); + assessmentSection.HydraulicBoundaryDatabase.Locations, + assessmentSection.Id, + assessmentSection.FailureMechanismContribution.Norm, + new WaveHeightCalculationMessageProvider()); if (successfulCalculation) { nodeData.NotifyObservers();