Index: Core/Common/src/Core.Common.Gui/Helpers/DialogBasedInquiryHelper.cs =================================================================== diff -u -re9b8aa3e972b9f07a3201f143c26de0e3f082d49 -rada00112ac80c1bb3181f2bcd36f357256d76e50 --- Core/Common/src/Core.Common.Gui/Helpers/DialogBasedInquiryHelper.cs (.../DialogBasedInquiryHelper.cs) (revision e9b8aa3e972b9f07a3201f143c26de0e3f082d49) +++ Core/Common/src/Core.Common.Gui/Helpers/DialogBasedInquiryHelper.cs (.../DialogBasedInquiryHelper.cs) (revision ada00112ac80c1bb3181f2bcd36f357256d76e50) @@ -23,7 +23,6 @@ using System.ComponentModel; using System.Windows.Forms; using Core.Common.Gui.Properties; -using Core.Common.Util; using CoreCommonBaseResources = Core.Common.Base.Properties.Resources; namespace Core.Common.Gui.Helpers @@ -52,11 +51,6 @@ this.dialogParent = dialogParent; } - public string GetSourceFileLocation() - { - return GetSourceFileLocation(new FileFilterGenerator().Filter); - } - public string GetSourceFileLocation(string fileFilter) { string filePath = null; @@ -77,11 +71,6 @@ return filePath; } - public string GetTargetFileLocation() - { - return GetTargetFileLocation(new FileFilterGenerator().Filter, null); - } - public string GetTargetFileLocation(string fileFilter, string suggestedFileName) { string filePath = null; Index: Core/Common/src/Core.Common.Gui/Helpers/IInquiryHelper.cs =================================================================== diff -u -re9b8aa3e972b9f07a3201f143c26de0e3f082d49 -rada00112ac80c1bb3181f2bcd36f357256d76e50 --- Core/Common/src/Core.Common.Gui/Helpers/IInquiryHelper.cs (.../IInquiryHelper.cs) (revision e9b8aa3e972b9f07a3201f143c26de0e3f082d49) +++ Core/Common/src/Core.Common.Gui/Helpers/IInquiryHelper.cs (.../IInquiryHelper.cs) (revision ada00112ac80c1bb3181f2bcd36f357256d76e50) @@ -30,26 +30,13 @@ /// /// Returns the path of an existing file that the user has chosen. /// - /// A file location, or null if no location was chosen. - string GetSourceFileLocation(); - - /// - /// Returns the path of an existing file that the user has chosen. - /// /// A filter to which the path returned complies. /// A file location, or null if no location was chosen. string GetSourceFileLocation(string fileFilter); /// /// Returns the path to a file, which may or may not exist yet, that the user has chosen. /// - /// A path to a file, which may or may not exist yet, or null if no location - /// was chosen. - string GetTargetFileLocation(); - - /// - /// Returns the path to a file, which may or may not exist yet, that the user has chosen. - /// /// A filter to which the path returned complies. /// The initial file name the user can choose. /// A path to a file, which may or may not exist yet, or null if no location Index: Core/Common/test/Core.Common.Gui.Test/Helpers/DialogBasedInquiryHelperTest.cs =================================================================== diff -u -re9b8aa3e972b9f07a3201f143c26de0e3f082d49 -rada00112ac80c1bb3181f2bcd36f357256d76e50 --- Core/Common/test/Core.Common.Gui.Test/Helpers/DialogBasedInquiryHelperTest.cs (.../DialogBasedInquiryHelperTest.cs) (revision e9b8aa3e972b9f07a3201f143c26de0e3f082d49) +++ Core/Common/test/Core.Common.Gui.Test/Helpers/DialogBasedInquiryHelperTest.cs (.../DialogBasedInquiryHelperTest.cs) (revision ada00112ac80c1bb3181f2bcd36f357256d76e50) @@ -25,6 +25,7 @@ using System.Windows.Forms; using Core.Common.Gui.Helpers; using Core.Common.TestUtil; +using Core.Common.Util; using NUnit.Extensions.Forms; using NUnit.Framework; using Rhino.Mocks; @@ -83,7 +84,7 @@ }; // Call - helper.GetSourceFileLocation(); + helper.GetSourceFileLocation(new FileFilterGenerator().Filter); // Assert Assert.AreEqual("Openen", windowName); @@ -106,7 +107,7 @@ }; // Call - string result = helper.GetSourceFileLocation(); + string result = helper.GetSourceFileLocation(new FileFilterGenerator().Filter); // Assert Assert.IsNull(result); @@ -132,7 +133,7 @@ using (new FileDisposeHelper(expectedFilePath)) { // Call - string result = helper.GetSourceFileLocation(); + string result = helper.GetSourceFileLocation(new FileFilterGenerator().Filter); // Assert Assert.AreEqual(expectedFilePath, result); @@ -158,7 +159,7 @@ }; // Call - helper.GetTargetFileLocation(); + helper.GetTargetFileLocation(new FileFilterGenerator().Filter, null); // Assert Assert.AreEqual("Opslaan als", windowName); @@ -181,7 +182,7 @@ }; // Call - string result = helper.GetTargetFileLocation(); + string result = helper.GetTargetFileLocation(new FileFilterGenerator().Filter, null); // Assert Assert.IsNull(result); @@ -205,7 +206,7 @@ }; // Call - string result = helper.GetTargetFileLocation(); + string result = helper.GetTargetFileLocation(new FileFilterGenerator().Filter, null); // Assert Assert.AreEqual(expectedFilePath, result);