Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/PipingPlugin.cs =================================================================== diff -u -r97146c91bad15a5bbe0aa62b7aac588c35ad724d -rcbf104c75fe0dda56a0eab7a5f7ff60c89d8c112 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 97146c91bad15a5bbe0aa62b7aac588c35ad724d) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision cbf104c75fe0dda56a0eab7a5f7ff60c89d8c112) @@ -43,21 +43,21 @@ using Ringtoets.Common.Forms.TreeNodeInfos; using Ringtoets.Common.IO.FileImporters.MessageProviders; using Ringtoets.Common.Service; -using Ringtoets.Piping.Data; -using Ringtoets.Piping.Forms; -using Ringtoets.Piping.Forms.PresentationObjects; -using Ringtoets.Piping.Forms.PropertyClasses; -using Ringtoets.Piping.Forms.Views; -using Ringtoets.Piping.IO.Exporters; -using Ringtoets.Piping.IO.Importers; -using Ringtoets.Piping.Plugin.FileImporter; -using Ringtoets.Piping.Plugin.Properties; -using Ringtoets.Piping.Primitives; -using Ringtoets.Piping.Service; +using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Forms; +using Ringtoets.MacroStabilityInwards.Forms.PresentationObjects; +using Ringtoets.MacroStabilityInwards.Forms.PropertyClasses; +using Ringtoets.MacroStabilityInwards.Forms.Views; +using Ringtoets.MacroStabilityInwards.IO.Exporters; +using Ringtoets.MacroStabilityInwards.IO.Importers; +using Ringtoets.MacroStabilityInwards.Plugin.FileImporter; +using Ringtoets.MacroStabilityInwards.Plugin.Properties; +using Ringtoets.MacroStabilityInwards.Primitives; +using Ringtoets.MacroStabilityInwards.Service; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources; -using PipingDataResources = Ringtoets.Piping.Data.Properties.Resources; -using PipingFormsResources = Ringtoets.Piping.Forms.Properties.Resources; +using MacroStabilityInwardsDataResources = Ringtoets.MacroStabilityInwards.Data.Properties.Resources; +using MacroStabilityInwardsFormsResources = Ringtoets.MacroStabilityInwards.Forms.Properties.Resources; namespace Ringtoets.MacroStabilityInwards.Plugin { @@ -102,9 +102,9 @@ { yield return new ImportInfo { - Name = PipingDataResources.PipingSurfaceLineCollection_TypeDescriptor, + Name = MacroStabilityInwardsDataResources.PipingSurfaceLineCollection_TypeDescriptor, Category = RingtoetsCommonFormsResources.Ringtoets_Category, - Image = PipingFormsResources.PipingSurfaceLineIcon, + Image = MacroStabilityInwardsFormsResources.PipingSurfaceLineIcon, FileFilterGenerator = RingtoetsPipingSurfaceLineFileFilter, IsEnabled = context => context.AssessmentSection.ReferenceLine != null, CreateFileImporter = (context, filePath) => PipingSurfaceLinesCsvImporter(context, filePath, new ImportMessageProvider(), new RingtoetsPipingSurfaceLineReplaceDataStrategy(context.FailureMechanism)), @@ -113,9 +113,9 @@ yield return new ImportInfo { - Name = PipingDataResources.StochasticSoilModelCollection_TypeDescriptor, + Name = MacroStabilityInwardsDataResources.StochasticSoilModelCollection_TypeDescriptor, Category = RingtoetsCommonFormsResources.Ringtoets_Category, - Image = PipingFormsResources.PipingSoilProfileIcon, + Image = MacroStabilityInwardsFormsResources.PipingSoilProfileIcon, FileFilterGenerator = StochasticSoilModelFileFilter, IsEnabled = context => context.AssessmentSection.ReferenceLine != null, CreateFileImporter = (context, filePath) => StochasticSoilModelImporter(context, filePath, new ImportMessageProvider(), new StochasticSoilModelReplaceDataStrategy(context.FailureMechanism)), @@ -148,9 +148,9 @@ { yield return new UpdateInfo { - Name = PipingDataResources.PipingSurfaceLineCollection_TypeDescriptor, + Name = MacroStabilityInwardsDataResources.PipingSurfaceLineCollection_TypeDescriptor, Category = RingtoetsCommonFormsResources.Ringtoets_Category, - Image = PipingFormsResources.PipingSurfaceLineIcon, + Image = MacroStabilityInwardsFormsResources.PipingSurfaceLineIcon, FileFilterGenerator = RingtoetsPipingSurfaceLineFileFilter, IsEnabled = context => context.WrappedData.SourcePath != null, CurrentPath = context => context.WrappedData.SourcePath, @@ -160,9 +160,9 @@ yield return new UpdateInfo { - Name = PipingDataResources.StochasticSoilModelCollection_TypeDescriptor, + Name = MacroStabilityInwardsDataResources.StochasticSoilModelCollection_TypeDescriptor, Category = RingtoetsCommonFormsResources.Ringtoets_Category, - Image = PipingFormsResources.PipingSoilProfileIcon, + Image = MacroStabilityInwardsFormsResources.PipingSoilProfileIcon, FileFilterGenerator = StochasticSoilModelFileFilter, IsEnabled = context => context.WrappedData.SourcePath != null, CurrentPath = context => context.WrappedData.SourcePath, @@ -211,7 +211,7 @@ { GetViewData = context => context.PipingCalculation, GetViewName = (view, input) => RingtoetsCommonFormsResources.Calculation_Input, - Image = PipingFormsResources.PipingInputIcon, + Image = MacroStabilityInwardsFormsResources.PipingInputIcon, CloseForData = ClosePipingInputViewForData }; @@ -256,7 +256,7 @@ yield return new TreeNodeInfo { Text = pipingInputContext => RingtoetsCommonFormsResources.Calculation_Input, - Image = pipingInputContext => PipingFormsResources.PipingInputIcon, + Image = pipingInputContext => MacroStabilityInwardsFormsResources.PipingInputIcon, ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) .AddOpenItem() .AddSeparator() @@ -266,7 +266,7 @@ yield return new TreeNodeInfo { - Text = ringtoetsPipingSurfaceLine => PipingDataResources.PipingSurfaceLineCollection_TypeDescriptor, + Text = ringtoetsPipingSurfaceLine => MacroStabilityInwardsDataResources.PipingSurfaceLineCollection_TypeDescriptor, Image = ringtoetsPipingSurfaceLine => RingtoetsCommonFormsResources.GeneralFolderIcon, ForeColor = ringtoetsPipingSurfaceLine => ringtoetsPipingSurfaceLine.WrappedData.Any() ? Color.FromKnownColor(KnownColor.ControlText) : Color.FromKnownColor(KnownColor.GrayText), ChildNodeObjects = ringtoetsPipingSurfaceLine => ringtoetsPipingSurfaceLine.WrappedData.Cast().ToArray(), @@ -276,7 +276,7 @@ yield return new TreeNodeInfo { Text = pipingSurfaceLine => pipingSurfaceLine.Name, - Image = pipingSurfaceLine => PipingFormsResources.PipingSurfaceLineIcon, + Image = pipingSurfaceLine => MacroStabilityInwardsFormsResources.PipingSurfaceLineIcon, ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) .AddSeparator() .AddPropertiesItem() @@ -285,7 +285,7 @@ yield return new TreeNodeInfo { - Text = stochasticSoilModelContext => PipingDataResources.StochasticSoilModelCollection_TypeDescriptor, + Text = stochasticSoilModelContext => MacroStabilityInwardsDataResources.StochasticSoilModelCollection_TypeDescriptor, Image = stochasticSoilModelContext => RingtoetsCommonFormsResources.GeneralFolderIcon, ForeColor = stochasticSoilModelContext => stochasticSoilModelContext.WrappedData.Any() ? Color.FromKnownColor(KnownColor.ControlText) : Color.FromKnownColor(KnownColor.GrayText), @@ -296,7 +296,7 @@ yield return new TreeNodeInfo { Text = stochasticSoilModel => stochasticSoilModel.Name, - Image = stochasticSoilModel => PipingFormsResources.StochasticSoilModelIcon, + Image = stochasticSoilModel => MacroStabilityInwardsFormsResources.StochasticSoilModelIcon, ChildNodeObjects = stochasticSoilModel => stochasticSoilModel.StochasticSoilProfiles.Cast().ToArray(), ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) .AddCollapseAllItem() @@ -309,7 +309,7 @@ yield return new TreeNodeInfo { Text = pipingSoilProfile => pipingSoilProfile.SoilProfile != null ? pipingSoilProfile.SoilProfile.Name : "Profile", - Image = pipingSoilProfile => PipingFormsResources.PipingSoilProfileIcon, + Image = pipingSoilProfile => MacroStabilityInwardsFormsResources.PipingSoilProfileIcon, ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl) .AddPropertiesItem() .Build() @@ -970,8 +970,8 @@ bool surfaceLineAvailable = nodeData.AvailablePipingSurfaceLines.Any() && nodeData.AvailableStochasticSoilModels.Any(); string pipingCalculationGroupGeneratePipingCalculationsToolTip = surfaceLineAvailable - ? PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations_ToolTip - : PipingFormsResources.PipingCalculationGroup_Generate_PipingCalculations_NoSurfaceLinesOrSoilModels_ToolTip; + ? MacroStabilityInwardsFormsResources.PipingCalculationGroup_Generate_PipingCalculations_ToolTip + : MacroStabilityInwardsFormsResources.PipingCalculationGroup_Generate_PipingCalculations_NoSurfaceLinesOrSoilModels_ToolTip; return new StrictContextMenuItem( RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios, @@ -1080,7 +1080,7 @@ { return new FileFilterGenerator( RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Extension, - $"{PipingDataResources.PipingSurfaceLineCollection_TypeDescriptor} {RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Description}"); + $"{MacroStabilityInwardsDataResources.PipingSurfaceLineCollection_TypeDescriptor} {RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Description}"); } }