Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs
===================================================================
diff -u -r4070 -r4167
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs	(.../DataPluginImporter.cs)	(revision 4070)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs	(.../DataPluginImporter.cs)	(revision 4167)
@@ -615,10 +615,12 @@
         {
             if (dike.SoilList.AquiferDictionary.ContainsKey(soil))
             {
-                var nvp = new NameValueParameter();
-                nvp.ParameterName = soil.Name;
-                nvp.ParameterValue = dike.SoilList.AquiferDictionary[soil].ToString();
-                nvp.Source = DataSourceSystemType.MSoilBase;
+                var nvp = new NameValueParameter
+                {
+                    ParameterName = soil.Name,
+                    ParameterValue = dike.SoilList.AquiferDictionary[soil].ToString(),
+                    Source = DataSourceSystemType.MSoilBase
+                };
                 res.Add(nvp);
             }
         }
@@ -836,23 +838,18 @@
     /// <param name="progress">The progress.</param>
     /// <param name="csvImporter">The CSV importer.</param>
     /// <returns></returns>
-    private bool ImportCsvFiles(string importFolder,
+    private void ImportCsvFiles(string importFolder,
                                 ImportMode importMode, ProgressDelegate progress, ref CsvImporter csvImporter)
     {
         DataSourceManager.CurrentSource = DataSourceSystemType.Csv;
-        bool isImportOnlyLocations = (importMode == ImportMode.DikeRingAndLocationData);
+        bool isImportOnlyLocations = importMode == ImportMode.DikeRingAndLocationData;
         csvImporter.ImportCsvDataFromDirectory(importFolder, isImportOnlyLocations, progress, damProjectType);
 
         // add messages
         List<LogMessage> messages = csvImporter.ErrorMessages;
         ImportLogMessages.AddRange(messages);
 
         DataSourceManager.CurrentSource = DataSourceSystemType.User;
-
-        // check for fatal messages
-        bool importOk = messages.All(m => m.MessageType != LogMessageType.FatalError);
-
-        return importOk;
     }
 
     /// <summary>
@@ -977,10 +974,10 @@
     /// <param name="importFolder"></param>
     /// <param name="dataAttributes"></param>
     /// <param name="importMode"></param>
-    /// <param name="dikeRingIds"></param>
     /// <param name="progress"></param>
+    /// <param name="locationRecords"></param>
     private void ImportDataShapeFiles(string importFolder, IEnumerable<DataAttribute> dataAttributes,
-                                      ImportMode importMode, IEnumerable<string> dikeRingIds,
+                                      ImportMode importMode,
                                       ProgressDelegate progress,
                                       ref List<CsvImporterLocations.LocationRecord> locationRecords)
     {
@@ -1170,7 +1167,7 @@
                 break;
             case DataSourceType.DataShapeFiles:
                 List<CsvImporterLocations.LocationRecord> locationRecords = csvImporter.LocationRecords;
-                ImportDataShapeFiles(dataLocation, attributes, importMode, dikeRingIdList, progress, ref locationRecords);
+                ImportDataShapeFiles(dataLocation, attributes, importMode, progress, ref locationRecords);
                 csvImporter.LocationRecords = locationRecords;
                 break;
             case DataSourceType.BackgroundShapeFiles: