Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardImporter.cs
===================================================================
diff -u -r2089 -r2168
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardImporter.cs	(.../WaterBoardImporter.cs)	(revision 2089)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardImporter.cs	(.../WaterBoardImporter.cs)	(revision 2168)
@@ -58,7 +58,6 @@
 
         private readonly WaterBoard waterBoard = new WaterBoard();
 
-        private readonly DamType damType;
         private readonly DamProjectType damProjectType;
         private readonly List<LogMessage> importCsvLogMessages = new List<LogMessage>();
 
@@ -84,7 +83,7 @@
             get
             {
                 importCsvLogMessages.Clear();
-                var dikeRingIdList = importer.GetDikeRingIdList(damType).ToList();
+                var dikeRingIdList = importer.GetDikeRingIdList().ToList();
                 importCsvLogMessages.AddRange(importer.ImportLogMessages);
                 return dikeRingIdList;
             }
@@ -124,14 +123,12 @@
         /// </summary>
         /// <param name="dataFolder">The data folder.</param>
         /// <param name="dataSourceContainer">The data source container.</param>
-        /// <param name="damType">Type of the dam.</param>
         /// <param name="damProjectType">Type of the dam project.</param>
-        private WaterBoardImporter(string dataFolder, DataSourceContainer dataSourceContainer, DamType damType, DamProjectType damProjectType)
+        private WaterBoardImporter(string dataFolder, DataSourceContainer dataSourceContainer, DamProjectType damProjectType)
         {
             this.damProjectType = damProjectType;
             importer = CreateDataPlugin(dataFolder, dataSourceContainer);
             importer.DamProjectType = damProjectType;
-            this.damType = damType;
         }
 
         /// <summary>
@@ -154,14 +151,13 @@
         /// </summary>
         /// <param name="dataFolder">The data folder.</param>
         /// <param name="dataSourceContainer">The data source container.</param>
-        /// <param name="damType">Type of the dam.</param>
         /// <param name="damProjectType">Type of the dam project.</param>
         /// <param name="importLogMessages">The import log messages.</param>
         /// <returns></returns>
         public static IEnumerable<string> ImportDikeRingIds(
-            string dataFolder, DataSourceContainer dataSourceContainer, DamType damType, DamProjectType damProjectType, out List<LogMessage> importLogMessages)
+            string dataFolder, DataSourceContainer dataSourceContainer, DamProjectType damProjectType, out List<LogMessage> importLogMessages)
         {
-            var importer = new WaterBoardImporter(dataFolder, dataSourceContainer, damType, damProjectType);
+            var importer = new WaterBoardImporter(dataFolder, dataSourceContainer, damProjectType);
 
             var allDikeRingIds = importer.AllDikeRingIDs;
             importLogMessages = new List<LogMessage>(importer.ImportCsvLogMessages);
@@ -174,19 +170,18 @@
         /// </summary>
         /// <param name="dataFolder">The data folder.</param>
         /// <param name="dataSourceContainer">The data source container.</param>
-        /// <param name="damType">Type of the dam.</param>
         /// <param name="damProjectType">Type of the dam project.</param>
         /// <param name="progress">The progress.</param>
         /// <param name="logMessages">The log messages.</param>
         /// <returns></returns>
         public static WaterBoard ImportAllData(string dataFolder,
-            DataSourceContainer dataSourceContainer, DamType damType, DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress,
+            DataSourceContainer dataSourceContainer, DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress,
             out List<LogMessage> logMessages)
         {
             var importer = CreateDataPlugin(dataFolder, dataSourceContainer);
-            var dikeRingIds = importer.GetDikeRingIdList(damType);
+            var dikeRingIds = importer.GetDikeRingIdList();
             WaterBoard waterboard = ImportDataForDikeRings("", dataFolder, dataSourceContainer,
-                dikeRingIds, damType, damProjectType, progress, out logMessages);
+                dikeRingIds, damProjectType, progress, out logMessages);
             return waterboard;
         }
 
@@ -195,15 +190,14 @@
         /// </summary>
         /// <param name="dataFolder">The data folder.</param>
         /// <param name="dataSourceContainer">The data source container.</param>
-        /// <param name="damType">Type of the dam.</param>
         /// <param name="damProjectType">Type of the dam project.</param>
         /// <param name="progress">The progress.</param>
         /// <returns></returns>
         public static WaterBoard ImportAllData(string dataFolder,
-            DataSourceContainer dataSourceContainer, DamType damType, DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress)
+            DataSourceContainer dataSourceContainer, DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress)
         {
             List<LogMessage> dummy;
-            return ImportAllData(dataFolder, dataSourceContainer, damType, damProjectType, progress, out dummy);
+            return ImportAllData(dataFolder, dataSourceContainer, damProjectType, progress, out dummy);
         }
 
         /// <summary>
@@ -213,17 +207,16 @@
         /// <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="damType">Type of the dam.</param>
         /// <param name="damProjectType">Type of the dam project.</param>
         /// <param name="progress">The progress.</param>
         /// <returns></returns>
         public static WaterBoard ImportDataForDikeRings(string damProjectFolder, string dataFolder,
             DataSourceContainer dataSourceContainer, IEnumerable<string> dikeRingIds,
-            DamType damType, DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress)
+            DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress)
         {
             List<LogMessage> dummy;
             return ImportDataForDikeRings(damProjectFolder, dataFolder, dataSourceContainer,
-                dikeRingIds, damType, damProjectType, progress, out dummy);
+                dikeRingIds, damProjectType, progress, out dummy);
         }
 
         /// <summary>
@@ -233,16 +226,15 @@
         /// <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="damType">Type of the dam.</param>
         /// <param name="damProjectType">Type of the dam project.</param>
         /// <param name="progress">The progress.</param>
         /// <param name="logMessages">The log messages.</param>
         /// <returns></returns>
         public static WaterBoard ImportDataForDikeRings(string damProjectFolder, string dataFolder,
             DataSourceContainer dataSourceContainer, IEnumerable<string> dikeRingIds,
-            DamType damType, DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress, out List<LogMessage> logMessages)
+            DamProjectType damProjectType, DamEngine.Data.Standard.Calculation.ProgressDelegate progress, out List<LogMessage> logMessages)
         {
-            var importer = new WaterBoardImporter(dataFolder, dataSourceContainer, damType, damProjectType);
+            var importer = new WaterBoardImporter(dataFolder, dataSourceContainer, damProjectType);
 
             logMessages = new List<LogMessage>();
             WaterBoard waterBoard = new WaterBoard();
@@ -315,7 +307,7 @@
         {
             // if no dike ring IDs specified, take all
             return dikeRingIds == null
-                       ? importer.GetDikeRingIdList(damType).ToList()
+                       ? importer.GetDikeRingIdList().ToList()
                        : (dikeRingIds as List<string> ?? dikeRingIds.ToList());
         }
 
@@ -471,7 +463,7 @@
         private bool ImportDikes(IEnumerable<string> dikeRingIds, DamEngine.Data.Standard.Calculation.ProgressDelegate progress)
         {
             // Import dikes
-            importer.ImportDataForDikeRings(dikeRingIds, damType, progress);
+            importer.ImportDataForDikeRings(dikeRingIds, progress);
 
             // add log messages
             ImportCsvLogMessages.AddRange(importer.ImportLogMessages);
@@ -542,7 +534,7 @@
         /// <param name="dike">The dike.</param>
         private void ImportLocations(string dikeRingId, Dike dike)
         {
-            var locationIdList = importer.GetLocationIdList(dikeRingId, damType);
+            var locationIdList = importer.GetLocationIdList(dikeRingId);
 
             foreach (string locationId in locationIdList)
             {