Index: Core/Common/src/Core.Common.Base/IO/IFileImporter.cs
===================================================================
diff -u -rd10ce32a6631b4b73ca5d87f51cf16fa2ee5f1c0 -rf7d7a919dec1b7d79672af043f268cde57aab0ba
--- Core/Common/src/Core.Common.Base/IO/IFileImporter.cs (.../IFileImporter.cs) (revision d10ce32a6631b4b73ca5d87f51cf16fa2ee5f1c0)
+++ Core/Common/src/Core.Common.Base/IO/IFileImporter.cs (.../IFileImporter.cs) (revision f7d7a919dec1b7d79672af043f268cde57aab0ba)
@@ -52,13 +52,6 @@
bool Import(object targetItem, string filePath);
///
- /// This method checks if an import can be performed on .
- ///
- /// The target item to check.
- /// true if an import can be performed on . false otherwise.
- bool CanImportFor(object targetItem);
-
- ///
/// This method cancels an import.
///
void Cancel();
Index: Core/Common/src/Core.Common.Base/Plugin/ApplicationCore.cs
===================================================================
diff -u -r2d209fab7140dfcd277106ee15a1896234159930 -rf7d7a919dec1b7d79672af043f268cde57aab0ba
--- Core/Common/src/Core.Common.Base/Plugin/ApplicationCore.cs (.../ApplicationCore.cs) (revision 2d209fab7140dfcd277106ee15a1896234159930)
+++ Core/Common/src/Core.Common.Base/Plugin/ApplicationCore.cs (.../ApplicationCore.cs) (revision f7d7a919dec1b7d79672af043f268cde57aab0ba)
@@ -60,8 +60,7 @@
var targetType = target.GetType();
return plugins.SelectMany(plugin => plugin.GetFileImporters())
- .Where(fileImporter => (fileImporter.SupportedItemType == targetType || targetType.Implements(fileImporter.SupportedItemType))
- && fileImporter.CanImportFor(target));
+ .Where(fileImporter => (fileImporter.SupportedItemType == targetType || targetType.Implements(fileImporter.SupportedItemType)));
}
///
Index: Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.cs
===================================================================
diff -u -r5d0590c1dde44d6dc5397a3a9ffad15163f1e463 -rf7d7a919dec1b7d79672af043f268cde57aab0ba
--- Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.cs (.../ValidationView.cs) (revision 5d0590c1dde44d6dc5397a3a9ffad15163f1e463)
+++ Core/Common/src/Core.Common.Gui.Swf/Validation/ValidationView.cs (.../ValidationView.cs) (revision f7d7a919dec1b7d79672af043f268cde57aab0ba)
@@ -2,7 +2,6 @@
using System.Diagnostics;
using System.Drawing;
using System.Windows.Forms;
-using Core.Common.Base;
using Core.Common.Base.IO;
using Core.Common.Controls;
using Core.Common.Utils.Validation;
@@ -133,7 +132,7 @@
}
var fileImporter = issue.ViewData as IFileImporter;
- if (fileImporter != null && fileImporter.CanImportFor(issue.Subject))
+ if (fileImporter != null)
{
Gui.CommandHandler.ImportOn(issue.Subject, fileImporter);
}
Index: Core/Common/test/Core.Common.Base.Test/Plugin/ApplicationCoreTest.cs
===================================================================
diff -u -r2d209fab7140dfcd277106ee15a1896234159930 -rf7d7a919dec1b7d79672af043f268cde57aab0ba
--- Core/Common/test/Core.Common.Base.Test/Plugin/ApplicationCoreTest.cs (.../ApplicationCoreTest.cs) (revision 2d209fab7140dfcd277106ee15a1896234159930)
+++ Core/Common/test/Core.Common.Base.Test/Plugin/ApplicationCoreTest.cs (.../ApplicationCoreTest.cs) (revision f7d7a919dec1b7d79672af043f268cde57aab0ba)
@@ -47,7 +47,6 @@
var fileImporter = mocks.Stub();
fileImporter.Expect(i => i.SupportedItemType).Return(typeof(object)).Repeat.Any();
- fileImporter.Expect(i => i.CanImportFor(targetItem)).Return(true).Repeat.Any();
mocks.ReplayAll();
@@ -93,7 +92,6 @@
var fileImporter = mocks.Stub();
fileImporter.Expect(i => i.SupportedItemType).Return(typeof(object)).Repeat.Any();
- fileImporter.Expect(i => i.CanImportFor(targetItem)).Return(true).Repeat.Any();
mocks.ReplayAll();
@@ -126,21 +124,12 @@
var targetItem = new B();
var supportedFileImporter1 = mocks.Stub();
var supportedFileImporter2 = mocks.Stub();
- var unsupportedFileImporter1 = mocks.Stub();
- var unsupportedFileImporter2 = mocks.Stub();
+ var unsupportedFileImporter = mocks.Stub();
supportedFileImporter1.Expect(i => i.SupportedItemType).Return(typeof(B)).Repeat.Any();
- supportedFileImporter1.Expect(i => i.CanImportFor(targetItem)).Return(true).Repeat.Any();
-
supportedFileImporter2.Expect(i => i.SupportedItemType).Return(typeof(A)).Repeat.Any();
- supportedFileImporter2.Expect(i => i.CanImportFor(targetItem)).Return(true).Repeat.Any();
+ unsupportedFileImporter.Expect(i => i.SupportedItemType).Return(typeof(C)).Repeat.Any(); // Wrong type
- unsupportedFileImporter1.Expect(i => i.SupportedItemType).Return(typeof(B)).Repeat.Any();
- unsupportedFileImporter1.Expect(i => i.CanImportFor(targetItem)).Return(false).Repeat.Any(); // CanImportFor false
-
- unsupportedFileImporter2.Expect(i => i.SupportedItemType).Return(typeof(C)).Repeat.Any(); // Wrong type
- unsupportedFileImporter2.Expect(i => i.CanImportFor(targetItem)).Return(true).Repeat.Any();
-
mocks.ReplayAll();
var applicationCore = new ApplicationCore();
@@ -150,8 +139,7 @@
{
supportedFileImporter1,
supportedFileImporter2,
- unsupportedFileImporter1,
- unsupportedFileImporter2
+ unsupportedFileImporter
}
};
@@ -174,7 +162,6 @@
var fileImporter = mocks.Stub();
fileImporter.Expect(i => i.SupportedItemType).Return(null).Repeat.Any();
- fileImporter.Expect(i => i.CanImportFor(null)).Repeat.Any();
mocks.ReplayAll();
Index: Core/Common/test/Core.Common.Base.Test/Service/FileImportActivityTest.cs
===================================================================
diff -u -r441bb5d121bef7fcc0abed7ae6021e2f062e7973 -rf7d7a919dec1b7d79672af043f268cde57aab0ba
--- Core/Common/test/Core.Common.Base.Test/Service/FileImportActivityTest.cs (.../FileImportActivityTest.cs) (revision 441bb5d121bef7fcc0abed7ae6021e2f062e7973)
+++ Core/Common/test/Core.Common.Base.Test/Service/FileImportActivityTest.cs (.../FileImportActivityTest.cs) (revision f7d7a919dec1b7d79672af043f268cde57aab0ba)
@@ -295,11 +295,6 @@
return true;
}
- public bool CanImportFor(object targetItem)
- {
- return true;
- }
-
public void Cancel()
{
Index: Core/Common/test/Core.Common.Test/Core.Common.Test.csproj
===================================================================
diff -u -r7839bcdb81979e816af0f5848cbb4ccb146e96a6 -rf7d7a919dec1b7d79672af043f268cde57aab0ba
--- Core/Common/test/Core.Common.Test/Core.Common.Test.csproj (.../Core.Common.Test.csproj) (revision 7839bcdb81979e816af0f5848cbb4ccb146e96a6)
+++ Core/Common/test/Core.Common.Test/Core.Common.Test.csproj (.../Core.Common.Test.csproj) (revision f7d7a919dec1b7d79672af043f268cde57aab0ba)
@@ -88,11 +88,9 @@
-
-
True
Fisheye: Tag f7d7a919dec1b7d79672af043f268cde57aab0ba refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Test/Core/ApplicationCoreTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Core/Common/test/Core.Common.Test/Core/AssemblyInfoTest.cs
===================================================================
diff -u -r1f79b34c12554e2b9878f6296168d18232cc9852 -rf7d7a919dec1b7d79672af043f268cde57aab0ba
--- Core/Common/test/Core.Common.Test/Core/AssemblyInfoTest.cs (.../AssemblyInfoTest.cs) (revision 1f79b34c12554e2b9878f6296168d18232cc9852)
+++ Core/Common/test/Core.Common.Test/Core/AssemblyInfoTest.cs (.../AssemblyInfoTest.cs) (revision f7d7a919dec1b7d79672af043f268cde57aab0ba)
@@ -1,4 +1,3 @@
-using Core.Common.Base;
using Core.Common.Base.Plugin;
using Core.Common.Utils.Reflection;
using NUnit.Framework;
Fisheye: Tag f7d7a919dec1b7d79672af043f268cde57aab0ba refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Test/Gui/ImportActivityTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSoilProfilesImporter.cs
===================================================================
diff -u -ra5b6ad37f1dff6447a17f0f8ea3fc47a5517c2e1 -rf7d7a919dec1b7d79672af043f268cde57aab0ba
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSoilProfilesImporter.cs (.../PipingSoilProfilesImporter.cs) (revision a5b6ad37f1dff6447a17f0f8ea3fc47a5517c2e1)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSoilProfilesImporter.cs (.../PipingSoilProfilesImporter.cs) (revision f7d7a919dec1b7d79672af043f268cde57aab0ba)
@@ -70,11 +70,6 @@
public ProgressChangedDelegate ProgressChanged { get; set; }
- public bool CanImportFor(object targetItem)
- {
- return targetItem is ICollection;
- }
-
public bool Import(object targetItem, string filePath)
{
var importResult = ReadSoilProfiles(filePath);
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs
===================================================================
diff -u -r23773f2915c16d8f4d86b6bba06769ffc8e4032d -rf7d7a919dec1b7d79672af043f268cde57aab0ba
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs (.../PipingSurfaceLinesCsvImporter.cs) (revision 23773f2915c16d8f4d86b6bba06769ffc8e4032d)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/FileImporter/PipingSurfaceLinesCsvImporter.cs (.../PipingSurfaceLinesCsvImporter.cs) (revision f7d7a919dec1b7d79672af043f268cde57aab0ba)
@@ -81,11 +81,6 @@
public ProgressChangedDelegate ProgressChanged { get; set; }
- public bool CanImportFor(object targetItem)
- {
- return targetItem is ICollection;
- }
-
public bool Import(object targetItem, string filePath)
{
var importResult = ReadPipingSurfaceLines(filePath);
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSoilProfilesImporterTest.cs
===================================================================
diff -u -r55ad1d69b06d380c225f26750cf93631f5851ada -rf7d7a919dec1b7d79672af043f268cde57aab0ba
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSoilProfilesImporterTest.cs (.../PipingSoilProfilesImporterTest.cs) (revision 55ad1d69b06d380c225f26750cf93631f5851ada)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSoilProfilesImporterTest.cs (.../PipingSoilProfilesImporterTest.cs) (revision f7d7a919dec1b7d79672af043f268cde57aab0ba)
@@ -54,42 +54,6 @@
}
[Test]
- public void CanImportFor_TargetIsCollectionOfPipingSoilProfile_ReturnTrue()
- {
- // Setup
- var mocks = new MockRepository();
- var validTarget = mocks.StrictMock>();
- mocks.ReplayAll();
-
- var importer = new PipingSoilProfilesImporter();
-
- // Call
- var importAllowed = importer.CanImportFor(validTarget);
-
- // Assert
- Assert.IsTrue(importAllowed);
- mocks.VerifyAll(); // Expect no calls on mocks.
- }
-
- [Test]
- public void CanImportFor_InvalidTarget_ReturnFalse()
- {
- // Setup
- var mocks = new MockRepository();
- var invalidTarget = mocks.StrictMock>();
- mocks.ReplayAll();
-
- var importer = new PipingSoilProfilesImporter();
-
- // Call
- var importAllowed = importer.CanImportFor(invalidTarget);
-
- // Assert
- Assert.IsFalse(importAllowed);
- mocks.VerifyAll(); // Expect no calls on mocks.
- }
-
- [Test]
public void Import_FromNonExistingFile_LogError()
{
// Setup
@@ -110,7 +74,6 @@
// Precondition
CollectionAssert.IsEmpty(observableList);
- Assert.IsTrue(importer.CanImportFor(observableList));
var importResult = true;
@@ -152,7 +115,6 @@
// Precondition
CollectionAssert.IsEmpty(observableList);
- Assert.IsTrue(importer.CanImportFor(observableList));
var importResult = true;
@@ -187,9 +149,6 @@
var importTarget = piping.SoilProfiles;
- // Precondition
- Assert.IsTrue(importer.CanImportFor(importTarget));
-
// Call
var importResult = importer.Import(importTarget, validFilePath);
@@ -218,7 +177,6 @@
// Precondition
CollectionAssert.IsEmpty(observableList);
- Assert.IsTrue(importer.CanImportFor(observableList));
Assert.IsTrue(File.Exists(validFilePath));
importer.Cancel();
@@ -258,7 +216,6 @@
// Precondition
CollectionAssert.IsEmpty(observableList);
- Assert.IsTrue(importer.CanImportFor(observableList));
Assert.IsTrue(File.Exists(validFilePath));
// Setup (second part)
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineCsvImporterTest.cs
===================================================================
diff -u -r55ad1d69b06d380c225f26750cf93631f5851ada -rf7d7a919dec1b7d79672af043f268cde57aab0ba
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineCsvImporterTest.cs (.../PipingSurfaceLineCsvImporterTest.cs) (revision 55ad1d69b06d380c225f26750cf93631f5851ada)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingSurfaceLineCsvImporterTest.cs (.../PipingSurfaceLineCsvImporterTest.cs) (revision f7d7a919dec1b7d79672af043f268cde57aab0ba)
@@ -47,42 +47,6 @@
}
[Test]
- public void CanImportFor_TargetIsCollectionOfPipingSurfaceLines_ReturnTrue()
- {
- // Setup
- var mocks = new MockRepository();
- var validTarget = mocks.StrictMock>();
- mocks.ReplayAll();
-
- var importer = new PipingSurfaceLinesCsvImporter();
-
- // Call
- var importAllowed = importer.CanImportFor(validTarget);
-
- // Assert
- Assert.IsTrue(importAllowed);
- mocks.VerifyAll(); // Expect no calls on mocks.
- }
-
- [Test]
- public void CanImportFor_InvalidTarget_ReturnFalse()
- {
- // Setup
- var mocks = new MockRepository();
- var invalidTarget = mocks.StrictMock>();
- mocks.ReplayAll();
-
- var importer = new PipingSurfaceLinesCsvImporter();
-
- // Call
- var importAllowed = importer.CanImportFor(invalidTarget);
-
- // Assert
- Assert.IsFalse(importAllowed);
- mocks.VerifyAll(); // Expect no calls on mocks.
- }
-
- [Test]
public void Import_ImportingToValidTargetWithValidFile_ImportSurfaceLinesToCollection()
{
// Setup
@@ -121,7 +85,6 @@
// Precondition
CollectionAssert.IsEmpty(observableSurfaceLinesList);
- Assert.IsTrue(importer.CanImportFor(observableSurfaceLinesList));
Assert.IsTrue(File.Exists(validFilePath));
// Call
@@ -169,7 +132,6 @@
// Precondition
CollectionAssert.IsEmpty(observableSurfaceLinesList);
- Assert.IsTrue(importer.CanImportFor(observableSurfaceLinesList));
Assert.IsTrue(File.Exists(validFilePath));
// Call
@@ -216,7 +178,6 @@
// Precondition
CollectionAssert.IsEmpty(observableSurfaceLinesList);
- Assert.IsTrue(importer.CanImportFor(observableSurfaceLinesList));
Assert.IsTrue(File.Exists(validFilePath));
importer.Cancel();
@@ -253,7 +214,6 @@
// Precondition
CollectionAssert.IsEmpty(observableSurfaceLinesList);
- Assert.IsTrue(importer.CanImportFor(observableSurfaceLinesList));
Assert.IsTrue(File.Exists(validFilePath));
// Setup (second part)
@@ -514,7 +474,6 @@
// Precondition
CollectionAssert.IsEmpty(observableSurfaceLinesList);
- Assert.IsTrue(importer.CanImportFor(observableSurfaceLinesList));
Assert.IsTrue(File.Exists(path));
// Call