Index: Core/Components/src/Core.Components.Gis.IO/Importers/FeatureBasedMapDataImporter.cs =================================================================== diff -u -rbd7e4c048e8207de60e135b09882aedca976e702 -r00cbbcd5cc50cdc19c838719574ae21ecf7a9b4e --- Core/Components/src/Core.Components.Gis.IO/Importers/FeatureBasedMapDataImporter.cs (.../FeatureBasedMapDataImporter.cs) (revision bd7e4c048e8207de60e135b09882aedca976e702) +++ Core/Components/src/Core.Components.Gis.IO/Importers/FeatureBasedMapDataImporter.cs (.../FeatureBasedMapDataImporter.cs) (revision 00cbbcd5cc50cdc19c838719574ae21ecf7a9b4e) @@ -54,8 +54,6 @@ public override bool Import() { - Canceled = false; - ReadResult readResult = ReadFeatureBasedMapData(); if (readResult.CriticalErrorOccurred) { @@ -154,7 +152,7 @@ private static void HandleUserCancellingImport() { - log.Info("Kaartlaag toevoegen geannuleerd."); + log.Info(Resources.FeatureBasedMapDataImporter_HandleUserCancellingImport_Import_cancelled_no_data_read); } } } \ No newline at end of file Index: Core/Components/src/Core.Components.Gis.IO/Properties/Resources.Designer.cs =================================================================== diff -u -rbd7e4c048e8207de60e135b09882aedca976e702 -r00cbbcd5cc50cdc19c838719574ae21ecf7a9b4e --- Core/Components/src/Core.Components.Gis.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision bd7e4c048e8207de60e135b09882aedca976e702) +++ Core/Components/src/Core.Components.Gis.IO/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 00cbbcd5cc50cdc19c838719574ae21ecf7a9b4e) @@ -93,6 +93,16 @@ } /// + /// Looks up a localized string similar to Kaartlaag toevoegen afgebroken. Geen data ingelezen.. + /// + internal static string FeatureBasedMapDataImporter_HandleUserCancellingImport_Import_cancelled_no_data_read { + get { + return ResourceManager.GetString("FeatureBasedMapDataImporter_HandleUserCancellingImport_Import_cancelled_no_data_r" + + "ead", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Het bestand kon niet worden geopend. Mogelijk is het bestand corrupt of in gebruik door een andere applicatie.. /// internal static string FeatureBasedMapDataImporter_Import_An_error_occurred_when_trying_to_read_the_file { Index: Core/Components/src/Core.Components.Gis.IO/Properties/Resources.resx =================================================================== diff -u -rbd7e4c048e8207de60e135b09882aedca976e702 -r00cbbcd5cc50cdc19c838719574ae21ecf7a9b4e --- Core/Components/src/Core.Components.Gis.IO/Properties/Resources.resx (.../Resources.resx) (revision bd7e4c048e8207de60e135b09882aedca976e702) +++ Core/Components/src/Core.Components.Gis.IO/Properties/Resources.resx (.../Resources.resx) (revision 00cbbcd5cc50cdc19c838719574ae21ecf7a9b4e) @@ -157,4 +157,7 @@ De data in het shapebestand wordt niet ondersteund. + + Kaartlaag toevoegen afgebroken. Geen data ingelezen. + \ No newline at end of file Index: Core/Components/test/Core.Components.Gis.IO.Test/Importers/FeatureBasedMapDataImporterTest.cs =================================================================== diff -u -rbd7e4c048e8207de60e135b09882aedca976e702 -r00cbbcd5cc50cdc19c838719574ae21ecf7a9b4e --- Core/Components/test/Core.Components.Gis.IO.Test/Importers/FeatureBasedMapDataImporterTest.cs (.../FeatureBasedMapDataImporterTest.cs) (revision bd7e4c048e8207de60e135b09882aedca976e702) +++ Core/Components/test/Core.Components.Gis.IO.Test/Importers/FeatureBasedMapDataImporterTest.cs (.../FeatureBasedMapDataImporterTest.cs) (revision 00cbbcd5cc50cdc19c838719574ae21ecf7a9b4e) @@ -148,5 +148,28 @@ Assert.IsTrue(importSuccesful); Assert.AreEqual(1, mapDataCollection.Collection.Count()); } + + [Test] + public void Import_ValidFileImportBeingCancelled_ReturnFalseAndNoChanges() + { + // Setup + var path = TestHelper.GetTestDataPath(TestDataPath.Core.Components.Gis.IO, "Single_Point_with_ID.shp"); + var mapDataCollection = new MapDataCollection("test"); + var importer = new FeatureBasedMapDataImporter(mapDataCollection, path); + + // Precondition + CollectionAssert.IsEmpty(mapDataCollection.Collection); + + importer.Cancel(); + + // Call + bool importSuccesful = true; + Action call = () => importSuccesful = importer.Import(); + + // Assert + TestHelper.AssertLogMessageIsGenerated(call, "Kaartlaag toevoegen afgebroken. Geen data ingelezen.", 1); + Assert.IsFalse(importSuccesful); + CollectionAssert.IsEmpty(mapDataCollection.Collection); + } } } \ No newline at end of file