Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs
===================================================================
diff -u -r6750 -r6823
--- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs	(.../WaterBoardImporterTests.cs)	(revision 6750)
+++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs	(.../WaterBoardImporterTests.cs)	(revision 6823)
@@ -47,16 +47,16 @@
 
         dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename);
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
-        IList<string> dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer,
-                                                                      DamProjectType.DamLiveConfiguration, out _).ToList();
+        string dikeId = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer,
+                                                             DamProjectType.DamLiveConfiguration, out _);
         using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder,
-                                                                                dataSourceContainer, dikeList,
+                                                                                dataSourceContainer, dikeId,
                                                                                 DamProjectType.DamLiveConfiguration, null,
                                                                                 out List<LogMessage> _);
 
         // Check Dike
-        Assert.That(waterBoard.Dikes, Has.Count.EqualTo(1));
-        Dike dike = waterBoard.Dikes[0];
+        Assert.That(waterBoard.Dike, Is.Not.Null);
+        Dike dike = waterBoard.Dike;
 
         //Check locations
         Assert.That(dike.Locations, Has.Count.EqualTo(2));
@@ -153,10 +153,10 @@
         dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename);
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
         List<LogMessage> logMessages;
-        IList<string> dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer,
-                                                                      DamProjectType.DamLiveConfiguration, out _).ToList();
+        string dikeId = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer,
+                                                             DamProjectType.DamLiveConfiguration, out _);
         using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder,
-                                                                                dataSourceContainer, dikeList,
+                                                                                dataSourceContainer, dikeId,
                                                                                 DamProjectType.DamLiveConfiguration, null,
                                                                                 out logMessages);
 
@@ -167,9 +167,9 @@
             Assert.That(logMessages[1].Message, Contains.Substring("Sigma-Tau curve table MissingNotUsed not found in CSV file for soil ETL (or sigmataucurves.csv missing)."));
         });
         // Check Dike
-        Assert.That(waterBoard.Dikes, Has.Count.EqualTo(1));
+        Assert.That(waterBoard.Dike, Is.Not.Null);
         //Check locations
-        Assert.That(waterBoard.Dikes[0].Locations, Has.Count.EqualTo(0));
+        Assert.That(waterBoard.Dike.Locations, Has.Count.EqualTo(0));
     }
 
     [Test]
@@ -180,10 +180,10 @@
         dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename);
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
         List<LogMessage> logMessages;
-        IList<string> dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer,
-                                                                      DamProjectType.DamLiveConfiguration, out _).ToList();
+        string dikeId = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer,
+                                                             DamProjectType.DamLiveConfiguration, out _);
         using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder,
-                                                                                dataSourceContainer, dikeList,
+                                                                                dataSourceContainer, dikeId,
                                                                                 DamProjectType.DamLiveConfiguration, null,
                                                                                 out logMessages);
 
@@ -193,10 +193,10 @@
             Assert.That(logMessages[0].Message, Contains.Substring("Sigma-Tau curve table Missing not found in CSV file for soil CCC (or sigmataucurves.csv missing)."));
 
             // Check Dike
-            Assert.That(waterBoard.Dikes, Has.Count.EqualTo(1));
+            Assert.That(waterBoard.Dike, Is.Not.Null);
 
             //Check locations
-            Assert.That(waterBoard.Dikes[0].Locations, Has.Count.EqualTo(0));
+            Assert.That(waterBoard.Dike.Locations, Has.Count.EqualTo(0));
         });
     }
 
@@ -208,10 +208,10 @@
         dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename);
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
         List<LogMessage> logMessages;
-        IList<string> dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer,
-                                                                      DamProjectType.DamLiveConfiguration, out _).ToList();
+        string dikeId = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer,
+                                                             DamProjectType.DamLiveConfiguration, out _);
         using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder,
-                                                                                dataSourceContainer, dikeList,
+                                                                                dataSourceContainer, dikeId,
                                                                                 DamProjectType.DamLiveConfiguration, null,
                                                                                 out logMessages);
 
@@ -222,9 +222,9 @@
             Assert.That(logMessages[1].Message, Contains.Substring("Su table MissingNotUsed not found in CSV file for soil ETL (or sutables.csv missing)."));
         });
         // Check Dike
-        Assert.That(waterBoard.Dikes, Has.Count.EqualTo(1));
+        Assert.That(waterBoard.Dike, Is.Not.Null);
         //Check locations
-        Assert.That(waterBoard.Dikes[0].Locations, Has.Count.EqualTo(0));
+        Assert.That(waterBoard.Dike.Locations, Has.Count.EqualTo(0));
     }
 
     [Test]
@@ -235,10 +235,10 @@
         dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename);
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
         List<LogMessage> logMessages;
-        IList<string> dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer,
-                                                                      DamProjectType.DamLiveConfiguration, out _).ToList();
+        string dikeId = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer,
+                                                             DamProjectType.DamLiveConfiguration, out _);
         using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder,
-                                                                                dataSourceContainer, dikeList,
+                                                                                dataSourceContainer, dikeId,
                                                                                 DamProjectType.DamLiveConfiguration, null,
                                                                                 out logMessages);
 
@@ -248,10 +248,10 @@
             Assert.That(logMessages[0].Message, Contains.Substring("Su table Missing not found in CSV file for soil CCC (or sutables.csv missing)."));
 
             // Check Dike
-            Assert.That(waterBoard.Dikes, Has.Count.EqualTo(1));
+            Assert.That(waterBoard.Dike, Is.Not.Null);
 
             //Check locations
-            Assert.That(waterBoard.Dikes[0].Locations, Has.Count.EqualTo(0));
+            Assert.That(waterBoard.Dike.Locations, Has.Count.EqualTo(0));
         });
     }
 
@@ -264,19 +264,19 @@
         {
             dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename);
             string damImportFolder = Path.GetDirectoryName(definitionFilename);
-            IList<string> dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer,
-                                                                          DamProjectType.DamLiveConfiguration, out _).ToList();
+            string dikeId = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer,
+                                                                 DamProjectType.DamLiveConfiguration, out _);
             damProject.DamProjectData.WaterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder,
                                                                                              dataSourceContainer,
-                                                                                             dikeList, DamProjectType.DamLiveConfiguration, null, out List<LogMessage> _);
+                                                                                             dikeId, DamProjectType.DamLiveConfiguration, null, out List<LogMessage> _);
             damProject.AssignGeometry2DMapnameIfNotAssigned(Path.Combine(damImportFolder, dataSourceContainer.MapSoilProfile2D));
 
             // Save the data
             damProject.SaveXMLProject(projectFilename, damProject);
 
             // Check Dike
-            Assert.That(damProject.DamProjectData.WaterBoard.Dikes, Has.Count.EqualTo(1));
-            Dike dike = damProject.DamProjectData.WaterBoard.Dikes[0];
+            Assert.That(damProject.DamProjectData.WaterBoard.Dike, Is.Not.Null);
+            Dike dike = damProject.DamProjectData.WaterBoard.Dike;
 
             Assert.Multiple(() =>
             {
@@ -296,15 +296,15 @@
 
         dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename);
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
-        IList<string> dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer,
-                                                                      DamProjectType.DamLiveConfiguration, out _).ToList();
+        string dikeId = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer,
+                                                             DamProjectType.DamLiveConfiguration, out _);
         using WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder,
-                                                                                dataSourceContainer, dikeList,
+                                                                                dataSourceContainer, dikeId,
                                                                                 DamProjectType.DamLiveConfiguration, null, out List<LogMessage> _);
 
         // Check Dike
-        Assert.That(waterBoard.Dikes.Count, Is.EqualTo(1));
-        Dike dike = waterBoard.Dikes[0];
+        Assert.That(waterBoard.Dike, Is.Not.Null);
+        Dike dike = waterBoard.Dike;
 
         //Check locations
         Assert.That(dike.Locations.Count, Is.EqualTo(2));
@@ -318,13 +318,12 @@
 
         dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename);
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
-        IList<string> dikeList = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.DamLiveConfiguration,
-                                                                      out _).ToList();
+        string dikeId = WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.DamLiveConfiguration, out _);
         using (WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer,
-                                                                                 dikeList, DamProjectType.DamLiveConfiguration, null, out List<LogMessage> _))
+                                                                                 dikeId, DamProjectType.DamLiveConfiguration, null, out List<LogMessage> _))
         using (WaterBoard referenceWaterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder,
                                                                                           dataSourceContainer,
-                                                                                          dikeList, DamProjectType.DamLiveConfiguration, null, out List<LogMessage> _))
+                                                                                          dikeId, DamProjectType.DamLiveConfiguration, null, out List<LogMessage> _))
         {
             // If profiles are defined as relative profiles, new absolute profiles will be generated for each location
             if (dataSourceContainer.IsImportAsRelativeProfiles)
@@ -334,8 +333,8 @@
             }
 
             // Check Dike
-            Assert.That(waterBoard.Dikes.Count, Is.EqualTo(1));
-            Dike dike = waterBoard.Dikes[0];
+            Assert.That(waterBoard.Dike, Is.Not.Null);
+            Dike dike = waterBoard.Dike;
 
             //Check locations
             Assert.That(dike.Locations.Count, Is.EqualTo(2));
@@ -421,15 +420,15 @@
 
         dataSourceContainer = DataSourceContainer.Deserialize(definitionFilename);
         string damImportFolder = Path.GetDirectoryName(definitionFilename);
-        IList<string> dikeList =
+        string dikeList =
             WaterBoardImporter.ImportDikeRingIds(damImportFolder, dataSourceContainer, DamProjectType.DamLiveConfiguration,
-                                                 out _).ToList();
+                                                 out _);
         using (WaterBoard waterBoard = WaterBoardImporter.ImportDataForDikeRings("", damImportFolder, dataSourceContainer,
                                                                                  dikeList, DamProjectType.DamLiveConfiguration, null, out List<LogMessage> _))
         {
             // Check Dike
-            Assert.That(waterBoard.Dikes.Count, Is.EqualTo(1));
-            Dike dike = waterBoard.Dikes[0];
+            Assert.That(waterBoard.Dike, Is.Not.Null);
+            Dike dike = waterBoard.Dike;
 
             //Check locations
             Assert.That(dike.Locations.Count, Is.EqualTo(2));