Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs =================================================================== diff -u -ra0a4f674b6a6c0066b05a6d2ba454204369ebd63 -rdfe649292c68391f773d01a0ec9e9950a04e031e --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs (.../PipingConfigurationImporter.cs) (revision a0a4f674b6a6c0066b05a6d2ba454204369ebd63) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Importers/PipingConfigurationImporter.cs (.../PipingConfigurationImporter.cs) (revision dfe649292c68391f773d01a0ec9e9950a04e031e) @@ -265,7 +265,8 @@ /// which is not available in the failure mechanism. /// The does not intersect with the /// when this is set. - /// + /// + /// private void ReadStochasticSoilModel(ReadPipingCalculation readCalculation, PipingCalculationScenario pipingCalculation) { if (readCalculation.StochasticSoilModel != null) @@ -320,8 +321,8 @@ } else { - throw new CriticalFileValidationException(string.Format(Resources.PipingConfigurationImporter_ReadStochasticSoilProfile_Stochastic_soil_profile_0_does_not_exist, - readCalculation.StochasticSoilProfile)); + throw new CriticalFileValidationException(string.Format(Resources.PipingConfigurationImporter_ReadStochasticSoilProfile_Stochastic_soil_profile_0_does_not_exist_within_soil_model_1, + readCalculation.StochasticSoilProfile, readCalculation.StochasticSoilModel)); } } } Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs =================================================================== diff -u -ra0a4f674b6a6c0066b05a6d2ba454204369ebd63 -rdfe649292c68391f773d01a0ec9e9950a04e031e --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision a0a4f674b6a6c0066b05a6d2ba454204369ebd63) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision dfe649292c68391f773d01a0ec9e9950a04e031e) @@ -271,12 +271,12 @@ } /// - /// Looks up a localized string similar to De ondergrondschematisatie '{0}' bestaat niet.. + /// Looks up a localized string similar to De ondergrondschematisatie '{0}' bestaat niet binnen het stochastische ondergrondmodel '{1}'.. /// - public static string PipingConfigurationImporter_ReadStochasticSoilProfile_Stochastic_soil_profile_0_does_not_exist { + public static string PipingConfigurationImporter_ReadStochasticSoilProfile_Stochastic_soil_profile_0_does_not_exist_within_soil_model_1 { get { return ResourceManager.GetString("PipingConfigurationImporter_ReadStochasticSoilProfile_Stochastic_soil_profile_0_d" + - "oes_not_exist", resourceCulture); + "oes_not_exist_within_soil_model_1", resourceCulture); } } Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx =================================================================== diff -u -ra0a4f674b6a6c0066b05a6d2ba454204369ebd63 -rdfe649292c68391f773d01a0ec9e9950a04e031e --- Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx (.../Resources.resx) (revision a0a4f674b6a6c0066b05a6d2ba454204369ebd63) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Properties/Resources.resx (.../Resources.resx) (revision dfe649292c68391f773d01a0ec9e9950a04e031e) @@ -309,8 +309,8 @@ Het stochastische ondergrondmodel '{0}' bestaat niet. - - De ondergrondschematisatie '{0}' bestaat niet. + + De ondergrondschematisatie '{0}' bestaat niet binnen het stochastische ondergrondmodel '{1}'. Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -rcfa21301665f4ca7122f6065fd83fad20b96843e -rdfe649292c68391f773d01a0ec9e9950a04e031e --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision cfa21301665f4ca7122f6065fd83fad20b96843e) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision dfe649292c68391f773d01a0ec9e9950a04e031e) @@ -121,13 +121,11 @@ yield return new ImportInfo { - Name = Resources.PipingPlugin_PipingConfigurationFileFilter_calculation_configuration_description, + Name = Resources.PipingPlugin_PipingConfigurationFileFilter_description, Category = RingtoetsCommonFormsResources.Ringtoets_Category, Image = RingtoetsCommonFormsResources.GeneralFolderIcon, FileFilterGenerator = PipingConfigurationFileFilter, - IsEnabled = context => context.AvailableHydraulicBoundaryLocations.Any() - && context.AvailableStochasticSoilModels.Any() - && context.AvailablePipingSurfaceLines.Any(), + IsEnabled = PipingConfigurationImporterEnabled, CreateFileImporter = (context, filePath) => new PipingConfigurationImporter(filePath, context.WrappedData, context.AvailableHydraulicBoundaryLocations, @@ -354,7 +352,7 @@ get { return new FileFilterGenerator(Resources.PipingPlugin_PipingConfigurationFileFilter_xml_extension, - Resources.PipingPlugin_PipingConfigurationFileFilter_calculation_configuration_description); + Resources.PipingPlugin_PipingConfigurationFileFilter_description); } } @@ -366,6 +364,13 @@ } } + private static bool PipingConfigurationImporterEnabled(PipingCalculationGroupContext context) + { + return context.AvailableHydraulicBoundaryLocations.Any() + && context.AvailableStochasticSoilModels.Any() + && context.AvailablePipingSurfaceLines.Any(); + } + private static StochasticSoilModelImporter StochasticSoilModelImporter(StochasticSoilModelCollectionContext context, string filePath, IStochasticSoilModelUpdateModelStrategy updateStrategy) { return new StochasticSoilModelImporter(context.WrappedData, @@ -815,8 +820,8 @@ PipingCalculationService.Validate(context.WrappedData); } - private static string ValidateAllDataAvailableAndGetErrorMessage(PipingCalculationScenarioContext context) - { + private static string ValidateAllDataAvailableAndGetErrorMessage(PipingCalculationScenarioContext context) + { return ValidateAllDataAvailableAndGetErrorMessage(context.FailureMechanism); } @@ -840,7 +845,7 @@ var updateEntryAndExitPointItem = new StrictContextMenuItem( Resources.PipingPlugin_CreateUpdateEntryAndExitPointItem_Update_entry_and_exit_point, toolTipMessage, - RingtoetsCommonFormsResources.UpdateItemIcon, + RingtoetsCommonFormsResources.UpdateItemIcon, (o, args) => { UpdateSurfaceLineDependentData(context.WrappedData); }) { Enabled = hasSurfaceLine Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -rcfa21301665f4ca7122f6065fd83fad20b96843e -rdfe649292c68391f773d01a0ec9e9950a04e031e --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision cfa21301665f4ca7122f6065fd83fad20b96843e) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision dfe649292c68391f773d01a0ec9e9950a04e031e) @@ -113,9 +113,9 @@ /// /// Looks up a localized string similar to Ringtoets berekeningenconfiguratie. /// - public static string PipingPlugin_PipingConfigurationFileFilter_calculation_configuration_description { + public static string PipingPlugin_PipingConfigurationFileFilter_description { get { - return ResourceManager.GetString("PipingPlugin_PipingConfigurationFileFilter_calculation_configuration_description", resourceCulture); + return ResourceManager.GetString("PipingPlugin_PipingConfigurationFileFilter_description", resourceCulture); } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx =================================================================== diff -u -rcfa21301665f4ca7122f6065fd83fad20b96843e -rdfe649292c68391f773d01a0ec9e9950a04e031e --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx (.../Resources.resx) (revision cfa21301665f4ca7122f6065fd83fad20b96843e) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Properties/Resources.resx (.../Resources.resx) (revision dfe649292c68391f773d01a0ec9e9950a04e031e) @@ -230,7 +230,7 @@ xml - + Ringtoets berekeningenconfiguratie Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs =================================================================== diff -u -raec426f1f588208e2c617741a953016dd68e9f0e -rdfe649292c68391f773d01a0ec9e9950a04e031e --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs (.../PipingConfigurationImporterTest.cs) (revision aec426f1f588208e2c617741a953016dd68e9f0e) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Importers/PipingConfigurationImporterTest.cs (.../PipingConfigurationImporterTest.cs) (revision dfe649292c68391f773d01a0ec9e9950a04e031e) @@ -497,7 +497,7 @@ Action call = () => succesful = importer.Import(); // Assert - const string expectedMessage = "De ondergrondschematisatie 'Ondergrondschematisatie' bestaat niet. Berekening 'Calculation' is overgeslagen."; + const string expectedMessage = "De ondergrondschematisatie 'Ondergrondschematisatie' bestaat niet binnen het stochastische ondergrondmodel 'Ondergrondmodel'. Berekening 'Calculation' is overgeslagen."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); Assert.IsTrue(succesful); CollectionAssert.IsEmpty(calculationGroup.Children);