Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Merge/AssessmentSectionMergeFilePathProvider.cs =================================================================== diff -u -rf832d4da5c9a3a96a075f69ddee5421ad6046e21 -rc1732a2d9814ba6e9e27d5df17721923716c1c26 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Merge/AssessmentSectionMergeFilePathProvider.cs (.../AssessmentSectionMergeFilePathProvider.cs) (revision f832d4da5c9a3a96a075f69ddee5421ad6046e21) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Merge/AssessmentSectionMergeFilePathProvider.cs (.../AssessmentSectionMergeFilePathProvider.cs) (revision c1732a2d9814ba6e9e27d5df17721923716c1c26) @@ -21,7 +21,7 @@ using System; using Core.Common.Gui; -using RiskeerStorageCoreResources = Riskeer.Storage.Core.Properties.Resources; +using Riskeer.Integration.Forms.Properties; namespace Riskeer.Integration.Forms.Merge { @@ -50,7 +50,7 @@ public string GetFilePath() { - return inquiryHelper.GetSourceFileLocation(RiskeerStorageCoreResources.Riskeer_project_file_filter); + return inquiryHelper.GetSourceFileLocation(Resources.RiskeerProject_FileFilter); } } } \ No newline at end of file Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs =================================================================== diff -u -r3e63e58f2e9de8de16ac832b4989b7705c97b443 -rc1732a2d9814ba6e9e27d5df17721923716c1c26 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3e63e58f2e9de8de16ac832b4989b7705c97b443) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c1732a2d9814ba6e9e27d5df17721923716c1c26) @@ -1016,6 +1016,15 @@ } /// + /// Looks up a localized string similar to Riskeerproject (*.risk)|*.risk. + /// + public static string RiskeerProject_FileFilter { + get { + return ResourceManager.GetString("RiskeerProject_FileFilter", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Korte beschrijving van het project.. /// public static string RiskeerProjectProperties_Description_Description { Index: Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx =================================================================== diff -u -r3e63e58f2e9de8de16ac832b4989b7705c97b443 -rc1732a2d9814ba6e9e27d5df17721923716c1c26 --- Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision 3e63e58f2e9de8de16ac832b4989b7705c97b443) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/Properties/Resources.resx (.../Resources.resx) (revision c1732a2d9814ba6e9e27d5df17721923716c1c26) @@ -451,4 +451,7 @@ HLCD bestand|*.sqlite + + Riskeerproject (*.risk)|*.risk + \ No newline at end of file Index: Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeFilePathProviderTest.cs =================================================================== diff -u -r2f45fe6f400dd107c1af96bb8b06c8fd5430c484 -rc1732a2d9814ba6e9e27d5df17721923716c1c26 --- Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeFilePathProviderTest.cs (.../AssessmentSectionMergeFilePathProviderTest.cs) (revision 2f45fe6f400dd107c1af96bb8b06c8fd5430c484) +++ Riskeer/Integration/test/Riskeer.Integration.Forms.Test/Merge/AssessmentSectionMergeFilePathProviderTest.cs (.../AssessmentSectionMergeFilePathProviderTest.cs) (revision c1732a2d9814ba6e9e27d5df17721923716c1c26) @@ -65,7 +65,7 @@ // Setup var mocks = new MockRepository(); var inquiryHelper = mocks.StrictMock(); - inquiryHelper.Expect(ih => ih.GetSourceFileLocation("Riskeerproject (*.risk)|*.risk|Ringtoetsproject (*.rtd)|*.rtd")).Return(expectedFilePath); + inquiryHelper.Expect(ih => ih.GetSourceFileLocation("Riskeerproject (*.risk)|*.risk")).Return(expectedFilePath); mocks.ReplayAll(); var provider = new AssessmentSectionMergeFilePathProvider(inquiryHelper); Index: Riskeer/Storage/src/Riskeer.Storage.Core/Properties/Resources.Designer.cs =================================================================== diff -u -r2f45fe6f400dd107c1af96bb8b06c8fd5430c484 -rc1732a2d9814ba6e9e27d5df17721923716c1c26 --- Riskeer/Storage/src/Riskeer.Storage.Core/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 2f45fe6f400dd107c1af96bb8b06c8fd5430c484) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision c1732a2d9814ba6e9e27d5df17721923716c1c26) @@ -149,7 +149,7 @@ /// /// Looks up a localized string similar to Riskeerproject (*.risk)|*.risk|Ringtoetsproject (*.rtd)|*.rtd. /// - public static string Riskeer_project_file_filter { + public static string Supported_Riskeer_projects_file_filter { get { return ResourceManager.GetString("Riskeer_project_file_filter", resourceCulture); } Index: Riskeer/Storage/src/Riskeer.Storage.Core/StorageSqLite.cs =================================================================== diff -u -rf832d4da5c9a3a96a075f69ddee5421ad6046e21 -rc1732a2d9814ba6e9e27d5df17721923716c1c26 --- Riskeer/Storage/src/Riskeer.Storage.Core/StorageSqLite.cs (.../StorageSqLite.cs) (revision f832d4da5c9a3a96a075f69ddee5421ad6046e21) +++ Riskeer/Storage/src/Riskeer.Storage.Core/StorageSqLite.cs (.../StorageSqLite.cs) (revision c1732a2d9814ba6e9e27d5df17721923716c1c26) @@ -54,7 +54,7 @@ { get { - return Resources.Riskeer_project_file_filter; + return Resources.Supported_Riskeer_projects_file_filter; } }