Index: Core/Components/src/Core.Components.Gis.Forms/Core.Components.Gis.Forms.csproj
===================================================================
diff -u
--- Core/Components/src/Core.Components.Gis.Forms/Core.Components.Gis.Forms.csproj (revision 0)
+++ Core/Components/src/Core.Components.Gis.Forms/Core.Components.Gis.Forms.csproj (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -0,0 +1,77 @@
+
+
+
+
+ Debug
+ x86
+ {4A06DF0D-5D75-4BAD-A95A-A3DB9B7C4AD5}
+ Library
+ Properties
+ Core.Components.Gis.Forms
+ Core.Components.Gis.Forms
+ v4.0
+ 512
+
+
+ true
+ full
+ false
+ DEBUG;TRACE
+ prompt
+
+
+ none
+ true
+ TRACE
+ prompt
+
+
+ TRACE
+ true
+ true
+ pdbonly
+ prompt
+ AllRules.ruleset
+
+
+
+
+
+
+
+ Properties\GlobalAssembly.cs
+
+
+
+
+
+
+ {9A2D67E6-26AC-4D17-B11A-2B4372F2F572}
+ Core.Common.Controls
+ False
+
+
+ {c90b77da-e421-43cc-b82e-529651bc21ac}
+ Core.Common.Version
+ False
+
+
+ {318ba582-88c9-4816-a54a-a7e431461de3}
+ Core.Components.Gis
+ False
+
+
+
+
+ Copying.Lesser.licenseheader
+
+
+
+
+
\ No newline at end of file
Index: Core/Components/src/Core.Components.Gis.Forms/IMapView.cs
===================================================================
diff -u
--- Core/Components/src/Core.Components.Gis.Forms/IMapView.cs (revision 0)
+++ Core/Components/src/Core.Components.Gis.Forms/IMapView.cs (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -0,0 +1,36 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Core.Common.Controls.Views;
+
+namespace Core.Components.Gis.Forms
+{
+ ///
+ /// Interface describing that contain a as one of its components.
+ ///
+ public interface IMapView : IView
+ {
+ ///
+ /// Gets the set for this .
+ ///
+ IMap Map { get; }
+ }
+}
\ No newline at end of file
Index: Core/Components/src/Core.Components.Gis.Forms/Properties/AssemblyInfo.cs
===================================================================
diff -u
--- Core/Components/src/Core.Components.Gis.Forms/Properties/AssemblyInfo.cs (revision 0)
+++ Core/Components/src/Core.Components.Gis.Forms/Properties/AssemblyInfo.cs (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -0,0 +1,32 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("Core.Components.Gis.Forms")]
+[assembly: AssemblyProduct("Core.Components.Gis.Forms")]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("4A06DF0D-5D75-4BAD-A95A-A3DB9B7C4AD5")]
Index: Core/Components/src/Core.Components.Gis.IO/Properties/AssemblyInfo.cs
===================================================================
diff -u -r5fd8bf3258c1096c0b7fd950240068ba85db559e -r86e717a5477d55d1c4351f2857a1d76e220a3ab4
--- Core/Components/src/Core.Components.Gis.IO/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 5fd8bf3258c1096c0b7fd950240068ba85db559e)
+++ Core/Components/src/Core.Components.Gis.IO/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -1,4 +1,25 @@
-using System.Reflection;
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Reflection;
using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
@@ -8,4 +29,4 @@
[assembly: AssemblyProduct("Core.Components.Gis.IO")]
// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("c66fa2be-e33a-4a3d-b163-0369d571ef3f")]
+[assembly: Guid("FD264FAD-E6F9-47CC-97CD-770199A8E629")]
Index: Core/Components/src/Core.Components.Gis.IO/packages.config
===================================================================
diff -u -r5fd8bf3258c1096c0b7fd950240068ba85db559e -r86e717a5477d55d1c4351f2857a1d76e220a3ab4
--- Core/Components/src/Core.Components.Gis.IO/packages.config (.../packages.config) (revision 5fd8bf3258c1096c0b7fd950240068ba85db559e)
+++ Core/Components/src/Core.Components.Gis.IO/packages.config (.../packages.config) (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -1,4 +1,27 @@
+
+
Index: Core/Plugins/src/Core.Plugins.DotSpatial/Core.Plugins.DotSpatial.csproj
===================================================================
diff -u -r33d1826440741f2fa8b53129d59c532f110dc2bf -r86e717a5477d55d1c4351f2857a1d76e220a3ab4
--- Core/Plugins/src/Core.Plugins.DotSpatial/Core.Plugins.DotSpatial.csproj (.../Core.Plugins.DotSpatial.csproj) (revision 33d1826440741f2fa8b53129d59c532f110dc2bf)
+++ Core/Plugins/src/Core.Plugins.DotSpatial/Core.Plugins.DotSpatial.csproj (.../Core.Plugins.DotSpatial.csproj) (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -52,7 +52,6 @@
- UserControl
@@ -105,6 +104,11 @@
{5a91174a-fb95-4c9d-9ca5-81c0b8d4361a}Core.Components.DotSpatial.Forms
+
+ {4a06df0d-5d75-4bad-a95a-a3db9b7c4ad5}
+ Core.Components.Gis.Forms
+ False
+ {318ba582-88c9-4816-a54a-a7e431461de3}Core.Components.Gis
Index: Core/Plugins/src/Core.Plugins.DotSpatial/DotSpatialGuiPlugin.cs
===================================================================
diff -u -r61f3b606ba0003553fe583462bab6e493043be5e -r86e717a5477d55d1c4351f2857a1d76e220a3ab4
--- Core/Plugins/src/Core.Plugins.DotSpatial/DotSpatialGuiPlugin.cs (.../DotSpatialGuiPlugin.cs) (revision 61f3b606ba0003553fe583462bab6e493043be5e)
+++ Core/Plugins/src/Core.Plugins.DotSpatial/DotSpatialGuiPlugin.cs (.../DotSpatialGuiPlugin.cs) (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -26,6 +26,7 @@
using Core.Common.Gui.Plugin;
using Core.Common.Gui.Properties;
using Core.Components.Gis.Data;
+using Core.Components.Gis.Forms;
using Core.Plugins.DotSpatial.Commands;
using Core.Plugins.DotSpatial.Forms;
using Core.Plugins.DotSpatial.Legend;
Fisheye: Tag 86e717a5477d55d1c4351f2857a1d76e220a3ab4 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.DotSpatial/Forms/IMapView.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Core/Plugins/src/Core.Plugins.DotSpatial/Forms/MapDataView.cs
===================================================================
diff -u -racbd08302b69fc06e5cade26def0dea4d35e3b92 -r86e717a5477d55d1c4351f2857a1d76e220a3ab4
--- Core/Plugins/src/Core.Plugins.DotSpatial/Forms/MapDataView.cs (.../MapDataView.cs) (revision acbd08302b69fc06e5cade26def0dea4d35e3b92)
+++ Core/Plugins/src/Core.Plugins.DotSpatial/Forms/MapDataView.cs (.../MapDataView.cs) (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -23,6 +23,7 @@
using Core.Components.DotSpatial.Forms;
using Core.Components.Gis;
using Core.Components.Gis.Data;
+using Core.Components.Gis.Forms;
namespace Core.Plugins.DotSpatial.Forms
{
Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/Core.Plugins.DotSpatial.Test.csproj
===================================================================
diff -u -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 -r86e717a5477d55d1c4351f2857a1d76e220a3ab4
--- Core/Plugins/test/Core.Plugins.DotSpatial.Test/Core.Plugins.DotSpatial.Test.csproj (.../Core.Plugins.DotSpatial.Test.csproj) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1)
+++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/Core.Plugins.DotSpatial.Test.csproj (.../Core.Plugins.DotSpatial.Test.csproj) (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -112,6 +112,10 @@
{5a91174a-fb95-4c9d-9ca5-81c0b8d4361a}Core.Components.DotSpatial.Forms
+
+ {4a06df0d-5d75-4bad-a95a-a3db9b7c4ad5}
+ Core.Components.Gis.Forms
+ {318ba582-88c9-4816-a54a-a7e431461de3}Core.Components.Gis
Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/DotSpatialGuiPluginTest.cs
===================================================================
diff -u -ra793fc9845a2b861d885170d22cd2353a7146403 -r86e717a5477d55d1c4351f2857a1d76e220a3ab4
--- Core/Plugins/test/Core.Plugins.DotSpatial.Test/DotSpatialGuiPluginTest.cs (.../DotSpatialGuiPluginTest.cs) (revision a793fc9845a2b861d885170d22cd2353a7146403)
+++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/DotSpatialGuiPluginTest.cs (.../DotSpatialGuiPluginTest.cs) (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -12,6 +12,7 @@
using Core.Components.DotSpatial.TestUtil;
using Core.Components.Gis;
using Core.Components.Gis.Data;
+using Core.Components.Gis.Forms;
using Core.Plugins.DotSpatial.Forms;
using Core.Plugins.DotSpatial.Legend;
using NUnit.Framework;
@@ -104,16 +105,18 @@
{
// Setup
using (var plugin = new DotSpatialGuiPlugin())
- using (var view = new MapDataView())
{
- // Call
- var views = plugin.GetViewInfos().ToArray();
+ using (var view = new MapDataView())
+ {
+ // Call
+ var views = plugin.GetViewInfos().ToArray();
- // Assert
- Assert.AreEqual(1, views.Length);
- Assert.AreEqual(typeof(MapData), views[0].DataType);
- Assert.AreEqual(typeof(MapDataView), views[0].ViewType);
- Assert.AreEqual("Kaart", views[0].GetViewName(view, null));
+ // Assert
+ Assert.AreEqual(1, views.Length);
+ Assert.AreEqual(typeof(MapData), views[0].DataType);
+ Assert.AreEqual(typeof(MapDataView), views[0].ViewType);
+ Assert.AreEqual("Kaart", views[0].GetViewName(view, null));
+ }
}
}
Index: Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestMapView.cs
===================================================================
diff -u -ra3c8c0cb4384de51a18d77cc7bea487f97ba21e1 -r86e717a5477d55d1c4351f2857a1d76e220a3ab4
--- Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestMapView.cs (.../TestMapView.cs) (revision a3c8c0cb4384de51a18d77cc7bea487f97ba21e1)
+++ Core/Plugins/test/Core.Plugins.DotSpatial.Test/TestMapView.cs (.../TestMapView.cs) (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -1,12 +1,12 @@
using System.Windows.Forms;
using Core.Components.DotSpatial.Forms;
using Core.Components.Gis;
-using Core.Plugins.DotSpatial.Forms;
+using Core.Components.Gis.Forms;
namespace Core.Plugins.DotSpatial.Test
{
///
- /// Simple implementation which can be used in tests.
+ /// Simple implementation which can be used in tests.
///
public class TestMapView : Control, IMapView
{
Index: Ringtoets.sln
===================================================================
diff -u -r2ad324afda61327592af1226a9d8d3de01b614be -r86e717a5477d55d1c4351f2857a1d76e220a3ab4
--- Ringtoets.sln (.../Ringtoets.sln) (revision 2ad324afda61327592af1226a9d8d3de01b614be)
+++ Ringtoets.sln (.../Ringtoets.sln) (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -12,6 +12,7 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Application.Ringtoets", "Application\Ringtoets\src\Application.Ringtoets\Application.Ringtoets.csproj", "{4A7D6720-4AA1-4F0B-A796-A0436DB3D7D7}"
ProjectSection(ProjectDependencies) = postProject
+ {4A06DF0D-5D75-4BAD-A95A-A3DB9B7C4AD5} = {4A06DF0D-5D75-4BAD-A95A-A3DB9B7C4AD5}
{D64E4F0E-E341-496F-82B2-941AD202B4E3} = {D64E4F0E-E341-496F-82B2-941AD202B4E3}
{50963F12-448C-41BA-A62C-CDB0AB8D21E0} = {50963F12-448C-41BA-A62C-CDB0AB8D21E0}
{1D27F91F-4E62-4EAF-A0A8-A32708B9A9B1} = {1D27F91F-4E62-4EAF-A0A8-A32708B9A9B1}
@@ -259,6 +260,8 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.HydraRing.IO.Test", "Ringtoets\HydraRing\test\Ringtoets.HydraRing.IO.Test\Ringtoets.HydraRing.IO.Test.csproj", "{CA7B5888-2BC9-4FE2-9F58-FBC6D7ED8221}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Components.Gis.Forms", "Core\Components\src\Core.Components.Gis.Forms\Core.Components.Gis.Forms.csproj", "{4A06DF0D-5D75-4BAD-A95A-A3DB9B7C4AD5}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
CreateInstaller|x86 = CreateInstaller|x86
@@ -996,6 +999,16 @@
{CA7B5888-2BC9-4FE2-9F58-FBC6D7ED8221}.Release|x86.Build.0 = Release|x86
{CA7B5888-2BC9-4FE2-9F58-FBC6D7ED8221}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
{CA7B5888-2BC9-4FE2-9F58-FBC6D7ED8221}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
+ {4A06DF0D-5D75-4BAD-A95A-A3DB9B7C4AD5}.CreateInstaller|x86.ActiveCfg = Release|x86
+ {4A06DF0D-5D75-4BAD-A95A-A3DB9B7C4AD5}.CreateInstaller|x86.Build.0 = Release|x86
+ {4A06DF0D-5D75-4BAD-A95A-A3DB9B7C4AD5}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86
+ {4A06DF0D-5D75-4BAD-A95A-A3DB9B7C4AD5}.CreateInstallerWithDemoProject|x86.Build.0 = Release|x86
+ {4A06DF0D-5D75-4BAD-A95A-A3DB9B7C4AD5}.Debug|x86.ActiveCfg = Debug|x86
+ {4A06DF0D-5D75-4BAD-A95A-A3DB9B7C4AD5}.Debug|x86.Build.0 = Debug|x86
+ {4A06DF0D-5D75-4BAD-A95A-A3DB9B7C4AD5}.Release|x86.ActiveCfg = Release|x86
+ {4A06DF0D-5D75-4BAD-A95A-A3DB9B7C4AD5}.Release|x86.Build.0 = Release|x86
+ {4A06DF0D-5D75-4BAD-A95A-A3DB9B7C4AD5}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
+ {4A06DF0D-5D75-4BAD-A95A-A3DB9B7C4AD5}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1087,6 +1100,7 @@
{318BA582-88C9-4816-A54A-A7E431461DE3} = {7A696ACF-BA09-41A2-A912-A26E82C494CF}
{5A91174A-FB95-4C9D-9CA5-81C0B8D4361A} = {7A696ACF-BA09-41A2-A912-A26E82C494CF}
{FD264FAD-E6F9-47CC-97CD-770199A8E629} = {7A696ACF-BA09-41A2-A912-A26E82C494CF}
+ {4A06DF0D-5D75-4BAD-A95A-A3DB9B7C4AD5} = {7A696ACF-BA09-41A2-A912-A26E82C494CF}
{4BB4D2AA-332E-42D6-8D34-FFABBCE1F1D8} = {D9DC93FF-DCF3-44A4-9193-9911966CDFF4}
{D07BB841-15D7-4127-8B46-CFC61C546B45} = {D9DC93FF-DCF3-44A4-9193-9911966CDFF4}
{DD7ECAFF-D8A1-4D92-99C0-27498ACB32D4} = {D9DC93FF-DCF3-44A4-9193-9911966CDFF4}
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj
===================================================================
diff -u -r7144ed9829e56a34e064267053216ffbcf6cff52 -r86e717a5477d55d1c4351f2857a1d76e220a3ab4
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj (.../Ringtoets.Integration.Forms.csproj) (revision 7144ed9829e56a34e064267053216ffbcf6cff52)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj (.../Ringtoets.Integration.Forms.csproj) (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -35,10 +35,8 @@
-
-
@@ -75,11 +73,6 @@
Core.Common.BaseFalse
-
- {1d27f91f-4e62-4eaf-a0a8-a32708b9a9b1}
- Core.Common.Controls.TreeView
- False
- {9a2d67e6-26ac-4d17-b11a-2b4372f2f572}Core.Common.Controls
@@ -104,14 +97,15 @@
{5A91174A-FB95-4C9D-9CA5-81C0B8D4361A}Core.Components.DotSpatial.Forms
+
+ {4a06df0d-5d75-4bad-a95a-a3db9b7c4ad5}
+ Core.Components.Gis.Forms
+ False
+ {318BA582-88C9-4816-A54A-A7E431461DE3}Core.Components.Gis
-
- {610E0A9C-1997-4C43-A10E-39D4C66ADA93}
- Core.Plugins.DotSpatial
- {d4200f43-3f72-4f42-af0a-8ced416a38ec}Ringtoets.Common.Data
@@ -122,20 +116,10 @@
Ringtoets.Common.FormsFalse
-
- {e38c11e0-4384-44dd-9f5b-ee73d79fd7f5}
- Ringtoets.Common.Placeholder
- False
- {70f8cc9c-5bc8-4fb2-b201-eae7fa8088c2}Ringtoets.HydraRing.Data
-
- {ce994cc9-6f6a-48ac-b4be-02c30a21f4db}
- Ringtoets.Piping.Data
- False
- {11f1f874-45af-43e4-8ae5-15a5c9593e28}Ringtoets.Integration.Data
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs
===================================================================
diff -u -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113 -r86e717a5477d55d1c4351f2857a1d76e220a3ab4
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs (.../AssessmentSectionView.cs) (revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/AssessmentSectionView.cs (.../AssessmentSectionView.cs) (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -27,8 +27,7 @@
using Core.Components.DotSpatial.Forms;
using Core.Components.Gis;
using Core.Components.Gis.Data;
-using Core.Plugins.DotSpatial.Forms;
-
+using Core.Components.Gis.Forms;
using Ringtoets.Common.Data;
using Ringtoets.Integration.Forms.Properties;
using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj
===================================================================
diff -u -rf760a191fb5e4826ef1b7a5ab4e04bee993c1215 -r86e717a5477d55d1c4351f2857a1d76e220a3ab4
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj (.../Ringtoets.Integration.Plugin.csproj) (revision f760a191fb5e4826ef1b7a5ab4e04bee993c1215)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj (.../Ringtoets.Integration.Plugin.csproj) (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -48,12 +48,7 @@
-
- ..\..\..\..\packages\System.Data.SQLite.Core.1.0.99.0\lib\net40\System.Data.SQLite.dll
- True
-
-
@@ -114,9 +109,10 @@
Core.Common.VersionFalse
-
- {610E0A9C-1997-4C43-A10E-39D4C66ADA93}
- Core.Plugins.DotSpatial
+
+ {4a06df0d-5d75-4bad-a95a-a3db9b7c4ad5}
+ Core.Components.Gis.Forms
+ False{d4200f43-3f72-4f42-af0a-8ced416a38ec}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj
===================================================================
diff -u -r76ace4042e4e8a92a0ba37e8e9a9373ed6cea951 -r86e717a5477d55d1c4351f2857a1d76e220a3ab4
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj (.../Ringtoets.Integration.Forms.Test.csproj) (revision 76ace4042e4e8a92a0ba37e8e9a9373ed6cea951)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj (.../Ringtoets.Integration.Forms.Test.csproj) (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -93,10 +93,6 @@
{30e4c2ae-719e-4d70-9fa9-668a9767fbfa}Core.Common.Gui
-
- {f49bd8b2-332a-4c91-a196-8cce0a2c7d98}
- Core.Common.Utils
- {26214BD0-DAFB-4CFC-8EB2-80C5D53C859E}Core.Common.Gui.TestUtil
@@ -109,14 +105,14 @@
{5A91174A-FB95-4C9D-9CA5-81C0B8D4361A}Core.Components.DotSpatial.Forms
+
+ {4a06df0d-5d75-4bad-a95a-a3db9b7c4ad5}
+ Core.Components.Gis.Forms
+ {318ba582-88c9-4816-a54a-a7e431461de3}Core.Components.Gis
-
- {610e0a9c-1997-4c43-a10e-39d4c66ada93}
- Core.Plugins.DotSpatial
- {d4200f43-3f72-4f42-af0a-8ced416a38ec}Ringtoets.Common.Data
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj
===================================================================
diff -u -ra77cd7f471b813c6a7218b42844d017fc10fb4ec -r86e717a5477d55d1c4351f2857a1d76e220a3ab4
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj (.../Ringtoets.Integration.Plugin.Test.csproj) (revision a77cd7f471b813c6a7218b42844d017fc10fb4ec)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj (.../Ringtoets.Integration.Plugin.Test.csproj) (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -59,10 +59,6 @@
-
- ..\..\..\..\packages\System.Data.SQLite.Core.1.0.99.0\lib\net40\System.Data.SQLite.dll
- True
-
@@ -106,9 +102,9 @@
{d749ee4c-ce50-4c17-bf01-9a953028c126}Core.Common.TestUtil
-
- {610E0A9C-1997-4C43-A10E-39D4C66ADA93}
- Core.Plugins.DotSpatial
+
+ {4a06df0d-5d75-4bad-a95a-a3db9b7c4ad5}
+ Core.Components.Gis.Forms{d4200f43-3f72-4f42-af0a-8ced416a38ec}
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs
===================================================================
diff -u -r76ace4042e4e8a92a0ba37e8e9a9373ed6cea951 -r86e717a5477d55d1c4351f2857a1d76e220a3ab4
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs (.../RingtoetsGuiPluginTest.cs) (revision 76ace4042e4e8a92a0ba37e8e9a9373ed6cea951)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsGuiPluginTest.cs (.../RingtoetsGuiPluginTest.cs) (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -8,7 +8,6 @@
using Core.Common.TestUtil;
using NUnit.Framework;
using Rhino.Mocks;
-
using Ringtoets.Common.Data;
using Ringtoets.Common.Data.Contribution;
using Ringtoets.Common.Forms.PresentationObjects;
@@ -83,7 +82,6 @@
TestHelper.AssertImagesAreEqual(RingtoetsFormsResources.Map, mapViewInfo.Image);
}
}
-
[Test]
public void GetTreeNodeInfos_ReturnsSupportedTreeNodeInfos()
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj
===================================================================
diff -u -r05f1e980d28b12f13fd803d9a6c682f708a325d9 -r86e717a5477d55d1c4351f2857a1d76e220a3ab4
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj (.../Ringtoets.Piping.Forms.csproj) (revision 05f1e980d28b12f13fd803d9a6c682f708a325d9)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Ringtoets.Piping.Forms.csproj (.../Ringtoets.Piping.Forms.csproj) (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -54,14 +54,10 @@
..\..\..\..\packages\log4net.2.0.4\lib\net40-full\log4net.dll
-
-
-
-
@@ -136,15 +132,16 @@
{5A91174A-FB95-4C9D-9CA5-81C0B8D4361A}Core.Components.DotSpatial.Forms
+
+ {4a06df0d-5d75-4bad-a95a-a3db9b7c4ad5}
+ Core.Components.Gis.Forms
+ False
+ {318ba582-88c9-4816-a54a-a7e431461de3}Core.Components.GisFalse
-
- {610E0A9C-1997-4C43-A10E-39D4C66ADA93}
- Core.Plugins.DotSpatial
- {d4200f43-3f72-4f42-af0a-8ced416a38ec}Ringtoets.Common.Data
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs
===================================================================
diff -u -r80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113 -r86e717a5477d55d1c4351f2857a1d76e220a3ab4
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs (.../PipingFailureMechanismView.cs) (revision 80aeb6fb275f0d7ea3f470bb8ba0ef0fc5caa113)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingFailureMechanismView.cs (.../PipingFailureMechanismView.cs) (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -26,7 +26,7 @@
using Core.Common.Base.Geometry;
using Core.Components.Gis;
using Core.Components.Gis.Data;
-using Core.Plugins.DotSpatial.Forms;
+using Core.Components.Gis.Forms;
using Ringtoets.Piping.Forms.PresentationObjects;
using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
using PipingDataResources = Ringtoets.Piping.Data.Properties.Resources;
Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Ringtoets.Piping.Plugin.csproj
===================================================================
diff -u -r79b8577124d89ef4a4bb595fd6c8361b4d8cd194 -r86e717a5477d55d1c4351f2857a1d76e220a3ab4
--- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Ringtoets.Piping.Plugin.csproj (.../Ringtoets.Piping.Plugin.csproj) (revision 79b8577124d89ef4a4bb595fd6c8361b4d8cd194)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/Ringtoets.Piping.Plugin.csproj (.../Ringtoets.Piping.Plugin.csproj) (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -54,7 +54,6 @@
-
@@ -107,9 +106,10 @@
Core.Common.VersionFalse
-
- {610e0a9c-1997-4c43-a10e-39d4c66ada93}
- Core.Plugins.DotSpatial
+
+ {4a06df0d-5d75-4bad-a95a-a3db9b7c4ad5}
+ Core.Components.Gis.Forms
+ False{d4200f43-3f72-4f42-af0a-8ced416a38ec}
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj
===================================================================
diff -u -r2a7be595bf1251849a3c5f3be000f0e40f8fa874 -r86e717a5477d55d1c4351f2857a1d76e220a3ab4
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj (.../Ringtoets.Piping.Forms.Test.csproj) (revision 2a7be595bf1251849a3c5f3be000f0e40f8fa874)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Ringtoets.Piping.Forms.Test.csproj (.../Ringtoets.Piping.Forms.Test.csproj) (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -129,14 +129,14 @@
{5A91174A-FB95-4C9D-9CA5-81C0B8D4361A}Core.Components.DotSpatial.Forms
+
+ {4a06df0d-5d75-4bad-a95a-a3db9b7c4ad5}
+ Core.Components.Gis.Forms
+ {318ba582-88c9-4816-a54a-a7e431461de3}Core.Components.Gis
-
- {610e0a9c-1997-4c43-a10e-39d4c66ada93}
- Core.Plugins.DotSpatial
- {d4200f43-3f72-4f42-af0a-8ced416a38ec}Ringtoets.Common.Data
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingGuiPluginTest.cs
===================================================================
diff -u -r76ace4042e4e8a92a0ba37e8e9a9373ed6cea951 -r86e717a5477d55d1c4351f2857a1d76e220a3ab4
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingGuiPluginTest.cs (.../PipingGuiPluginTest.cs) (revision 76ace4042e4e8a92a0ba37e8e9a9373ed6cea951)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingGuiPluginTest.cs (.../PipingGuiPluginTest.cs) (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -9,7 +9,6 @@
using Core.Common.TestUtil;
using NUnit.Framework;
using Rhino.Mocks;
-
using Ringtoets.Piping.Data;
using Ringtoets.Piping.Forms.PresentationObjects;
using Ringtoets.Piping.Forms.PropertyClasses;
@@ -52,7 +51,6 @@
TestHelper.AssertImagesAreEqual(PipingFormsResources.PipingIcon, contributionViewInfo.Image);
}
}
-
[Test]
public void GetPropertyInfos_ReturnsSupportedPropertyClasses()
Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/Ringtoets.Piping.Plugin.Test.csproj
===================================================================
diff -u -r79b8577124d89ef4a4bb595fd6c8361b4d8cd194 -r86e717a5477d55d1c4351f2857a1d76e220a3ab4
--- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/Ringtoets.Piping.Plugin.Test.csproj (.../Ringtoets.Piping.Plugin.Test.csproj) (revision 79b8577124d89ef4a4bb595fd6c8361b4d8cd194)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/Ringtoets.Piping.Plugin.Test.csproj (.../Ringtoets.Piping.Plugin.Test.csproj) (revision 86e717a5477d55d1c4351f2857a1d76e220a3ab4)
@@ -54,10 +54,6 @@
-
- ..\..\..\..\packages\System.Data.SQLite.Core.1.0.99.0\lib\net40\System.Data.SQLite.dll
- True
-
@@ -89,10 +85,6 @@
{30e4c2ae-719e-4d70-9fa9-668a9767fbfa}Core.Common.Gui
-
- {e344867e-9ac9-44c8-88a5-8185681679a9}
- Core.Common.IO
- {f49bd8b2-332a-4c91-a196-8cce0a2c7d98}Core.Common.Utils
@@ -101,9 +93,9 @@
{d749ee4c-ce50-4c17-bf01-9a953028c126}Core.Common.TestUtil
-
- {610e0a9c-1997-4c43-a10e-39d4c66ada93}
- Core.Plugins.DotSpatial
+
+ {4a06df0d-5d75-4bad-a95a-a3db9b7c4ad5}
+ Core.Components.Gis.Forms{d4200f43-3f72-4f42-af0a-8ced416a38ec}