Index: Core/Common/src/Core.Common.Gui/Commands/GuiExportHandler.cs =================================================================== diff -u -r392383a267a69010698aef6948b1e53c6a889bae -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Core/Common/src/Core.Common.Gui/Commands/GuiExportHandler.cs (.../GuiExportHandler.cs) (revision 392383a267a69010698aef6948b1e53c6a889bae) +++ Core/Common/src/Core.Common.Gui/Commands/GuiExportHandler.cs (.../GuiExportHandler.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -123,7 +123,7 @@ { using (var saveFileDialog = new SaveFileDialog { - Filter = exportInfo.FileFilter.Filter, + Filter = exportInfo.FileFilterGenerator.Filter, Title = Resources.SaveFileDialog_Title }) { Index: Core/Common/src/Core.Common.Gui/Commands/GuiImportHandler.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Core/Common/src/Core.Common.Gui/Commands/GuiImportHandler.cs (.../GuiImportHandler.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Core/Common/src/Core.Common.Gui/Commands/GuiImportHandler.cs (.../GuiImportHandler.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -140,7 +140,7 @@ private void ImportItemsUsingDialog(ImportInfo importInfo, object target) { - string fileDialogResult = inquiryHelper.GetSourceFileLocation(importInfo.FileFilter); + string fileDialogResult = inquiryHelper.GetSourceFileLocation(importInfo.FileFilterGenerator); if (fileDialogResult != null && importInfo.VerifyUpdates(target)) { Index: Core/Common/src/Core.Common.Gui/Commands/GuiUpdateHandler.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Core/Common/src/Core.Common.Gui/Commands/GuiUpdateHandler.cs (.../GuiUpdateHandler.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Core/Common/src/Core.Common.Gui/Commands/GuiUpdateHandler.cs (.../GuiUpdateHandler.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -143,7 +143,7 @@ string filePath = updateInfo.CurrentPath(target); if (!File.Exists(filePath)) { - filePath = inquiryHelper.GetSourceFileLocation(updateInfo.FileFilter); + filePath = inquiryHelper.GetSourceFileLocation(updateInfo.FileFilterGenerator); } if (filePath != null && updateInfo.VerifyUpdates(target)) { Index: Core/Common/src/Core.Common.Gui/Plugin/ExportInfo.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Core/Common/src/Core.Common.Gui/Plugin/ExportInfo.cs (.../ExportInfo.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Core/Common/src/Core.Common.Gui/Plugin/ExportInfo.cs (.../ExportInfo.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -70,9 +70,9 @@ public Image Image { get; set; } /// - /// Gets or sets the file filter of the export information. + /// Gets or sets the file filter generator of the export information used to make file filters. /// - public FileFilterGenerator FileFilter { get; set; } + public FileFilterGenerator FileFilterGenerator { get; set; } } /// @@ -127,9 +127,9 @@ public Image Image { get; set; } /// - /// Gets or sets the file filter of the export information. + /// Gets or sets the file filter generator of the export information used to make file filters. /// - public FileFilterGenerator FileFilter { get; set; } + public FileFilterGenerator FileFilterGenerator { get; set; } /// /// Performs an implicit conversion from to . @@ -148,7 +148,7 @@ Name = exportInfo.Name, Category = exportInfo.Category, Image = exportInfo.Image, - FileFilter = exportInfo.FileFilter + FileFilterGenerator = exportInfo.FileFilterGenerator }; } } Index: Core/Common/src/Core.Common.Gui/Plugin/ImportInfo.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Core/Common/src/Core.Common.Gui/Plugin/ImportInfo.cs (.../ImportInfo.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Core/Common/src/Core.Common.Gui/Plugin/ImportInfo.cs (.../ImportInfo.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -76,9 +76,9 @@ public Image Image { get; set; } /// - /// Gets or sets the file filter of the import information. + /// Gets or sets the file filter generator of the import information used to make file filters. /// - public FileFilterGenerator FileFilter { get; set; } + public FileFilterGenerator FileFilterGenerator { get; set; } } /// @@ -117,6 +117,10 @@ /// public Func IsEnabled { get; set; } + /// + /// Gets or sets the method used to verify whether changes that are induced by the importer + /// are allowed. + /// public Func VerifyUpdates { get; set; } /// @@ -135,9 +139,9 @@ public Image Image { get; set; } /// - /// Gets or sets the file filter of the import information. + /// Gets or sets the file filter generator of the import information used to make file filters. /// - public FileFilterGenerator FileFilter { get; set; } + public FileFilterGenerator FileFilterGenerator { get; set; } /// /// Performs an implicit conversion from to . @@ -155,7 +159,7 @@ Name = importInfo.Name, Category = importInfo.Category, Image = importInfo.Image, - FileFilter = importInfo.FileFilter + FileFilterGenerator = importInfo.FileFilterGenerator }; } } Index: Core/Common/src/Core.Common.Gui/Plugin/UpdateInfo.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Core/Common/src/Core.Common.Gui/Plugin/UpdateInfo.cs (.../UpdateInfo.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Core/Common/src/Core.Common.Gui/Plugin/UpdateInfo.cs (.../UpdateInfo.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -31,7 +31,7 @@ public class UpdateInfo { /// - /// Gets or sets the data type associated with this import info. + /// Gets or sets the data type associated with this update info. /// public Type DataType { get; set; } @@ -47,10 +47,10 @@ public Func CreateFileImporter { get; set; } /// - /// Gets or sets the method used to determine whether or not the import routine should be enabled. Function arguments: + /// Gets or sets the method used to determine whether or not the update routine should be enabled. Function arguments: /// - /// The data to import. - /// out - true if the import should be enabled, false otherwise. + /// The data to update. + /// out - true if the update should be enabled, false otherwise. /// /// public Func IsEnabled { get; set; } @@ -67,34 +67,34 @@ public Func CurrentPath { get; set; } /// - /// Gets or sets the name of the import information. + /// Gets or sets the name of the update information. /// public string Name { get; set; } /// - /// Gets or sets the category of the import information. + /// Gets or sets the category of the update information. /// public string Category { get; set; } /// - /// Gets or sets the image of the import information. + /// Gets or sets the image of the update information. /// public Image Image { get; set; } /// - /// Gets or sets the file filter of the import information. + /// Gets or sets the file filter generator of the update information used to make file filters. /// - public FileFilterGenerator FileFilter { get; set; } + public FileFilterGenerator FileFilterGenerator { get; set; } } /// /// Information for creating an importer for updating a particular data object. /// - /// The data type associated with this import info. + /// The data type associated with this update info. public class UpdateInfo { /// - /// Gets the data type associated with this import info. + /// Gets the data type associated with this update info. /// public Type DataType { @@ -116,10 +116,10 @@ public Func CreateFileImporter { get; set; } /// - /// Gets or sets the method used to determine whether or not the import routine should be enabled. Function arguments: + /// Gets or sets the method used to determine whether or not the update routine should be enabled. Function arguments: /// - /// The data to import. - /// out - true if the import should be enabled, false otherwise. + /// The data to update. + /// out - true if the update should be enabled, false otherwise. /// /// public Func IsEnabled { get; set; } @@ -136,43 +136,43 @@ public Func CurrentPath { get; set; } /// - /// Gets or sets the name of the import information. + /// Gets or sets the name of the update information. /// public string Name { get; set; } /// - /// Gets or sets the category of the import information. + /// Gets or sets the category of the update information. /// public string Category { get; set; } /// - /// Gets or sets the image of the import information. + /// Gets or sets the image of the update information. /// public Image Image { get; set; } /// - /// Gets or sets the file filter of the import information. + /// Gets or sets the file filter generator of the update information used to make file filters. /// - public FileFilterGenerator FileFilter { get; set; } + public FileFilterGenerator FileFilterGenerator { get; set; } /// - /// Performs an implicit conversion from to . + /// Performs an implicit conversion from to . /// - /// The import information to convert. + /// The update information to convert. /// The result of the conversion. - public static implicit operator UpdateInfo(UpdateInfo importInfo) + public static implicit operator UpdateInfo(UpdateInfo updateInfo) { return new UpdateInfo { - DataType = importInfo.DataType, - CreateFileImporter = (data, path) => importInfo.CreateFileImporter?.Invoke((TData) data, path), - IsEnabled = data => importInfo.IsEnabled == null || importInfo.IsEnabled((TData) data), - VerifyUpdates = data => importInfo.VerifyUpdates == null || importInfo.VerifyUpdates((TData) data), - CurrentPath = data => importInfo.CurrentPath?.Invoke((TData) data), - Name = importInfo.Name, - Category = importInfo.Category, - Image = importInfo.Image, - FileFilter = importInfo.FileFilter + DataType = updateInfo.DataType, + CreateFileImporter = (data, path) => updateInfo.CreateFileImporter?.Invoke((TData) data, path), + IsEnabled = data => updateInfo.IsEnabled == null || updateInfo.IsEnabled((TData) data), + VerifyUpdates = data => updateInfo.VerifyUpdates == null || updateInfo.VerifyUpdates((TData) data), + CurrentPath = data => updateInfo.CurrentPath?.Invoke((TData) data), + Name = updateInfo.Name, + Category = updateInfo.Category, + Image = updateInfo.Image, + FileFilterGenerator = updateInfo.FileFilterGenerator }; } } Index: Core/Common/test/Core.Common.Gui.Test/Commands/GuiExportHandlerTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Core/Common/test/Core.Common.Gui.Test/Commands/GuiExportHandlerTest.cs (.../GuiExportHandlerTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Core/Common/test/Core.Common.Gui.Test/Commands/GuiExportHandlerTest.cs (.../GuiExportHandlerTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -133,7 +133,7 @@ { new ExportInfo { - FileFilter = new FileFilterGenerator(), + FileFilterGenerator = new FileFilterGenerator(), CreateFileExporter = (o, s) => exporterMock } }); @@ -171,7 +171,7 @@ { new ExportInfo { - FileFilter = new FileFilterGenerator(), + FileFilterGenerator = new FileFilterGenerator(), CreateFileExporter = (data, filePath) => { Assert.AreEqual(expectedData, data); @@ -218,7 +218,7 @@ { new ExportInfo { - FileFilter = new FileFilterGenerator(), + FileFilterGenerator = new FileFilterGenerator(), CreateFileExporter = (data, filePath) => exporterMock } }); Index: Core/Common/test/Core.Common.Gui.Test/Commands/GuiImportHandlerTest.cs =================================================================== diff -u -r0652e34fa7946d2bd466f9331b3daa728804d109 -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Core/Common/test/Core.Common.Gui.Test/Commands/GuiImportHandlerTest.cs (.../GuiImportHandlerTest.cs) (revision 0652e34fa7946d2bd466f9331b3daa728804d109) +++ Core/Common/test/Core.Common.Gui.Test/Commands/GuiImportHandlerTest.cs (.../GuiImportHandlerTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -286,12 +286,12 @@ { // Setup const string filePath = "/some/path"; - var filter = new FileFilterGenerator(); + var generator = new FileFilterGenerator(); var targetObject = new object(); var mockRepository = new MockRepository(); var inquiryHelper = mockRepository.Stub(); - inquiryHelper.Expect(ih => ih.GetSourceFileLocation(filter)).Return(filePath); + inquiryHelper.Expect(ih => ih.GetSourceFileLocation(generator)).Return(filePath); var fileImporter = mockRepository.Stub(); mockRepository.ReplayAll(); @@ -316,7 +316,7 @@ isCreateFileImporterCalled = true; return fileImporter; }, - FileFilter = filter, + FileFilterGenerator = generator, VerifyUpdates = o => { Assert.AreSame(o, targetObject); @@ -340,12 +340,12 @@ public void ImportOn_MultipleSupportedImportInfoAvailableVerifyUpdatesUnsuccesful_ActivityNotCreated() { // Setup - var filter = new FileFilterGenerator(); + var generator = new FileFilterGenerator(); var targetObject = new object(); var mockRepository = new MockRepository(); var inquiryHelper = mockRepository.Stub(); - inquiryHelper.Stub(ih => ih.GetSourceFileLocation(filter)).Return("/some/path"); + inquiryHelper.Stub(ih => ih.GetSourceFileLocation(generator)).Return("/some/path"); var fileImporter = mockRepository.Stub(); mockRepository.ReplayAll(); @@ -362,7 +362,7 @@ Assert.Fail("CreateFileImporter is not expected to be called when VerifyUpdates function returns false."); return fileImporter; }, - FileFilter = filter, + FileFilterGenerator = generator, VerifyUpdates = o => { Assert.AreSame(o, targetObject); Index: Core/Common/test/Core.Common.Gui.Test/Commands/GuiUpdateHandlerTest.cs =================================================================== diff -u -r0652e34fa7946d2bd466f9331b3daa728804d109 -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Core/Common/test/Core.Common.Gui.Test/Commands/GuiUpdateHandlerTest.cs (.../GuiUpdateHandlerTest.cs) (revision 0652e34fa7946d2bd466f9331b3daa728804d109) +++ Core/Common/test/Core.Common.Gui.Test/Commands/GuiUpdateHandlerTest.cs (.../GuiUpdateHandlerTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -286,12 +286,12 @@ { // Setup const string filePath = "/some/path"; - var filter = new FileFilterGenerator(); + var generator = new FileFilterGenerator(); var targetObject = new object(); var mockRepository = new MockRepository(); var inquiryHelper = mockRepository.Stub(); - inquiryHelper.Expect(ih => ih.GetSourceFileLocation(filter)).Return(filePath); + inquiryHelper.Expect(ih => ih.GetSourceFileLocation(generator)).Return(filePath); IFileImporter fileImporter = mockRepository.Stub(); mockRepository.ReplayAll(); @@ -316,7 +316,7 @@ isCreateFileImporterCalled = true; return fileImporter; }, - FileFilter = filter, + FileFilterGenerator = generator, VerifyUpdates = o => { Assert.AreSame(o, targetObject); @@ -340,11 +340,11 @@ public void UpdateOn_SupportedUpdateInfoAvailableVerifyUpdatesUnsuccesful_ActivityNotCreated() { // Setup - var filter = new FileFilterGenerator(); + var generator = new FileFilterGenerator(); var targetObject = new object(); var mockRepository = new MockRepository(); var inquiryHelper = mockRepository.Stub(); - inquiryHelper.Expect(ih => ih.GetSourceFileLocation(filter)).Return("/some/path"); + inquiryHelper.Expect(ih => ih.GetSourceFileLocation(generator)).Return("/some/path"); var fileImporter = mockRepository.Stub(); mockRepository.ReplayAll(); @@ -361,7 +361,7 @@ Assert.Fail("CreateFileImporter is not expected to be called when VerifyUpdates function returns false."); return fileImporter; }, - FileFilter = filter, + FileFilterGenerator = generator, VerifyUpdates = o => { Assert.AreSame(o, targetObject); Index: Core/Common/test/Core.Common.Gui.Test/Plugin/ExportInfoTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Core/Common/test/Core.Common.Gui.Test/Plugin/ExportInfoTest.cs (.../ExportInfoTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Core/Common/test/Core.Common.Gui.Test/Plugin/ExportInfoTest.cs (.../ExportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -43,7 +43,7 @@ Assert.IsNull(info.Name); Assert.IsNull(info.Category); Assert.IsNull(info.Image); - Assert.IsNull(info.FileFilter); + Assert.IsNull(info.FileFilterGenerator); } [Test] @@ -59,7 +59,7 @@ Assert.IsNull(info.Name); Assert.IsNull(info.Category); Assert.IsNull(info.Image); - Assert.IsNull(info.FileFilter); + Assert.IsNull(info.FileFilterGenerator); } [Test] @@ -73,7 +73,7 @@ const string name = "name"; const string category = "category"; var image = new Bitmap(16, 16); - var fileFilter = new FileFilterGenerator(); + var generator = new FileFilterGenerator(); var info = new ExportInfo { @@ -82,7 +82,7 @@ Name = name, Category = category, Image = image, - FileFilter = fileFilter + FileFilterGenerator = generator }; // Precondition @@ -101,7 +101,7 @@ Assert.AreEqual(name, info.Name); Assert.AreEqual(category, info.Category); Assert.AreSame(image, info.Image); - Assert.AreEqual(fileFilter, info.FileFilter); + Assert.AreEqual(generator, info.FileFilterGenerator); mocks.VerifyAll(); } @@ -128,7 +128,7 @@ Assert.IsNull(info.Name); Assert.IsNull(info.Category); Assert.IsNull(info.Image); - Assert.IsNull(info.FileFilter); + Assert.IsNull(info.FileFilterGenerator); } } } \ No newline at end of file Index: Core/Common/test/Core.Common.Gui.Test/Plugin/ImportInfoTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Core/Common/test/Core.Common.Gui.Test/Plugin/ImportInfoTest.cs (.../ImportInfoTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Core/Common/test/Core.Common.Gui.Test/Plugin/ImportInfoTest.cs (.../ImportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -43,7 +43,7 @@ Assert.IsNull(info.Name); Assert.IsNull(info.Category); Assert.IsNull(info.Image); - Assert.IsNull(info.FileFilter); + Assert.IsNull(info.FileFilterGenerator); } [Test] @@ -59,7 +59,7 @@ Assert.IsNull(info.Name); Assert.IsNull(info.Category); Assert.IsNull(info.Image); - Assert.IsNull(info.FileFilter); + Assert.IsNull(info.FileFilterGenerator); } [Test] @@ -73,7 +73,7 @@ const string name = "name"; const string category = "category"; Bitmap image = new Bitmap(16, 16); - var fileFilter = new FileFilterGenerator(); + var generator = new FileFilterGenerator(); var info = new ImportInfo { @@ -82,7 +82,7 @@ Name = name, Category = category, Image = image, - FileFilter = fileFilter + FileFilterGenerator = generator }; // Precondition @@ -101,7 +101,7 @@ Assert.AreEqual(name, info.Name); Assert.AreEqual(category, info.Category); Assert.AreSame(image, info.Image); - Assert.AreEqual(fileFilter, info.FileFilter); + Assert.AreEqual(generator, info.FileFilterGenerator); mocks.VerifyAll(); } @@ -128,7 +128,7 @@ Assert.IsNull(info.Name); Assert.IsNull(info.Category); Assert.IsNull(info.Image); - Assert.IsNull(info.FileFilter); + Assert.IsNull(info.FileFilterGenerator); } } } \ No newline at end of file Index: Core/Plugins/src/Core.Plugins.Map/MapPlugin.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Core/Plugins/src/Core.Plugins.Map/MapPlugin.cs (.../MapPlugin.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Core/Plugins/src/Core.Plugins.Map/MapPlugin.cs (.../MapPlugin.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -78,7 +78,7 @@ Name = Resources.Name_Layer, Category = Resources.Categories_Layer, Image = Resources.MapPlusIcon, - FileFilter = new FileFilterGenerator( + FileFilterGenerator = new FileFilterGenerator( Resources.MapPlugin_GetImportInfos_MapDataCollection_filefilter_Extension, Resources.MapPlugin_GetImportInfos_MapDataCollection_filefilter_Description), IsEnabled = mapDataCollection => true, Index: Core/Plugins/test/Core.Plugins.Map.Test/ImportInfos/MapDataCollectionImportInfoTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Core/Plugins/test/Core.Plugins.Map.Test/ImportInfos/MapDataCollectionImportInfoTest.cs (.../MapDataCollectionImportInfoTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Core/Plugins/test/Core.Plugins.Map.Test/ImportInfos/MapDataCollectionImportInfoTest.cs (.../MapDataCollectionImportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -94,7 +94,7 @@ public void FileFilter_Always_ReturnExpectedFileFilter() { // Call - FileFilterGenerator fileFilter = importInfo.FileFilter; + FileFilterGenerator fileFilter = importInfo.FileFilterGenerator; // Assert Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter.Filter); Index: Ringtoets.sln =================================================================== diff -u -r9c1789fd6fa33b6ea18339bf2474102471ef4510 -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets.sln (.../Ringtoets.sln) (revision 9c1789fd6fa33b6ea18339bf2474102471ef4510) +++ Ringtoets.sln (.../Ringtoets.sln) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -1372,12 +1372,18 @@ EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Piping.IO.TestUtil", "Ringtoets\Piping\test\Ringtoets.Piping.IO.TestUtil\Ringtoets.Piping.IO.TestUtil.csproj", "{4A675B7E-96AD-4911-B154-85385C9330C3}" + ProjectSection(ProjectDependencies) = postProject + {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Integration.TestUtils.Test", "Ringtoets\Integration\test\Ringtoets.Integration.TestUtils.Test\Ringtoets.Integration.TestUtils.Test.csproj", "{EA3E979C-FB00-443B-B6A0-273254F24802}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Piping.Integration.TestUtils.Test", "Ringtoets\Piping\test\Ringtoets.Piping.Integration.TestUtils.Test\Ringtoets.Piping.Integration.TestUtils.Test.csproj", "{070DC87D-520B-4A84-8965-ED5012875FCC}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Piping.IO.TestUtil.Test", "Ringtoets\Piping\test\Ringtoets.Piping.IO.TestUtil.Test\Ringtoets.Piping.IO.TestUtil.Test.csproj", "{000F1F5A-B5BC-4169-8393-15AD87A9E0CE}" + ProjectSection(ProjectDependencies) = postProject + {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC} + EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Components.Gis.TestUtils", "Core\Components\test\Core.Components.Gis.TestUtils\Core.Components.Gis.TestUtils.csproj", "{F0FB401A-3494-4237-9E6D-02CDF77912A8}" ProjectSection(ProjectDependencies) = postProject Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs =================================================================== diff -u -r242268fc2adc055cc3ac4f28b14b4db26251b30e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision 242268fc2adc055cc3ac4f28b14b4db26251b30e) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -191,7 +191,7 @@ Name = RingtoetsCommonFormsResources.StructuresImporter_DisplayName, Category = RingtoetsCommonFormsResources.Ringtoets_Category, Image = RingtoetsCommonFormsResources.StructuresIcon, - FileFilter = new FileFilterGenerator( + FileFilterGenerator = new FileFilterGenerator( RingtoetsCommonIOResources.Shape_file_filter_Extension, RingtoetsCommonIOResources.Shape_file_filter_Description), IsEnabled = context => context.AssessmentSection.ReferenceLine != null Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ImportInfos/ClosingStructuresContextImportInfoTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ImportInfos/ClosingStructuresContextImportInfoTest.cs (.../ClosingStructuresContextImportInfoTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ImportInfos/ClosingStructuresContextImportInfoTest.cs (.../ClosingStructuresContextImportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -121,7 +121,7 @@ ImportInfo importInfo = GetImportInfo(plugin); // Call - FileFilterGenerator fileFilter = importInfo.FileFilter; + FileFilterGenerator fileFilter = importInfo.FileFilterGenerator; // Assert Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter.Filter); Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -141,7 +141,7 @@ { CreateFileExporter = (context, filePath) => new DuneLocationsExporter(context.WrappedData, filePath), IsEnabled = context => context.WrappedData.Any(dl => dl.Output != null), - FileFilter = new FileFilterGenerator( + FileFilterGenerator = new FileFilterGenerator( Resources.DuneErosionPlugin_GetExportInfos_MorphAn_boundary_conditions_file_filter_Extension, Resources.DuneErosionPlugin_GetExportInfos_MorphAn_boundary_conditions_file_filter_Description) }; Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ExportInfos/DuneLocationsContextExportInfoTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ExportInfos/DuneLocationsContextExportInfoTest.cs (.../DuneLocationsContextExportInfoTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/ExportInfos/DuneLocationsContextExportInfoTest.cs (.../DuneLocationsContextExportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -69,7 +69,7 @@ ExportInfo info = GetExportInfo(plugin); // Call - FileFilterGenerator fileFilter = info.FileFilter; + FileFilterGenerator fileFilter = info.FileFilterGenerator; // Assert Assert.AreEqual("MorphAn randvoorwaarden (*.bnd)|*.bnd", fileFilter.Filter); Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -r86bb01b9f86d6a742c8d057187cc246a8d9e2c54 -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 86bb01b9f86d6a742c8d057187cc246a8d9e2c54) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -249,7 +249,7 @@ new HydraulicBoundaryLocationsExporter(context.WrappedData, filePath, Resources.DesignWaterLevel_Description, Resources.WaveHeight_Description), IsEnabled = context => context.WrappedData.Count > 0, - FileFilter = new FileFilterGenerator(RingtoetsCommonIoResources.Shape_file_filter_Extension, + FileFilterGenerator = new FileFilterGenerator(RingtoetsCommonIoResources.Shape_file_filter_Extension, RingtoetsCommonIoResources.Shape_file_filter_Description) }; @@ -264,7 +264,7 @@ return new GrassCoverErosionOutwardsWaveConditionsExporter(calculations, filePath); }, IsEnabled = context => context.FailureMechanism.WaveConditionsCalculationGroup.GetCalculations().Any(c => c.HasOutput), - FileFilter = new FileFilterGenerator(RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Extension, + FileFilterGenerator = new FileFilterGenerator(RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Extension, RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Description) }; @@ -276,7 +276,7 @@ return new GrassCoverErosionOutwardsWaveConditionsExporter(calculations, filePath); }, IsEnabled = context => context.WrappedData.GetCalculations().Any(c => c.HasOutput), - FileFilter = new FileFilterGenerator(RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Extension, + FileFilterGenerator = new FileFilterGenerator(RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Extension, RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Description) }; @@ -287,7 +287,7 @@ context.WrappedData }, filePath), IsEnabled = context => context.WrappedData.HasOutput, - FileFilter = new FileFilterGenerator(RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Extension, + FileFilterGenerator = new FileFilterGenerator(RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Extension, RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Description) }; } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextExportInfoTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextExportInfoTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextExportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -71,7 +71,7 @@ ExportInfo exportInfo = GetExportInfo(plugin); // Call - FileFilterGenerator fileFilter = exportInfo.FileFilter; + FileFilterGenerator fileFilter = exportInfo.FileFilterGenerator; // Assert Assert.AreEqual("Kommagescheiden bestand (*.csv)|*.csv", fileFilter.Filter); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextExportInfoTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextExportInfoTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextExportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -72,7 +72,7 @@ ExportInfo exportInfo = GetExportInfo(plugin); // Call - FileFilterGenerator fileFilter = exportInfo.FileFilter; + FileFilterGenerator fileFilter = exportInfo.FileFilterGenerator; // Assert Assert.AreEqual("Kommagescheiden bestand (*.csv)|*.csv", fileFilter.Filter); Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/HydraulicBoundariesGroupContextExportInfoTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/HydraulicBoundariesGroupContextExportInfoTest.cs (.../HydraulicBoundariesGroupContextExportInfoTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/HydraulicBoundariesGroupContextExportInfoTest.cs (.../HydraulicBoundariesGroupContextExportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -140,7 +140,7 @@ public void HydraulicBoundaryLocationsExporterExportInfo_FileFilter_ShpFileFilter() { // Call - FileFilterGenerator fileFilter = hydraulicBoundaryLocationsExporterExportInfo.FileFilter; + FileFilterGenerator fileFilter = hydraulicBoundaryLocationsExporterExportInfo.FileFilterGenerator; // Assert Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter.Filter); @@ -252,7 +252,7 @@ public void WaveConditionsExporterExportInfo_FileFilter_CsvFileFilter() { // Call - FileFilterGenerator fileFilter = waveConditionsExporterExportInfo.FileFilter; + FileFilterGenerator fileFilter = waveConditionsExporterExportInfo.FileFilterGenerator; // Assert Assert.AreEqual("Kommagescheiden bestand (*.csv)|*.csv", fileFilter.Filter); Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs =================================================================== diff -u -r242268fc2adc055cc3ac4f28b14b4db26251b30e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision 242268fc2adc055cc3ac4f28b14b4db26251b30e) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -84,7 +84,7 @@ Name = RingtoetsCommonFormsResources.StructuresImporter_DisplayName, Category = RingtoetsCommonFormsResources.Ringtoets_Category, Image = RingtoetsCommonFormsResources.StructuresIcon, - FileFilter = new FileFilterGenerator(RingtoetsCommonIOResources.Shape_file_filter_Extension, + FileFilterGenerator = new FileFilterGenerator(RingtoetsCommonIOResources.Shape_file_filter_Extension, RingtoetsCommonIOResources.Shape_file_filter_Description), IsEnabled = context => context.AssessmentSection.ReferenceLine != null }; Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ImportInfos/HeightStructuresContextImportInfoTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ImportInfos/HeightStructuresContextImportInfoTest.cs (.../HeightStructuresContextImportInfoTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/ImportInfos/HeightStructuresContextImportInfoTest.cs (.../HeightStructuresContextImportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -122,7 +122,7 @@ ImportInfo importInfo = GetImportInfo(plugin); // Call - FileFilterGenerator fileFilter = importInfo.FileFilter; + FileFilterGenerator fileFilter = importInfo.FileFilterGenerator; // Assert Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter.Filter); Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r9c1789fd6fa33b6ea18339bf2474102471ef4510 -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 9c1789fd6fa33b6ea18339bf2474102471ef4510) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -409,7 +409,7 @@ Name = RingtoetsCommonDataResources.ReferenceLine_DisplayName, Category = RingtoetsCommonFormsResources.Ringtoets_Category, Image = RingtoetsCommonFormsResources.ReferenceLineIcon, - FileFilter = new FileFilterGenerator(RingtoetsCommonIOResources.Shape_file_filter_Extension, + FileFilterGenerator = new FileFilterGenerator(RingtoetsCommonIOResources.Shape_file_filter_Extension, RingtoetsCommonIOResources.Shape_file_filter_Description), CreateFileImporter = (context, filePath) => new ReferenceLineImporter(context.WrappedData, new ReferenceLineReplacementHandler(Gui.ViewCommands), @@ -421,7 +421,7 @@ Name = RingtoetsCommonFormsResources.FailureMechanism_Sections_DisplayName, Category = RingtoetsCommonFormsResources.Ringtoets_Category, Image = RingtoetsCommonFormsResources.SectionsIcon, - FileFilter = new FileFilterGenerator(RingtoetsCommonIOResources.Shape_file_filter_Extension, + FileFilterGenerator = new FileFilterGenerator(RingtoetsCommonIOResources.Shape_file_filter_Extension, RingtoetsCommonIOResources.Shape_file_filter_Description), IsEnabled = context => context.ParentAssessmentSection.ReferenceLine != null, CreateFileImporter = (context, filePath) => new FailureMechanismSectionsImporter(context.WrappedData, @@ -436,7 +436,7 @@ Name = RingtoetsIntegrationPluginResources.ForeshoreProfilesImporter_DisplayName, Category = RingtoetsCommonFormsResources.Ringtoets_Category, Image = RingtoetsIntegrationPluginResources.Foreshore, - FileFilter = new FileFilterGenerator(RingtoetsCommonIOResources.Shape_file_filter_Extension, + FileFilterGenerator = new FileFilterGenerator(RingtoetsCommonIOResources.Shape_file_filter_Extension, RingtoetsCommonIOResources.Shape_file_filter_Description), IsEnabled = context => context.ParentAssessmentSection.ReferenceLine != null }; @@ -449,7 +449,7 @@ Name = RingtoetsIntegrationPluginResources.DikeProfilesImporter_DisplayName, Category = RingtoetsCommonFormsResources.Ringtoets_Category, Image = RingtoetsCommonFormsResources.DikeProfile, - FileFilter = new FileFilterGenerator(RingtoetsCommonIOResources.Shape_file_filter_Extension, + FileFilterGenerator = new FileFilterGenerator(RingtoetsCommonIOResources.Shape_file_filter_Extension, RingtoetsCommonIOResources.Shape_file_filter_Description), IsEnabled = context => context.ParentAssessmentSection.ReferenceLine != null }; @@ -461,7 +461,7 @@ { CreateFileExporter = (context, filePath) => new ReferenceLineExporter(context.WrappedData.ReferenceLine, context.WrappedData.Id, filePath), IsEnabled = context => context.WrappedData.ReferenceLine != null, - FileFilter = new FileFilterGenerator(RingtoetsCommonIOResources.Shape_file_filter_Extension, + FileFilterGenerator = new FileFilterGenerator(RingtoetsCommonIOResources.Shape_file_filter_Extension, RingtoetsCommonIOResources.Shape_file_filter_Description) }; @@ -471,7 +471,7 @@ context.WrappedData.HydraulicBoundaryDatabase.Locations, filePath, RingtoetsIntegrationPluginResources.DesignWaterLevel_Description, RingtoetsIntegrationPluginResources.WaveHeight_Description), IsEnabled = context => context.WrappedData.HydraulicBoundaryDatabase != null, - FileFilter = new FileFilterGenerator(RingtoetsCommonIOResources.Shape_file_filter_Extension, + FileFilterGenerator = new FileFilterGenerator(RingtoetsCommonIOResources.Shape_file_filter_Extension, RingtoetsCommonIOResources.Shape_file_filter_Description) }; } Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/HydraulicBoundaryDatabaseContextExportInfoTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/HydraulicBoundaryDatabaseContextExportInfoTest.cs (.../HydraulicBoundaryDatabaseContextExportInfoTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/HydraulicBoundaryDatabaseContextExportInfoTest.cs (.../HydraulicBoundaryDatabaseContextExportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -71,7 +71,7 @@ ExportInfo info = GetInfo(plugin); // Call - FileFilterGenerator fileFilter = info.FileFilter; + FileFilterGenerator fileFilter = info.FileFilterGenerator; // Assert Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter.Filter); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/ReferenceLineContextExportInfoTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/ReferenceLineContextExportInfoTest.cs (.../ReferenceLineContextExportInfoTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/ReferenceLineContextExportInfoTest.cs (.../ReferenceLineContextExportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -66,7 +66,7 @@ ExportInfo info = GetExportInfo(plugin); // Call - FileFilterGenerator fileFilter = info.FileFilter; + FileFilterGenerator fileFilter = info.FileFilterGenerator; // Assert Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter.Filter); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextExportInfoTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextExportInfoTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextExportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -71,7 +71,7 @@ ExportInfo exportInfo = GetExportInfo(plugin); // Call - FileFilterGenerator fileFilter = exportInfo.FileFilter; + FileFilterGenerator fileFilter = exportInfo.FileFilterGenerator; // Assert Assert.AreEqual("Kommagescheiden bestand (*.csv)|*.csv", fileFilter.Filter); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextExportInfoTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextExportInfoTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextExportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -72,7 +72,7 @@ ExportInfo exportInfo = GetExportInfo(plugin); // Call - FileFilterGenerator fileFilter = exportInfo.FileFilter; + FileFilterGenerator fileFilter = exportInfo.FileFilterGenerator; // Assert Assert.AreEqual("Kommagescheiden bestand (*.csv)|*.csv", fileFilter.Filter); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextExportInfoTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextExportInfoTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextExportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -71,7 +71,7 @@ ExportInfo exportInfo = GetExportInfo(plugin); // Call - FileFilterGenerator fileFilter = exportInfo.FileFilter; + FileFilterGenerator fileFilter = exportInfo.FileFilterGenerator; // Assert Assert.AreEqual("Kommagescheiden bestand (*.csv)|*.csv", fileFilter.Filter); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextExportInfoTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextExportInfoTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextExportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -72,7 +72,7 @@ ExportInfo exportInfo = GetExportInfo(plugin); // Call - FileFilterGenerator fileFilter = exportInfo.FileFilter; + FileFilterGenerator fileFilter = exportInfo.FileFilterGenerator; // Assert Assert.AreEqual("Kommagescheiden bestand (*.csv)|*.csv", fileFilter.Filter); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/DikeProfilesContextImportInfoTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/DikeProfilesContextImportInfoTest.cs (.../DikeProfilesContextImportInfoTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/DikeProfilesContextImportInfoTest.cs (.../DikeProfilesContextImportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -176,7 +176,7 @@ ImportInfo importInfo = GetImportInfo(plugin); // Call - FileFilterGenerator fileFilter = importInfo.FileFilter; + FileFilterGenerator fileFilter = importInfo.FileFilterGenerator; // Assert Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter.Filter); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/FailureMechanismSectionsContextImportInfoTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/FailureMechanismSectionsContextImportInfoTest.cs (.../FailureMechanismSectionsContextImportInfoTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/FailureMechanismSectionsContextImportInfoTest.cs (.../FailureMechanismSectionsContextImportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -133,7 +133,7 @@ public void FileFilter_Always_ReturnExpectedFileFilter() { // Call - FileFilterGenerator fileFilter = importInfo.FileFilter; + FileFilterGenerator fileFilter = importInfo.FileFilterGenerator; // Assert Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter.Filter); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ForeshoreProfilesContextImportInfoTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ForeshoreProfilesContextImportInfoTest.cs (.../ForeshoreProfilesContextImportInfoTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ForeshoreProfilesContextImportInfoTest.cs (.../ForeshoreProfilesContextImportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -179,7 +179,7 @@ ImportInfo importInfo = GetImportInfo(plugin); // Call - FileFilterGenerator fileFilter = importInfo.FileFilter; + FileFilterGenerator fileFilter = importInfo.FileFilterGenerator; // Assert Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter.Filter); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ReferenceLineContextImportInfoTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ReferenceLineContextImportInfoTest.cs (.../ReferenceLineContextImportInfoTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/ReferenceLineContextImportInfoTest.cs (.../ReferenceLineContextImportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -111,7 +111,7 @@ public void FileFilter_Always_ReturnExpectedFileFilter() { // Call - FileFilterGenerator fileFilter = importInfo.FileFilter; + FileFilterGenerator fileFilter = importInfo.FileFilterGenerator; // Assert Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter.Filter); Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/StochasticSoilModelCollection.cs =================================================================== diff -u -rc290911dd4647e3115e239c8baf814717c098a5a -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/StochasticSoilModelCollection.cs (.../StochasticSoilModelCollection.cs) (revision c290911dd4647e3115e239c8baf814717c098a5a) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/StochasticSoilModelCollection.cs (.../StochasticSoilModelCollection.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -25,7 +25,8 @@ namespace Ringtoets.Piping.Data { /// - /// A collection of . + /// A collection of . The names of the elements are + /// unique within the collection. /// public class StochasticSoilModelCollection : ObservableUniqueItemCollectionWithSourcePath { Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilDatabaseConstraintsReader.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilDatabaseConstraintsReader.cs (.../SoilDatabaseConstraintsReader.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilDatabaseConstraintsReader.cs (.../SoilDatabaseConstraintsReader.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -63,7 +63,9 @@ } catch (SQLiteException exception) { - string innerMessage = string.Format(Resources.SoilDatabaseConstraintsReader_VerifyConstraints_Can_not_read_StochasticSoilModel_Perhaps_table_missing, StochasticSoilModelTableColumns.TableName); + string innerMessage = string.Format( + Resources.SoilDatabaseConstraintsReader_VerifyConstraints_Can_not_read_StochasticSoilModel_Perhaps_table_missing, + StochasticSoilModelTableColumns.TableName); throw new CriticalFileReadException( BuildMessageWithPath(innerMessage), exception); } @@ -74,7 +76,9 @@ } catch (SQLiteException exception) { - string innerMessage = string.Format(Resources.SoilDatabaseConstraintsReader_VerifyConstraints_Can_not_read_StochasticSoilProfile_Perhaps_table_missing, StochasticSoilProfileTableColumns.TableName); + string innerMessage = string.Format( + Resources.SoilDatabaseConstraintsReader_VerifyConstraints_Can_not_read_StochasticSoilProfile_Perhaps_table_missing, + StochasticSoilProfileTableColumns.TableName); throw new CriticalFileReadException( BuildMessageWithPath(innerMessage), exception); } Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -r0ba13f69901b9c0b41e60d86bfb9a68b35143184 -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 0ba13f69901b9c0b41e60d86bfb9a68b35143184) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -100,7 +100,7 @@ Name = PipingDataResources.RingtoetsPipingSurfaceLineCollection_TypeDescriptor, Category = RingtoetsCommonFormsResources.Ringtoets_Category, Image = PipingFormsResources.PipingSurfaceLineIcon, - FileFilter = RingtoetsPipingSurfaceLineFileFilter, + FileFilterGenerator = RingtoetsPipingSurfaceLineFileFilter, IsEnabled = IsSurfaceLineImporterEnabled, CreateFileImporter = (context, filePath) => PipingSurfaceLinesCsvImporter(context, filePath, new RingtoetsPipingSurfaceLineReplaceDataStrategy(context.FailureMechanism)) }; @@ -110,7 +110,7 @@ Name = PipingDataResources.StochasticSoilModelCollection_TypeDescriptor, Category = RingtoetsCommonFormsResources.Ringtoets_Category, Image = PipingFormsResources.PipingSoilProfileIcon, - FileFilter = StochasticSoilModelFileFilter, + FileFilterGenerator = StochasticSoilModelFileFilter, IsEnabled = StochasticSoilModelImporterEnabled, CreateFileImporter = (context, filePath) => StochasticSoilModelImporter(context, filePath, new StochasticSoilModelReplaceDataStrategy(context.FailureMechanism)), VerifyUpdates = VerifyStochasticSoilModelUpdates @@ -124,7 +124,7 @@ Name = Resources.PipingPlugin_GetExportInfos_calculation_configuration_file_description, Category = RingtoetsCommonFormsResources.Ringtoets_Category, Image = RingtoetsCommonFormsResources.GeneralFolderIcon, - FileFilter = new FileFilterGenerator(Resources.PipingPlugin_GetExportInfos_xml_extension, + FileFilterGenerator = new FileFilterGenerator(Resources.PipingPlugin_GetExportInfos_xml_extension, Resources.PipingPlugin_GetExportInfos_calculation_configuration_file_description), CreateFileExporter = (context, filePath) => new PipingConfigurationExporter(context.WrappedData, filePath), IsEnabled = context => context.WrappedData.Children.Any() @@ -138,7 +138,7 @@ Name = PipingDataResources.RingtoetsPipingSurfaceLineCollection_TypeDescriptor, Category = RingtoetsCommonFormsResources.Ringtoets_Category, Image = PipingFormsResources.PipingSurfaceLineIcon, - FileFilter = RingtoetsPipingSurfaceLineFileFilter, + FileFilterGenerator = RingtoetsPipingSurfaceLineFileFilter, IsEnabled = IsSurfaceLineImporterEnabled, CurrentPath = context => context.WrappedData.SourcePath, CreateFileImporter = (context, filePath) => PipingSurfaceLinesCsvImporter(context, filePath, new RingtoetsPipingSurfaceLineUpdateDataStrategy(context.FailureMechanism)) @@ -149,7 +149,7 @@ Name = PipingDataResources.StochasticSoilModelCollection_TypeDescriptor, Category = RingtoetsCommonFormsResources.Ringtoets_Category, Image = PipingFormsResources.PipingSoilProfileIcon, - FileFilter = StochasticSoilModelFileFilter, + FileFilterGenerator = StochasticSoilModelFileFilter, IsEnabled = StochasticSoilModelImporterEnabled, CurrentPath = context => context.WrappedData.SourcePath, CreateFileImporter = (context, filePath) => StochasticSoilModelImporter(context, filePath, new StochasticSoilModelUpdateDataStrategy(context.FailureMechanism)), Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.TestUtil.Test/TestStochasticSoilModelUpdateModelStrategyTest.cs =================================================================== diff -u -rfc2878b0779c6ae4c80720910ea9fbb1b3694420 -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.TestUtil.Test/TestStochasticSoilModelUpdateModelStrategyTest.cs (.../TestStochasticSoilModelUpdateModelStrategyTest.cs) (revision fc2878b0779c6ae4c80720910ea9fbb1b3694420) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.TestUtil.Test/TestStochasticSoilModelUpdateModelStrategyTest.cs (.../TestStochasticSoilModelUpdateModelStrategyTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -57,7 +57,7 @@ var filePath = new string('x', new Random(21).Next(5, 23)); // Call - strategy.UpdateModelWithImportedData(new StochasticSoilModelCollection(), readModels, filePath); + strategy.UpdateModelWithImportedData(null, readModels, filePath); // Assert Assert.IsTrue(strategy.Updated); @@ -78,7 +78,7 @@ strategy.UpdatedInstances = updatedInstances; // Call - IEnumerable updatedData = strategy.UpdateModelWithImportedData(new StochasticSoilModelCollection(), readModels, filePath); + IEnumerable updatedData = strategy.UpdateModelWithImportedData(null, readModels, filePath); // Assert Assert.AreSame(updatedInstances, updatedData); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ExportInfos/PipingCalculationGroupContextExportInfoTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ExportInfos/PipingCalculationGroupContextExportInfoTest.cs (.../PipingCalculationGroupContextExportInfoTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ExportInfos/PipingCalculationGroupContextExportInfoTest.cs (.../PipingCalculationGroupContextExportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -73,7 +73,7 @@ ExportInfo info = GetExportInfo(plugin); // Call - FileFilterGenerator fileFilter = info.FileFilter; + FileFilterGenerator fileFilter = info.FileFilterGenerator; // Assert Assert.AreEqual("Ringtoets berekeningen configuratie. (*.xml)|*.xml", fileFilter.Filter); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/RingtoetsPipingSurfaceLinesContextImportInfoTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/RingtoetsPipingSurfaceLinesContextImportInfoTest.cs (.../RingtoetsPipingSurfaceLinesContextImportInfoTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/RingtoetsPipingSurfaceLinesContextImportInfoTest.cs (.../RingtoetsPipingSurfaceLinesContextImportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -133,7 +133,7 @@ public void FileFilter_Always_ReturnExpectedFileFilter() { // Call - FileFilterGenerator fileFilter = importInfo.FileFilter; + FileFilterGenerator fileFilter = importInfo.FileFilterGenerator; // Assert Assert.AreEqual("Profielschematisaties Kommagescheiden bestand (*.csv)|*.csv", fileFilter.Filter); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs (.../StochasticSoilModelCollectionContextImportInfoTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ImportInfos/StochasticSoilModelCollectionContextImportInfoTest.cs (.../StochasticSoilModelCollectionContextImportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -131,7 +131,7 @@ public void FileFilter_Always_ReturnExpectedFileFilter() { // Call - FileFilterGenerator fileFilter = importInfo.FileFilter; + FileFilterGenerator fileFilter = importInfo.FileFilterGenerator; // Assert Assert.AreEqual("D-Soil Model bestand (*.soil)|*.soil", fileFilter.Filter); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/RingtoetsPipingSurfaceLineContextUpdateInfoTest.cs =================================================================== diff -u -r0ba13f69901b9c0b41e60d86bfb9a68b35143184 -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/RingtoetsPipingSurfaceLineContextUpdateInfoTest.cs (.../RingtoetsPipingSurfaceLineContextUpdateInfoTest.cs) (revision 0ba13f69901b9c0b41e60d86bfb9a68b35143184) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/UpdateInfos/RingtoetsPipingSurfaceLineContextUpdateInfoTest.cs (.../RingtoetsPipingSurfaceLineContextUpdateInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -133,7 +133,7 @@ public void FileFilter_Always_ReturnExpectedFileFilter() { // Call - string fileFilter = updateInfo.FileFilter.Filter; + string fileFilter = updateInfo.FileFilterGenerator.Filter; // Assert Assert.AreEqual("Profielschematisaties Kommagescheiden bestand (*.csv)|*.csv", fileFilter); Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs =================================================================== diff -u -r242268fc2adc055cc3ac4f28b14b4db26251b30e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision 242268fc2adc055cc3ac4f28b14b4db26251b30e) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -190,7 +190,7 @@ Name = RingtoetsCommonFormsResources.StructuresImporter_DisplayName, Category = RingtoetsCommonFormsResources.Ringtoets_Category, Image = RingtoetsCommonFormsResources.StructuresIcon, - FileFilter = new FileFilterGenerator(RingtoetsCommonIOResources.Shape_file_filter_Extension, + FileFilterGenerator = new FileFilterGenerator(RingtoetsCommonIOResources.Shape_file_filter_Extension, RingtoetsCommonIOResources.Shape_file_filter_Description), IsEnabled = context => context.AssessmentSection.ReferenceLine != null }; Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ImportInfos/StabilityPointStructuresContextImportInfoTest.cs =================================================================== diff -u -r8eb717ca45b6518cccfef85e481e0da52ce1df4e -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ImportInfos/StabilityPointStructuresContextImportInfoTest.cs (.../StabilityPointStructuresContextImportInfoTest.cs) (revision 8eb717ca45b6518cccfef85e481e0da52ce1df4e) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/ImportInfos/StabilityPointStructuresContextImportInfoTest.cs (.../StabilityPointStructuresContextImportInfoTest.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -123,7 +123,7 @@ ImportInfo importInfo = GetImportInfo(plugin); // Call - FileFilterGenerator fileFilter = importInfo.FileFilter; + FileFilterGenerator fileFilter = importInfo.FileFilterGenerator; // Assert Assert.AreEqual("Shapebestand (*.shp)|*.shp", fileFilter.Filter); Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs =================================================================== diff -u -r86bb01b9f86d6a742c8d057187cc246a8d9e2c54 -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 86bb01b9f86d6a742c8d057187cc246a8d9e2c54) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -155,7 +155,7 @@ { CreateFileExporter = (context, filePath) => new StabilityStoneCoverWaveConditionsExporter(context.WrappedData.GetCalculations().Cast(), filePath), IsEnabled = context => context.WrappedData.GetCalculations().Cast().Any(c => c.HasOutput), - FileFilter = new FileFilterGenerator( + FileFilterGenerator = new FileFilterGenerator( RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Extension, RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Description) }; @@ -167,7 +167,7 @@ context.WrappedData }, filePath), IsEnabled = context => context.WrappedData.HasOutput, - FileFilter = new FileFilterGenerator( + FileFilterGenerator = new FileFilterGenerator( RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Extension, RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Description) }; Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -r86bb01b9f86d6a742c8d057187cc246a8d9e2c54 -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 86bb01b9f86d6a742c8d057187cc246a8d9e2c54) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) @@ -159,7 +159,7 @@ return new WaveImpactAsphaltCoverWaveConditionsExporter(calculations, filePath); }, IsEnabled = context => context.WrappedData.GetCalculations().Cast().Any(c => c.HasOutput), - FileFilter = new FileFilterGenerator(RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Extension, + FileFilterGenerator = new FileFilterGenerator(RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Extension, RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Description) }; @@ -170,7 +170,7 @@ context.WrappedData }, filePath), IsEnabled = context => context.WrappedData.HasOutput, - FileFilter = new FileFilterGenerator(RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Extension, + FileFilterGenerator = new FileFilterGenerator(RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Extension, RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter_Description) }; }