Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeImporterTests.cs =================================================================== diff -u -r6892 -r6932 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeImporterTests.cs (.../DikeImporterTests.cs) (revision 6892) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeImporterTests.cs (.../DikeImporterTests.cs) (revision 6932) @@ -50,7 +50,7 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); - using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, + using Dike dike = DikeImporter.ImportDataForDike("", damImportFolder, dataSourceContainer, damProjectType, null, out List _); @@ -159,7 +159,7 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); List logMessages; - using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, + using Dike dike = DikeImporter.ImportDataForDike("", damImportFolder, dataSourceContainer, DamProjectType.Design, null, out logMessages); @@ -184,7 +184,7 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); List logMessages; - using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, + using Dike dike = DikeImporter.ImportDataForDike("", damImportFolder, dataSourceContainer, DamProjectType.Design, null, out logMessages); @@ -210,7 +210,7 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); List logMessages; - using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, + using Dike dike = DikeImporter.ImportDataForDike("", damImportFolder, dataSourceContainer, DamProjectType.Design, null, out logMessages); @@ -236,7 +236,7 @@ string damImportFolder = Path.GetDirectoryName(definitionFilename); List logMessages; - using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, + using Dike dike = DikeImporter.ImportDataForDike("", damImportFolder, dataSourceContainer, DamProjectType.Design, null, out logMessages); @@ -266,7 +266,7 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); - damProject.DamProjectData.Dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, + damProject.DamProjectData.Dike = DikeImporter.ImportDataForDike("", damImportFolder, dataSourceContainer, damProjectType, null, out List _); damProject.AssignGeometry2DMapnameIfNotAssigned(Path.Combine(damImportFolder, dataSourceContainer.MapSoilProfile2D)); @@ -297,7 +297,7 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); - using Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, + using Dike dike = DikeImporter.ImportDataForDike("", damImportFolder, dataSourceContainer, DamProjectType.Design, null, out List _); @@ -316,9 +316,9 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); - using (Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, + using (Dike dike = DikeImporter.ImportDataForDike("", damImportFolder, dataSourceContainer, DamProjectType.Design, null, out List _)) - using (Dike referenceDike = DikeImporter.ImportDataForDikeRing("", damImportFolder, + using (Dike referenceDike = DikeImporter.ImportDataForDike("", damImportFolder, dataSourceContainer, DamProjectType.Design, null, out List _)) { @@ -403,7 +403,7 @@ dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename); string damImportFolder = Path.GetDirectoryName(definitionFilename); - using (Dike dike = DikeImporter.ImportDataForDikeRing("", damImportFolder, dataSourceContainer, + using (Dike dike = DikeImporter.ImportDataForDike("", damImportFolder, dataSourceContainer, DamProjectType.Design, null, out List _)) { // Check Dike