Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeImporterTests.cs
===================================================================
diff -u -r6946 -r6980
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeImporterTests.cs	(.../DikeImporterTests.cs)	(revision 6946)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DikeImporterTests.cs	(.../DikeImporterTests.cs)	(revision 6980)
@@ -23,13 +23,11 @@
 using System.IO;
 using System.Linq;
 using Deltares.Dam.Data;
-using Deltares.Dam.Data.DataPlugins;
 using Deltares.Dam.Data.DataPlugins.Configuration;
 using Deltares.DamEngine.Data.Standard;
 using Deltares.Geometry;
 using Deltares.Geotechnics.Soils;
 using Deltares.Geotechnics.SurfaceLines;
-using Deltares.Standard.Language;
 using Deltares.Standard.Logging;
 using NUnit.Framework;
 
@@ -39,7 +37,7 @@
 public class DikeImporterTests
 {
     private DataSourceContainer dataSourceContainer;
-    
+
     [Test]
     [TestCase(DamProjectType.Design)]
     [TestCase(DamProjectType.DamLiveConfiguration)]
@@ -51,15 +49,14 @@
         dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename);
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
         using Dike dike = DikeImporter.ImportDataForDike("", damImportFolder,
-                                                                                dataSourceContainer, 
-                                                                                damProjectType, null,
-                                                                                out List<LogMessage> _);
+                                                         dataSourceContainer,
+                                                         damProjectType, null,
+                                                         out List<LogMessage> _);
 
         // Check Dike
         Assert.That(dike, Is.Not.Null);
         Assert.Multiple(() =>
         {
-
             //Check locations
             Assert.That(dike.Locations, Has.Count.EqualTo(2));
 
@@ -160,9 +157,9 @@
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
         List<LogMessage> logMessages;
         using Dike dike = DikeImporter.ImportDataForDike("", damImportFolder,
-                                                                                dataSourceContainer, 
-                                                                                DamProjectType.Design, null,
-                                                                                out logMessages);
+                                                         dataSourceContainer,
+                                                         DamProjectType.Design, null,
+                                                         out logMessages);
 
         Assert.That(logMessages, Has.Count.GreaterThan(0));
         Assert.Multiple(() =>
@@ -185,9 +182,9 @@
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
         List<LogMessage> logMessages;
         using Dike dike = DikeImporter.ImportDataForDike("", damImportFolder,
-                                                                                dataSourceContainer,
-                                                                                DamProjectType.Design, null,
-                                                                                out logMessages);
+                                                         dataSourceContainer,
+                                                         DamProjectType.Design, null,
+                                                         out logMessages);
 
         Assert.That(logMessages, Has.Count.GreaterThan(0));
         Assert.Multiple(() =>
@@ -211,9 +208,9 @@
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
         List<LogMessage> logMessages;
         using Dike dike = DikeImporter.ImportDataForDike("", damImportFolder,
-                                                                                dataSourceContainer, 
-                                                                                DamProjectType.Design, null,
-                                                                                out logMessages);
+                                                         dataSourceContainer,
+                                                         DamProjectType.Design, null,
+                                                         out logMessages);
 
         Assert.That(logMessages, Has.Count.GreaterThan(0));
         Assert.Multiple(() =>
@@ -235,11 +232,11 @@
         dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename);
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
         List<LogMessage> logMessages;
-        
+
         using Dike dike = DikeImporter.ImportDataForDike("", damImportFolder,
-                                                                                dataSourceContainer,
-                                                                                DamProjectType.Design, null,
-                                                                                out logMessages);
+                                                         dataSourceContainer,
+                                                         DamProjectType.Design, null,
+                                                         out logMessages);
 
         Assert.That(logMessages, Has.Count.GreaterThan(0));
         Assert.Multiple(() =>
@@ -265,10 +262,10 @@
         {
             dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename);
             string damImportFolder = Path.GetDirectoryName(definitionFilename);
-            
+
             damProject.DamProjectData.Dike = DikeImporter.ImportDataForDike("", damImportFolder,
-                                                                                             dataSourceContainer,
-                                                                                             damProjectType, null, out List<LogMessage> _);
+                                                                            dataSourceContainer,
+                                                                            damProjectType, null, out List<LogMessage> _);
             damProject.AssignGeometry2DMapnameIfNotAssigned(Path.Combine(damImportFolder, dataSourceContainer.MapSoilProfile2D));
 
             // Save the data
@@ -285,7 +282,7 @@
 
                 // Check aquifers
                 Assert.That(dike.Aquifers, Has.Count.EqualTo(2));
-                
+
                 // Surface lines of imported dike have same instance
                 Location location = dike.Locations.First(l => l.Name.Equals("location_dijkring10_dwp28_6"));
                 SurfaceLine2 surfaceLine = dike.SurfaceLines2.First(s => s.Name.Equals(location.SurfaceLine2.Name));
@@ -301,14 +298,14 @@
 
         dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename);
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
-        
+
         using Dike dike = DikeImporter.ImportDataForDike("", damImportFolder,
-                                                                                dataSourceContainer,
-                                                                                DamProjectType.Design, null, out List<LogMessage> _);
+                                                         dataSourceContainer,
+                                                         DamProjectType.Design, null, out List<LogMessage> _);
 
         // Check Dike
         Assert.That(dike, Is.Not.Null);
-        
+
         //Check locations
         Assert.That(dike.Locations, Has.Count.EqualTo(2));
     }
@@ -322,23 +319,22 @@
         dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename);
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
         using (Dike dike = DikeImporter.ImportDataForDike("", damImportFolder, dataSourceContainer,
-                                                                                 DamProjectType.Design, null, out List<LogMessage> _))
+                                                          DamProjectType.Design, null, out List<LogMessage> _))
         using (Dike referenceDike = DikeImporter.ImportDataForDike("", damImportFolder,
-                                                                                          dataSourceContainer,
-                                                                                          DamProjectType.Design, null, out List<LogMessage> _))
+                                                                   dataSourceContainer,
+                                                                   DamProjectType.Design, null, out List<LogMessage> _))
         {
             // If profiles are defined as relative profiles, new absolute profiles will be generated for each location
             if (dataSourceContainer.IsImportAsRelativeProfiles)
             {
                 DikePostProcessRelativeProfiles.CreateAbsoluteProfiles(dike,
-                                                                             dataSourceContainer.SoilProfileCharacteristicPointReference);
+                                                                       dataSourceContainer.SoilProfileCharacteristicPointReference);
             }
 
             // Check Dike
             Assert.That(dike, Is.Not.Null);
             Assert.Multiple(() =>
             {
-
                 //Check locations
                 Assert.That(dike.Locations, Has.Count.EqualTo(2));
 
@@ -371,9 +367,8 @@
                 {
                     soilProbabilityIndex++;
                     SoilGeometryProbability soilProfileProbability =
-                        location.Segment.SoilProfileProbabilities.Find(
-                            s => s.SoilProfile.Name.Equals(string.Format("{0}-{1}-{2}",
-                                                                         referenceSoilProfileProbability.SoilProfile.Name, location.Name, soilProbabilityIndex)));
+                        location.Segment.SoilProfileProbabilities.Find(s => s.SoilProfile.Name.Equals(string.Format("{0}-{1}-{2}",
+                                                                                                                    referenceSoilProfileProbability.SoilProfile.Name, location.Name, soilProbabilityIndex)));
                     for (var layerIndex = 0;
                          layerIndex < soilProfileProbability.SoilProfile.LayerCount;
                          layerIndex++)
@@ -407,13 +402,13 @@
 
         dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename);
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
-        
+
         using (Dike dike = DikeImporter.ImportDataForDike("", damImportFolder, dataSourceContainer,
-                                                                                 DamProjectType.Design, null, out List<LogMessage> _))
+                                                          DamProjectType.Design, null, out List<LogMessage> _))
         {
             // Check Dike
             Assert.That(dike, Is.Not.Null);
-            
+
             //Check locations
             Assert.That(dike.Locations, Has.Count.EqualTo(2));
             Assert.Multiple(() =>