Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs
===================================================================
diff -u -r6858 -r6873
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs	(.../DamProject.cs)	(revision 6858)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs	(.../DamProject.cs)	(revision 6873)
@@ -134,27 +134,26 @@
     /// </summary>
     /// <param name="dataFolder">The data folder.</param>
     /// <param name="dataSourceContainer">The data source container.</param>
-    /// <param name="dikeRingIds">The dike ring ids.</param>
     /// <param name="damProjectType">Type of the dam project.</param>
     /// <param name="progress">The progress.</param>
     /// <returns></returns>
     public object Import(string dataFolder, DataSourceContainer dataSourceContainer,
-                         string dikeRingIds, DamProjectType damProjectType, ProgressDelegate progress)
+                         DamProjectType damProjectType, ProgressDelegate progress)
     {
         string damProjectFolder = Path.GetDirectoryName(projectFileName);
 
         DataSourceManager.DataSources = DamProjectData.DataSources;
         List<LogMessage> logMessages;
 
         // import
-        WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings(
+        Dike dike = DikeImporter.ImportDataForDikeRing(
             damProjectFolder, dataFolder, dataSourceContainer,
-            dikeRingIds, damProjectType, progress, out logMessages);
+            damProjectType, progress, out logMessages);
 
         // create data
         DamProjectData = new DamProjectData
         {
-            WaterBoard = waterBoard,
+            Dike = dike,
             DataSourceEsriProjection = dataSourceContainer.DataSourceEsriProjection
         };
 
@@ -301,12 +300,12 @@
     /// <param name="mapName">Name of the map.</param>
     public void AssignGeometry2DMapnameIfNotAssigned(string mapName)
     {
-        if (damProjectData.WaterBoard.Dike != null)
+        if (damProjectData.Dike != null)
         {
-            if (String.IsNullOrEmpty(damProjectData.WaterBoard.Dike.MapForSoilGeometries2D))
+            if (String.IsNullOrEmpty(damProjectData.Dike.MapForSoilGeometries2D))
             {
-                damProjectData.WaterBoard.Dike.MapForSoilGeometries2D = mapName;
-                foreach (Location location in damProjectData.WaterBoard.Dike.Locations)
+                damProjectData.Dike.MapForSoilGeometries2D = mapName;
+                foreach (Location location in damProjectData.Dike.Locations)
                 {
                     location.MapForSoilGeometries2D = mapName;
                 }
@@ -401,7 +400,7 @@
             return;
         }
 
-        string file = DamProjectData.WaterBoard.WaterLevelTimeSeriesFileName;
+        string file = DamProjectData.Dike.WaterLevelTimeSeriesFileName;
 
         // check if file exists
         if (!file.HasValidStringValue())
@@ -416,8 +415,8 @@
 
         // load file
         TimeSerieCollection fewsInputTimeSerieCollection = TimeSerieCollection.LoadFromFile(file);
-        var waterBoardJob = DamProjectData.WaterBoardJob as WaterBoardJob;
-        WaterBoardJobImporter.ImportWaterlevels(waterBoardJob, fewsInputTimeSerieCollection);
+        var dikeJob = DamProjectData.DikeJob as DikeJob;
+        DikeJobImporter.ImportWaterlevels(dikeJob, fewsInputTimeSerieCollection);
         DamProjectData.InputTimeSerieCollection = fewsInputTimeSerieCollection;
     }
 
@@ -501,9 +500,9 @@
     /// <param name="dataSourceDirectory">The directory in which the .defx file resides.</param>
     private void EnsureGeometries2DMapWithProject(string fileName, string projectDirectory, string dataSourceDirectory)
     {
-        if (!String.IsNullOrEmpty(damProjectData.WaterBoard.Dike.MapForSoilGeometries2D))
+        if (!String.IsNullOrEmpty(damProjectData.Dike.MapForSoilGeometries2D))
         {
-            string mapForSoilGeometries = damProjectData.WaterBoard.Dike.MapForSoilGeometries2D;
+            string mapForSoilGeometries = damProjectData.Dike.MapForSoilGeometries2D;
             string sourceMapName = DetermineGeometriesSource(mapForSoilGeometries, projectDirectory, dataSourceDirectory);
 
             // Only copy files if map of geometries is assigned and exists
@@ -519,8 +518,8 @@
                 }
 
                 // Store the relative path to the 2d-geometries
-                damProjectData.WaterBoard.Dike.MapForSoilGeometries2D = destMapname;
-                foreach (Location location in damProjectData.WaterBoard.Dike.Locations)
+                damProjectData.Dike.MapForSoilGeometries2D = destMapname;
+                foreach (Location location in damProjectData.Dike.Locations)
                 {
                     location.MapForSoilGeometries2D = destMapname;
                 }