Index: Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineMetaImporter.cs =================================================================== diff -u -r239ea628125c5ec4004a843abce2d269af93c431 -r9ccccb49274ddad9696632ec89efda0ce2e34afc --- Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineMetaImporter.cs (.../ReferenceLineMetaImporter.cs) (revision 239ea628125c5ec4004a843abce2d269af93c431) +++ Ringtoets/Common/src/Ringtoets.Common.IO/ReferenceLineMetaImporter.cs (.../ReferenceLineMetaImporter.cs) (revision 9ccccb49274ddad9696632ec89efda0ce2e34afc) @@ -86,8 +86,7 @@ var files = GetShapeFilesInFolder(folderpath); if (files.Length == 0) { - var message = new FileReaderErrorMessageBuilder(folderpath) - .Build(RingtoetsCommonIOResources.ReferenceLineMetaImporter_ValidateAndConnectTo_No_shape_file_found); + var message = string.Format(RingtoetsCommonIOResources.ReferenceLineMetaImporter_ValidateAndConnectTo_No_shape_file_found_in_folder_0, folderpath); throw new CriticalFileReadException(message); } @@ -122,8 +121,8 @@ { if (e is IOException || e is SecurityException) { - var message = new FileReaderErrorMessageBuilder(path) - .Build(RingtoetsCommonIOResources.ReferenceLineMetaImporter_ValidateDirectory_Directory_Invalid); + var message = string.Format(RingtoetsCommonIOResources.ReferenceLineMetaImporter_ValidateDirectory_Directory_Invalid, + path); throw new CriticalFileReadException(message, e); } throw; @@ -132,22 +131,22 @@ private void ValidateReferenceLineMetas(ICollection referenceLineMetas) { - var referenceLineMetasCount = referenceLineMetas.Count; - var referenceLineMetasDistinctCount = referenceLineMetas.Select(rlm => rlm.AssessmentSectionId).Distinct().Count(); - - if (referenceLineMetasCount != referenceLineMetasDistinctCount) + if (referenceLineMetas.Any(rlm => string.IsNullOrEmpty(rlm.AssessmentSectionId))) { var message = new FileReaderErrorMessageBuilder(shapeFilePath) - .Build(RingtoetsCommonIOResources.ReferenceLineMetaImporter_ValidateReferenceLineMetas_AssessmentSection_Ids_Not_Unique); + .Build(RingtoetsCommonIOResources.ReferenceLineMetaImporter_ValidateReferenceLineMetas_Missing_AssessmentSection_Ids); throw new CriticalFileValidationException(message); } - if (referenceLineMetas.Any(rlm => string.IsNullOrEmpty(rlm.AssessmentSectionId))) + var referenceLineMetasCount = referenceLineMetas.Count; + var referenceLineMetasDistinctCount = referenceLineMetas.Select(rlm => rlm.AssessmentSectionId).Distinct().Count(); + if (referenceLineMetasCount != referenceLineMetasDistinctCount) { var message = new FileReaderErrorMessageBuilder(shapeFilePath) - .Build(RingtoetsCommonIOResources.ReferenceLineMetaImporter_ValidateReferenceLineMetas_Missing_AssessmentSection_Ids); + .Build(RingtoetsCommonIOResources.ReferenceLineMetaImporter_ValidateReferenceLineMetas_AssessmentSection_Ids_Not_Unique); throw new CriticalFileValidationException(message); } + } } } \ No newline at end of file