Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/IDataPlugin.cs =================================================================== diff -u -r4203 -r4214 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/IDataPlugin.cs (.../IDataPlugin.cs) (revision 4203) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/IDataPlugin.cs (.../IDataPlugin.cs) (revision 4214) @@ -79,8 +79,7 @@ IEnumerable GetDikeRingIdList(); - void ImportDataForDikeRings(IEnumerable dikeRingIds, - ProgressDelegate progress); + void ImportDataForDikeRings(ProgressDelegate progress); Info GetDikeRingInfo(string dikeRingId); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardImporter.cs =================================================================== diff -u -r4200 -r4214 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardImporter.cs (.../WaterBoardImporter.cs) (revision 4200) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/WaterBoardImporter.cs (.../WaterBoardImporter.cs) (revision 4214) @@ -265,7 +265,7 @@ importer.DamProjectFolder = damProjectFolder; // Import dikes - bool importOk = ImportDikes(dikeRingList, progress); + bool importOk = ImportDikes(progress); if (!importOk) { @@ -406,13 +406,12 @@ /// /// Imports all specified dikes. /// - /// The dike ring ids. /// The progress. /// - private bool ImportDikes(IEnumerable dikeRingIds, ProgressDelegate progress) + private bool ImportDikes(ProgressDelegate progress) { // Import dikes - importer.ImportDataForDikeRings(dikeRingIds, progress); + importer.ImportDataForDikeRings(progress); // add log messages ImportCsvLogMessages.AddRange(importer.ImportLogMessages); Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs =================================================================== diff -u -r4208 -r4214 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs (.../DataPluginImporter.cs) (revision 4208) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DataPlugins/DataPluginImporter.cs (.../DataPluginImporter.cs) (revision 4214) @@ -250,14 +250,12 @@ /// /// Imports the data for dike rings. /// - /// The dike ring ids. /// The progress. - public void ImportDataForDikeRings(IEnumerable dikeRingIds, - ProgressDelegate progress) + public void ImportDataForDikeRings(ProgressDelegate progress) { isAllDataImported = false; isDikeRingAndLocationDataImported = false; - ImportAllData(dikeRingIds, progress); + ImportAllData(progress); } /// @@ -1035,13 +1033,11 @@ /// Imports the data. /// /// The data source. - /// The dike ring identifier list. /// The import mode. /// The progress. /// The CSV importer. /// - private void ImportData2(DataSource dataSource, - IEnumerable dikeRingIdList, ImportMode importMode, + private void ImportData2(DataSource dataSource, ImportMode importMode, ProgressDelegate progress, ref CsvImporter csvImporter) { string dataLocation = GetDataLocation(dataSource); @@ -1100,25 +1096,24 @@ /// /// Imports all data. /// - /// The dike ring ids. /// The progress. - private void ImportAllData(IEnumerable dikeRingIds, ProgressDelegate progress) + private void ImportAllData(ProgressDelegate progress) { // do nothing if all data is already imported if (isAllDataImported) { return; } - ImportData(ImportMode.All, dikeRingIds, progress); + ImportData(ImportMode.All, progress); isAllDataImported = true; } /// /// Import all data /// - private void ImportData(ImportMode importMode, IEnumerable dikeRingIds, ProgressDelegate progress) + private void ImportData(ImportMode importMode, ProgressDelegate progress) { ThrowIfNoDataDefinitions(); if (!isDikeRingAndLocationDataImported) @@ -1131,15 +1126,13 @@ waterBoard.Description = "Waterschap"; var csvImporter = new CsvImporter(); - List dikeRingIdList = dikeRingIds == null ? null : dikeRingIds as List ?? dikeRingIds.ToList(); - foreach (DataSource dataSource in DataSources) { // Skip Iris because it needs the locations // Data from shapefiles is added to locationrecords from csvImporter if (dataSource.DataSourceType != DataSourceType.Iris) { - ImportData2(dataSource, dikeRingIdList, importMode, progress, ref csvImporter); + ImportData2(dataSource, importMode, progress, ref csvImporter); } } @@ -1150,7 +1143,7 @@ { if (dataSource.DataSourceType == DataSourceType.Iris) { - ImportData2(dataSource, dikeRingIdList, importMode, progress, ref csvImporter); + ImportData2(dataSource, importMode, progress, ref csvImporter); } } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs =================================================================== diff -u -r4070 -r4214 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs (.../DataPluginImporterTests.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterTests.cs (.../DataPluginImporterTests.cs) (revision 4214) @@ -108,7 +108,7 @@ }; var dataPluginImporter = new DataPluginImporter(); dataPluginImporter.SetDataSources("", srcDataSources); - dataPluginImporter.ImportDataForDikeRings(null, null); + dataPluginImporter.ImportDataForDikeRings(null); Info info = dataPluginImporter.WaterBoardInfo; if (LocalizationManager.CurrentLanguage == LanguageType.Dutch) @@ -136,10 +136,7 @@ { SetupInvoer1WithShapeFiles(); string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); - dataPluginImporter.ImportDataForDikeRings(new List - { - dikeRingId - }, null); + dataPluginImporter.ImportDataForDikeRings(null); string scenarioIdOne = dataPluginImporter.GetScenarioList(dikeRingId, Location1Id).FirstOrDefault(); NameValueParameter[] scenarioDetailsOne = dataPluginImporter.GetScenarioDetails(dikeRingId, Location1Id, scenarioIdOne).ToArray(); @@ -170,10 +167,7 @@ { SetupInvoer1WithoutShapeFiles(); string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); - dataPluginImporter.ImportDataForDikeRings(new List - { - dikeRingId - }, null); + dataPluginImporter.ImportDataForDikeRings(null); string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, Location1Id).FirstOrDefault(); IEnumerable scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, Location1Id, scenarioId); @@ -199,10 +193,7 @@ { SetupInvoer1WithShapeFiles(); string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); - dataPluginImporter.ImportDataForDikeRings(new List - { - dikeRingId - }, null); + dataPluginImporter.ImportDataForDikeRings(null); string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, Location1Id).FirstOrDefault(); IEnumerable scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, Location1Id, scenarioId); @@ -248,10 +239,7 @@ dataPluginImporter = new DataPluginImporter(); dataPluginImporter.SetDataSources("", srcDataSources); string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); - dataPluginImporter.ImportDataForDikeRings(new List - { - dikeRingId - }, null); + dataPluginImporter.ImportDataForDikeRings(null); // Expected: The values of location are used for scenario, because it was not specified in scenarios.csv string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, "RK210-560").FirstOrDefault(); @@ -300,10 +288,7 @@ dataPluginImporter = new DataPluginImporter(); dataPluginImporter.SetDataSources("", srcDataSources); string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); - dataPluginImporter.ImportDataForDikeRings(new List - { - dikeRingId - }, null); + dataPluginImporter.ImportDataForDikeRings(null); // Expected: The values of scenarios are used for scenario string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, "RK210-560").FirstOrDefault(); @@ -352,10 +337,7 @@ dataPluginImporter = new DataPluginImporter(); dataPluginImporter.SetDataSources("", srcDataSources); string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); - dataPluginImporter.ImportDataForDikeRings(new List - { - dikeRingId - }, null); + dataPluginImporter.ImportDataForDikeRings(null); // Expected: The values are null string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, "RK210-560").FirstOrDefault(); @@ -403,10 +385,7 @@ // create importer SetupInvoerHemPolderWithoutShapeFiles(importFolder); string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); - dataPluginImporter.ImportDataForDikeRings(new List - { - dikeRingId - }, null); + dataPluginImporter.ImportDataForDikeRings(null); // check values for location 1 string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId1).FirstOrDefault(); IEnumerable scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId1, scenarioId); @@ -486,10 +465,7 @@ // create importer SetupInvoerHemPolderWithoutShapeFiles(importFolder); string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); - dataPluginImporter.ImportDataForDikeRings(new List - { - dikeRingId - }, null); + dataPluginImporter.ImportDataForDikeRings(null); // check values for location 1 string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId1).FirstOrDefault(); IEnumerable scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId1, scenarioId); @@ -577,10 +553,7 @@ // create importer SetupInvoerHemPolderWithShapeFiles(importFolder, "LijnScenario.shp"); string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); - dataPluginImporter.ImportDataForDikeRings(new List - { - dikeRingId - }, null); + dataPluginImporter.ImportDataForDikeRings(null); // check values for location 1 string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId1).FirstOrDefault(); IEnumerable scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId1, scenarioId); @@ -668,10 +641,7 @@ // create importer SetupInvoerHemPolderWithShapeFiles(importFolder, "VlakScenario.shp"); string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); - dataPluginImporter.ImportDataForDikeRings(new List - { - dikeRingId - }, null); + dataPluginImporter.ImportDataForDikeRings(null); // check values for location 1 string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId1).FirstOrDefault(); IEnumerable scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId1, scenarioId); @@ -759,10 +729,7 @@ // create importer SetupInvoerHemPolderWithShapeFiles(importFolder, "LijnScenario.shp"); string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); - dataPluginImporter.ImportDataForDikeRings(new List - { - dikeRingId - }, null); + dataPluginImporter.ImportDataForDikeRings(null); // check values for location 1 string scenarioId = dataPluginImporter.GetScenarioList(dikeRingId, HemPolderLocationId1).FirstOrDefault(); IEnumerable scenarioDetails = dataPluginImporter.GetScenarioDetails(dikeRingId, HemPolderLocationId1, scenarioId); Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterIrisTests.cs =================================================================== diff -u -r4070 -r4214 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterIrisTests.cs (.../DataPluginImporterIrisTests.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterIrisTests.cs (.../DataPluginImporterIrisTests.cs) (revision 4214) @@ -65,14 +65,10 @@ { const double cToleranceCoordinate = 0.001; string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); - dataPluginImporter.ImportDataForDikeRings(new List - { - dikeRingId - }, null); + dataPluginImporter.ImportDataForDikeRings(null); - IEnumerable locationDetails = dataPluginImporter.GetLocationDetails(dikeRingId, location02_4Id); IList surfaceLinePoints = dataPluginImporter.GetSurfaceLinePoints(dikeRingId, surfaceline02_4Id); - Assert.IsTrue(surfaceLinePoints.Count() > 0); + Assert.IsTrue(surfaceLinePoints.Count > 0); Assert.AreEqual(198341.355, surfaceLinePoints[0].X, cToleranceCoordinate); Assert.AreEqual(503761.972, surfaceLinePoints[0].Y, cToleranceCoordinate); Assert.AreEqual(0.92, surfaceLinePoints[0].Z, cToleranceCoordinate); Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterBackgroundTests.cs =================================================================== diff -u -r4070 -r4214 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterBackgroundTests.cs (.../DataPluginImporterBackgroundTests.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterBackgroundTests.cs (.../DataPluginImporterBackgroundTests.cs) (revision 4214) @@ -43,7 +43,7 @@ // Precondition : Importer has read all data public void ImporterGetIdList_InvokedOnClient_ReturnsNonEmptyList() { - importer.ImportDataForDikeRings(null, null); + importer.ImportDataForDikeRings(null); IEnumerable idlist = importer.MapGeometryIdList; Assert.IsNotNull(idlist); Assert.IsTrue(idlist.Any()); @@ -55,7 +55,7 @@ // Precondition : Importer has read all data public void ImporterGetGeometry_InvokedOnClient_ReturnsGeometry() { - importer.ImportDataForDikeRings(null, null); + importer.ImportDataForDikeRings(null); IEnumerable idlist = importer.MapGeometryIdList; Assert.IsNotNull(importer.GetMapGeometry(idlist.ElementAt(0))); } @@ -66,7 +66,7 @@ // Precondition : Importer has read all data public void ImporterGetGeometryAttributes_InvokedOnClient_ReturnsAttributeList() { - importer.ImportDataForDikeRings(null, null); + importer.ImportDataForDikeRings(null); IEnumerable idlist = importer.MapGeometryIdList; Assert.IsNotNull(importer.GetMapGeometryAttributes(idlist.ElementAt(0))); } Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterDataShapeFilesTests.cs =================================================================== diff -u -r4070 -r4214 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterDataShapeFilesTests.cs (.../DataPluginImporterDataShapeFilesTests.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterDataShapeFilesTests.cs (.../DataPluginImporterDataShapeFilesTests.cs) (revision 4214) @@ -54,10 +54,7 @@ { SetupGrootSalland(); string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); - dataPluginImporter.ImportDataForDikeRings(new List - { - dikeRingId - }, null); + dataPluginImporter.ImportDataForDikeRings(null); IEnumerable locationDetails = dataPluginImporter.GetLocationDetails(dikeRingId, Location275Id); NameValueParameter[] nameValueParameters = locationDetails as NameValueParameter[] ?? locationDetails.ToArray(); @@ -71,10 +68,7 @@ { SetupGrootSalland(); string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); - dataPluginImporter.ImportDataForDikeRings(new List - { - dikeRingId - }, null); + dataPluginImporter.ImportDataForDikeRings(null); IEnumerable locationDetails = dataPluginImporter.GetLocationDetails(dikeRingId, Location275Id); NameValueParameter[] nameValueParameters = locationDetails as NameValueParameter[] ?? locationDetails.ToArray(); @@ -88,10 +82,7 @@ { SetupHHNK_WILMEBREEK(); string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); - dataPluginImporter.ImportDataForDikeRings(new List - { - dikeRingId - }, null); + dataPluginImporter.ImportDataForDikeRings(null); IEnumerable locationDetails = dataPluginImporter.GetLocationDetails(dikeRingId, Location1Id); NameValueParameter[] nameValueParameters = locationDetails as NameValueParameter[] ?? locationDetails.ToArray(); @@ -121,10 +112,7 @@ { SetupGrootSalland(); string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); - dataPluginImporter.ImportDataForDikeRings(new List - { - dikeRingId - }, null); + dataPluginImporter.ImportDataForDikeRings(null); IEnumerable locationDetails = dataPluginImporter.GetLocationDetails(dikeRingId, Location275Id); Assert.AreEqual("-1.5", locationDetails.First( Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterCsvTests.cs =================================================================== diff -u -r4070 -r4214 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterCsvTests.cs (.../DataPluginImporterCsvTests.cs) (revision 4070) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/DataPluginImporterCsvTests.cs (.../DataPluginImporterCsvTests.cs) (revision 4214) @@ -61,7 +61,7 @@ IEnumerable dikeList = dataPluginImporter.GetDikeRingIdList(); Assert.AreEqual(1, dikeList.Count()); string dikeRingId = dikeList.FirstOrDefault(); - dataPluginImporter.ImportDataForDikeRings(dikeList, null); + dataPluginImporter.ImportDataForDikeRings(null); Info dikeInfo = dataPluginImporter.GetDikeRingInfo(dikeRingId); Assert.AreEqual("dijkring10", dikeInfo.Name); } @@ -70,10 +70,7 @@ public void CanRetrieveLocationData() { string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); - dataPluginImporter.ImportDataForDikeRings(new List - { - dikeRingId - }, null); + dataPluginImporter.ImportDataForDikeRings(null); IEnumerable locationIdList = dataPluginImporter.GetLocationIdList(dikeRingId); Assert.AreEqual(24, locationIdList.Count()); @@ -93,10 +90,7 @@ public void CanRetrieveSegmentData() { string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); - dataPluginImporter.ImportDataForDikeRings(new List - { - dikeRingId - }, null); + dataPluginImporter.ImportDataForDikeRings(null); IEnumerable segmentIdList = dataPluginImporter.GetSegmentIdList(dikeRingId); Assert.AreEqual(24, segmentIdList.Count()); @@ -122,10 +116,7 @@ // Check if surfacelines available string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); - dataPluginImporter.ImportDataForDikeRings(new List - { - dikeRingId - }, null); + dataPluginImporter.ImportDataForDikeRings(null); IEnumerable surfaceLineIdList = dataPluginImporter.GetSurfaceLineIdList(dikeRingId); Assert.AreEqual(13, surfaceLineIdList.Count()); @@ -162,10 +153,7 @@ // Check if soilprofiles available string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); - dataPluginImporter.ImportDataForDikeRings(new List - { - dikeRingId - }, null); + dataPluginImporter.ImportDataForDikeRings(null); IEnumerable soilProfile1DIdList = dataPluginImporter.GetSoilProfile1DIdList(dikeRingId); Assert.AreEqual(26, soilProfile1DIdList.Count()); @@ -187,10 +175,7 @@ const double cToleranceDimension = 0.001; string dikeRingId = dataPluginImporter.GetDikeRingIdList().FirstOrDefault(); - dataPluginImporter.ImportDataForDikeRings(new List - { - dikeRingId - }, null); + dataPluginImporter.ImportDataForDikeRings(null); List scenarioList = dataPluginImporter.GetScenarioList(dikeRingId, location18_6Id).ToList(); Assert.AreEqual(1, scenarioList.Count());