Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DikeImporter.cs
===================================================================
diff -u -r6932 -r6939
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DikeImporter.cs	(.../DikeImporter.cs)	(revision 6932)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DikeImporter.cs	(.../DikeImporter.cs)	(revision 6939)
@@ -210,13 +210,13 @@
     /// <summary>
     /// Imports the soils.
     /// </summary>
-    /// <param name="dike">The dike.</param>
-    private void ImportSoils(Dike dike)
+    /// <param name="importedDike">The dike.</param>
+    private void ImportSoils(Dike importedDike)
     {
         List<DamSoil> soils = GetSoils();
         foreach (DamSoil soil in soils)
         {
-            dike.AddDamSoil(soil);
+            importedDike.AddDamSoil(soil);
         }
     }
 
@@ -235,15 +235,15 @@
     /// <summary>
     /// Imports a soil.
     /// </summary>
-    /// <param name="soilID">The soil identifier.</param>
+    /// <param name="soilId">The soil identifier.</param>
     /// <returns></returns>
-    private DamSoil ImportSoil(string soilID)
+    private DamSoil ImportSoil(string soilId)
     {
         var soil = new DamSoil
         {
-            Name = soilID
+            Name = soilId
         };
-        IEnumerable<NameValueParameter> soilDetails = importer.GetSoilDetails(soilID);
+        IEnumerable<NameValueParameter> soilDetails = importer.GetSoilDetails(soilId);
 
         foreach (NameValueParameter soilDetail in soilDetails)
         {
@@ -296,19 +296,19 @@
     /// <summary>
     /// Imports the scenarios.
     /// </summary>
-    /// <param name="dike">The dike.</param>
-    private void ImportScenarios(Dike dike)
+    /// <param name="importedDike">The dike.</param>
+    private void ImportScenarios(Dike importedDike)
     {
-        AddScenariosToLocations(dike);
+        AddScenariosToLocations(importedDike);
     }
 
     /// <summary>
     /// Adds the scenarios to locations.
     /// </summary>
-    /// <param name="dike">The dike.</param>
-    private void AddScenariosToLocations(Dike dike)
+    /// <param name="importedDike">The dike.</param>
+    private void AddScenariosToLocations(Dike importedDike)
     {
-        foreach (Location location in dike.Locations)
+        foreach (Location location in importedDike.Locations)
         {
             IEnumerable<string> scenarioList = importer.GetScenarioList(location.Name);
             foreach (string scenarioId in scenarioList)
@@ -335,8 +335,8 @@
     /// <summary>
     /// Imports the locations.
     /// </summary>
-    /// <param name="dike">The dike.</param>
-    private void ImportLocations(Dike dike)
+    /// <param name="importedDike">The dike.</param>
+    private void ImportLocations(Dike importedDike)
     {
         IEnumerable<string> locationIdList = importer.GetLocationIdList();
 
@@ -362,14 +362,14 @@
                 DataSourceManager.SetSource(location, locationDetail.ParameterName, locationDetail.Source);
                 if (locationDetail.ParameterName.Equals(LocationParameterNames.SegmentId))
                 {
-                    Segment segment = dike.Segments.FirstOrDefault(x => x.Name.Equals(locationDetail.ParameterValue));
+                    Segment segment = importedDike.Segments.FirstOrDefault(x => x.Name.Equals(locationDetail.ParameterValue));
                     location.Segment = segment;
                 }
 
                 // See comment below, ID is still needed (this was proved with old tests)
                 if (locationDetail.ParameterName.Equals(LocationParameterNames.SurfaceLineId))
                 {
-                    SurfaceLine2 surfaceLine = dike.SurfaceLines2.FirstOrDefault(x => x.Name.Equals(locationDetail.ParameterValue));
+                    SurfaceLine2 surfaceLine = importedDike.SurfaceLines2.FirstOrDefault(x => x.Name.Equals(locationDetail.ParameterValue));
                     location.SurfaceLine2 = surfaceLine;
                 }
                 // TODO: Assign PL1-line 
@@ -379,35 +379,35 @@
             // for location, just search for it by name in surfacelines. SurfaceLineId can and should be removed entirely! But see above!
             if (location.SurfaceLine2 == null)
             {
-                location.SurfaceLine2 = dike.SurfaceLines2.FirstOrDefault(s => s.Name == location.Name);
+                location.SurfaceLine2 = importedDike.SurfaceLines2.FirstOrDefault(s => s.Name == location.Name);
             }
 
-            location.SoilList = dike.SoilList;
-            dike.Locations.Add(location);
+            location.SoilList = importedDike.SoilList;
+            importedDike.Locations.Add(location);
         }
 
-        dike.SortLocations();
+        importedDike.SortLocations();
     }
 
     /// <summary>
     /// Imports the model parameters.
     /// </summary>
-    /// <param name="dike">The dike.</param>
-    private void ImportModelParameters(Dike dike)
+    /// <param name="importedDike">The dike.</param>
+    private void ImportModelParameters(Dike importedDike)
     {
         IEnumerable<NameValueParameter> modelParameters = importer.GetDikeParameters();
         foreach (NameValueParameter modelParameter in modelParameters)
         {
-            dike.SetParameterFromNameValuePair(modelParameter.ParameterName, modelParameter.ParameterValue);
-            DataSourceManager.SetSource(dike, modelParameter.ParameterName, modelParameter.Source);
+            importedDike.SetParameterFromNameValuePair(modelParameter.ParameterName, modelParameter.ParameterValue);
+            DataSourceManager.SetSource(importedDike, modelParameter.ParameterName, modelParameter.Source);
         }
     }
 
     /// <summary>
     /// Imports the surface lines.
     /// </summary>
-    /// <param name="dike">The dike.</param>
-    private void ImportSurfaceLines(Dike dike)
+    /// <param name="importedDike">The dike.</param>
+    private void ImportSurfaceLines(Dike importedDike)
     {
         // Use InvokeWithoutPublishingEvents for performance reasons after introducing SurfaceLine2
         DataEventPublisher.InvokeWithoutPublishingEvents(() =>
@@ -442,45 +442,45 @@
                 }
 
                 // add the surface line to the dike
-                dike.SurfaceLines2.Add(surfaceLine);
+                importedDike.SurfaceLines2.Add(surfaceLine);
             }
         });
     }
 
     /// <summary>
     /// Imports the segments.
     /// </summary>
-    /// <param name="dike">The dike.</param>
-    private void ImportSegments(Dike dike)
+    /// <param name="importedDike">The dike.</param>
+    private void ImportSegments(Dike importedDike)
     {
         IEnumerable<string> segmentIdList = importer.GetSegmentIdList();
-        foreach (string segmentID in segmentIdList)
+        foreach (string segmentId in segmentIdList)
         {
             var segment = new Segment
             {
-                Name = segmentID
+                Name = segmentId
             };
 
             foreach (FailureMechanismSystemType failureMechanismSystemType in Enum.GetValues(typeof(FailureMechanismSystemType)))
             {
-                AddSoilProfiles(segment, segmentID, failureMechanismSystemType, dike);
-                AddSoilGeometry(segment, segmentID, failureMechanismSystemType);
+                AddSoilProfiles(segment, segmentId, failureMechanismSystemType, importedDike);
+                AddSoilGeometry(segment, segmentId, failureMechanismSystemType);
             }
 
-            dike.Segments.Add(segment);
+            importedDike.Segments.Add(segment);
         }
     }
 
     /// <summary>
     /// Adds the soil profiles.
     /// </summary>
     /// <param name="segment">The segment.</param>
-    /// <param name="segmentID">The segment identifier.</param>
+    /// <param name="segmentId">The segment identifier.</param>
     /// <param name="failureMechanismSystemType">Type of the failure mechanism system.</param>
-    /// <param name="dike">The dike.</param>
-    private void AddSoilProfiles(Segment segment, string segmentID, FailureMechanismSystemType failureMechanismSystemType, Dike dike)
+    /// <param name="importedDike">The dike.</param>
+    private void AddSoilProfiles(Segment segment, string segmentId, FailureMechanismSystemType failureMechanismSystemType, Dike importedDike)
     {
-        IEnumerable<string> profile1DIdListForSegment = importer.GetProfile1DIdListForSegment(segmentID, failureMechanismSystemType);
+        IEnumerable<string> profile1DIdListForSegment = importer.GetProfile1DIdListForSegment(segmentId, failureMechanismSystemType);
 
         foreach (string soilProfile1DId in profile1DIdListForSegment)
         {
@@ -490,8 +490,8 @@
             };
 
             // get soil profile
-            IEnumerable<NameValueParameter> soilProfile1DDetails = importer.GetSegmentProfile1DDetails(segmentID, soilProfile1DId, failureMechanismSystemType);
-            SoilProfile1D soilProfile1D = dike.SoilProfiles.FirstOrDefault(x => x.Name.Equals(soilProfile1DId));
+            IEnumerable<NameValueParameter> soilProfile1DDetails = importer.GetSegmentProfile1DDetails(segmentId, soilProfile1DId, failureMechanismSystemType);
+            SoilProfile1D soilProfile1D = importedDike.SoilProfiles.FirstOrDefault(x => x.Name.Equals(soilProfile1DId));
 
             double probability = 0;
             foreach (NameValueParameter nameValueparameter in soilProfile1DDetails)
@@ -510,18 +510,18 @@
     /// Adds the soil geometry.
     /// </summary>
     /// <param name="segment">The segment.</param>
-    /// <param name="segmentID">The segment identifier.</param>
+    /// <param name="segmentId">The segment identifier.</param>
     /// <param name="failureMechanismSystemType">Type of the failure mechanism system.</param>
-    private void AddSoilGeometry(Segment segment, string segmentID, FailureMechanismSystemType failureMechanismSystemType)
+    private void AddSoilGeometry(Segment segment, string segmentId, FailureMechanismSystemType failureMechanismSystemType)
     {
-        IEnumerable<string> profile2DIdListForSegment = importer.GetProfile2DIdListForSegment(segmentID, failureMechanismSystemType);
+        IEnumerable<string> profile2DIdListForSegment = importer.GetProfile2DIdListForSegment(segmentId, failureMechanismSystemType);
         foreach (string soilGeometry2DName in profile2DIdListForSegment)
         {
             var numberFormatInfo = new NumberFormatInfo
             {
                 NumberDecimalSeparator = "."
             };
-            IEnumerable<NameValueParameter> soilProfile2DDetails = importer.GetSegmentProfile2DDetails(segmentID, soilGeometry2DName, failureMechanismSystemType);
+            IEnumerable<NameValueParameter> soilProfile2DDetails = importer.GetSegmentProfile2DDetails(segmentId, soilGeometry2DName, failureMechanismSystemType);
             var probability = 0.0;
             foreach (NameValueParameter nameValueparameter in soilProfile2DDetails)
             {
@@ -538,33 +538,33 @@
     /// <summary>
     /// Imports the soil profiles1 d.
     /// </summary>
-    /// <param name="dike">The dike.</param>
-    private void ImportSoilProfiles1D(Dike dike)
+    /// <param name="importedDike">The dike.</param>
+    private void ImportSoilProfiles1D(Dike importedDike)
     {
         IEnumerable<string> soilProfile1DIdList = importer.GetSoilProfile1DIdList();
         foreach (string soilProfile1DId in soilProfile1DIdList)
         {
-            dike.SoilProfiles.Add(ImportProfile(soilProfile1DId, dike));
+            importedDike.SoilProfiles.Add(ImportProfile(soilProfile1DId, importedDike));
         }
     }
 
-    private void ImportAquifers(Dike dike)
+    private void ImportAquifers(Dike importedDike)
     {
         foreach (Aquifer aquifer in importer.Dike.Aquifers)
         {
-            dike.Aquifers.Add(aquifer);
+            importedDike.Aquifers.Add(aquifer);
         }
     }
 
     /// <summary>
     /// Imports a profile.
     /// </summary>
     /// <param name="soilProfile1DId">The soil profile1 d identifier.</param>
-    /// <param name="dike">The dike.</param>
+    /// <param name="importedDike">The dike.</param>
     /// <returns></returns>
     /// <exception cref="DikeImporterException">
     /// </exception>
-    private SoilProfile1D ImportProfile(string soilProfile1DId, Dike dike)
+    private SoilProfile1D ImportProfile(string soilProfile1DId, Dike importedDike)
     {
         var soilProfile = new SoilProfile1D
         {
@@ -583,7 +583,7 @@
             }
             else
             {
-                int soilIndex = dike.SoilList.GetSoilIndexByName(layer.SoilName);
+                int soilIndex = importedDike.SoilList.GetSoilIndexByName(layer.SoilName);
                 if (soilIndex < 0)
                 {
                     throw new DikeImporterException($"Soil '{dpSoilProfile.Layers[layerIndex].SoilName}' not found in 1d-profile '{soilProfile1DId}'");
@@ -592,7 +592,7 @@
                 soilProfile.Layers.Add(new SoilLayer1D
                 {
                     TopLevel = layer.TopLevel,
-                    Soil = dike.SoilList.Soils[soilIndex],
+                    Soil = importedDike.SoilList.Soils[soilIndex],
                     IsAquifer = layer.IsAquifer
                 });
             }