Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Geometry2DImporter/SoilProfile2DImporter.cs =================================================================== diff -u -r4830 -r4872 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Geometry2DImporter/SoilProfile2DImporter.cs (.../SoilProfile2DImporter.cs) (revision 4830) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Geometry2DImporter/SoilProfile2DImporter.cs (.../SoilProfile2DImporter.cs) (revision 4872) @@ -74,11 +74,10 @@ SoilProfile2D readSoilProfile = ReadSoilProfile(soilProfileDirectory, profileName); foreach (SoilLayer2D surface in readSoilProfile.Surfaces) { - string missingSoil = IsSoilOfSurfacePresent(availableSoils.Soils, surface.Soil); - if (missingSoil != string.Empty) + if (!IsSoilOfSurfacePresent(availableSoils.Soils, surface.Soil.Name)) { string messageFormat = LocalizationManager.GetTranslatedText(typeof(SoilProfile2DImporter), "ImportSoilProfileErrorUndefinedMaterials"); - throw new SoilProfileImporterException(string.Format(messageFormat, profileName, missingSoil)); + throw new SoilProfileImporterException(string.Format(messageFormat, profileName, surface.Soil.Name)); } } TransferSoilLayerProperties(readSoilProfile.Surfaces); @@ -147,15 +146,10 @@ return string.Equals(Path.GetExtension(profileName), ".sti", StringComparison.OrdinalIgnoreCase); } - private static string IsSoilOfSurfacePresent(IEnumerable availableSoils, Soil soil) + private static bool IsSoilOfSurfacePresent(IEnumerable availableSoils, string soilName) { - var missingSoil = string.Empty; var soilNames = new HashSet(availableSoils.Select(s => s.Name)); - if (!soilNames.Contains(soil.Name, StringComparer.OrdinalIgnoreCase)) - { - missingSoil = soil.Name; - } - return missingSoil; + return soilNames.Contains(soilName, StringComparer.OrdinalIgnoreCase); } private static void TransferSoilLayerProperties(IEnumerable soilLayers)