Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DikeImporter.cs =================================================================== diff -u -r6952 -r6962 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DikeImporter.cs (.../DikeImporter.cs) (revision 6952) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DikeImporter.cs (.../DikeImporter.cs) (revision 6962) @@ -133,7 +133,7 @@ // Add dike other data List importedCsvSoils = importer.Dike.ImportedCsvSoils; - Dike importedDike = ImportDataForDike(importedCsvSoils, "Kering"); + Dike importedDike = ImportDataForDike(importedCsvSoils); ImportBackground(); return importedDike; @@ -143,13 +143,12 @@ /// Imports the data for dike ring. /// /// The soils as imported from the csv file - /// The dike ring identifier. /// - private Dike ImportDataForDike(List importedCsvSoils, string dikeRingId) + private Dike ImportDataForDike(List importedCsvSoils) { var importDike = new Dike { - Name = dikeRingId + Name = "Kering" }; ImportSoils(importDike); Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs =================================================================== diff -u -r6955 -r6962 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs (.../DataPluginImporterTests.cs) (revision 6955) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs (.../DataPluginImporterTests.cs) (revision 6962) @@ -1028,7 +1028,6 @@ { // A valid locations.csv has at least 3 columns // Required are location_id, surfaceline_id, segment_id. - // For the test we need dikering_id as well. // Include column for RiverLevel=water_height if (File.Exists(importFile)) { @@ -1045,7 +1044,6 @@ { // A valid locations.csv has at least 3 columns // Required are location_id, surfaceline_id, segment_id. - // For the test we need dikering_id as well. // Do NOT include column for RiverLevel=water_height if (File.Exists(importFile)) { Fisheye: Tag 6962 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/Importers/LocationCharacteristicPointImporterTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LineAttributeImporter.cs =================================================================== diff -u -r6873 -r6962 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LineAttributeImporter.cs (.../LineAttributeImporter.cs) (revision 6873) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LineAttributeImporter.cs (.../LineAttributeImporter.cs) (revision 6962) @@ -19,12 +19,9 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -//#define INCLUDE_ALL_LINE_TYPES - using System; using System.Collections.Generic; using System.Linq; -using System.Runtime.Serialization; using Deltares.Dam.Data.CsvImporters; using Deltares.Maps; @@ -297,5 +294,4 @@ public AttributeParseException(string message) : base(message) {} public AttributeParseException(string message, Exception inner) : base(message, inner) {} - } \ No newline at end of file Fisheye: Tag 6962 refers to a dead (removed) revision in file `DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Importers/LocationCharacteristicPointImporter.cs'. Fisheye: No comparison available. Pass `N' to diff?