Index: Core/Common/test/Core.Common.Integration.Test/Core.Common.Integration.Test.csproj
===================================================================
diff -u -rde2cb399837c0b07f89f9a6e752ddfa5844b2910 -r3a30a9af978ca6321aecfcc5fda26e9344a20939
--- Core/Common/test/Core.Common.Integration.Test/Core.Common.Integration.Test.csproj (.../Core.Common.Integration.Test.csproj) (revision de2cb399837c0b07f89f9a6e752ddfa5844b2910)
+++ Core/Common/test/Core.Common.Integration.Test/Core.Common.Integration.Test.csproj (.../Core.Common.Integration.Test.csproj) (revision 3a30a9af978ca6321aecfcc5fda26e9344a20939)
@@ -100,6 +100,10 @@
+
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}
+ Ringtoets.Integration.Plugin
+
{016DBD27-99BF-489A-81B5-50D66964BB90}
Core.GIS.GeoAPI.Extensions
@@ -132,10 +136,6 @@
{ed20dba9-d577-423f-a68d-a0a8130fb10b}
Core.Plugins.ProjectExplorer
-
- {696daaee-d1d8-42d0-86ac-471b970fb17e}
- Core.Plugins.SharpMapGis
-
{4A7D6720-4AA1-4F0B-A796-A0436DB3D7D7}
Application.Ringtoets
Index: Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs
===================================================================
diff -u -r532fa11831d39c203e8511375e2d57a92fe7c5fa -r3a30a9af978ca6321aecfcc5fda26e9344a20939
--- Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs (.../RingtoetsGuiIntegrationTest.cs) (revision 532fa11831d39c203e8511375e2d57a92fe7c5fa)
+++ Core/Common/test/Core.Common.Integration.Test/Ringtoets/Application.Ringtoets/RingtoetsGuiIntegrationTest.cs (.../RingtoetsGuiIntegrationTest.cs) (revision 3a30a9af978ca6321aecfcc5fda26e9344a20939)
@@ -4,8 +4,8 @@
using Core.Common.Gui.Forms.MainWindow;
using Core.Common.TestUtil;
using Core.Plugins.ProjectExplorer;
-using Core.Plugins.SharpMapGis;
using NUnit.Framework;
+using Ringtoets.Integration.Plugin;
namespace Core.Common.Integration.Test.Ringtoets.Application.Ringtoets
{
@@ -40,7 +40,7 @@
gui.MainWindow = new MainWindow(gui);
var applicationCore = gui.ApplicationCore;
- applicationCore.AddPlugin(new SharpMapGisApplicationPlugin());
+ applicationCore.AddPlugin(new RingtoetsApplicationPlugin());
gui.Run();
}
@@ -110,7 +110,7 @@
gui.MainWindow = new MainWindow(gui);
var applicationCore = gui.ApplicationCore;
- applicationCore.AddPlugin(new SharpMapGisApplicationPlugin());
+ applicationCore.AddPlugin(new RingtoetsApplicationPlugin());
gui.Plugins.Add(new ProjectExplorerGuiPlugin());
gui.Run();
Fisheye: Tag 3a30a9af978ca6321aecfcc5fda26e9344a20939 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.SharpMapGis/BackGroundMapLayer.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 3a30a9af978ca6321aecfcc5fda26e9344a20939 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.SharpMapGis/Core.Plugins.SharpMapGis.csproj'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 3a30a9af978ca6321aecfcc5fda26e9344a20939 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.SharpMapGis/FileBasedLayerFactory.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 3a30a9af978ca6321aecfcc5fda26e9344a20939 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.SharpMapGis/MapDependencyResolver.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 3a30a9af978ca6321aecfcc5fda26e9344a20939 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.SharpMapGis/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 3a30a9af978ca6321aecfcc5fda26e9344a20939 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.SharpMapGis/Properties/Resources.Designer.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 3a30a9af978ca6321aecfcc5fda26e9344a20939 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.SharpMapGis/Properties/Resources.resx'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Core/Plugins/src/Core.Plugins.SharpMapGis/Resources/MapZoomToExtentsImage.png
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r3a30a9af978ca6321aecfcc5fda26e9344a20939
Binary files differ
Index: Core/Plugins/src/Core.Plugins.SharpMapGis/Resources/exportIcon.ico
===================================================================
diff -u -r54135385f2c39cad94b80f3ad8197041765c007d -r3a30a9af978ca6321aecfcc5fda26e9344a20939
Binary files differ
Index: Core/Plugins/src/Core.Plugins.SharpMapGis/Resources/exportIcon.png
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r3a30a9af978ca6321aecfcc5fda26e9344a20939
Binary files differ
Index: Core/Plugins/src/Core.Plugins.SharpMapGis/Resources/map.png
===================================================================
diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r3a30a9af978ca6321aecfcc5fda26e9344a20939
Binary files differ
Fisheye: Tag 3a30a9af978ca6321aecfcc5fda26e9344a20939 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.SharpMapGis/SharpMapGisApplicationPlugin.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 3a30a9af978ca6321aecfcc5fda26e9344a20939 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ExportImageHelper.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 3a30a9af978ca6321aecfcc5fda26e9344a20939 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ExportMapToImageMapTool.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 3a30a9af978ca6321aecfcc5fda26e9344a20939 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ImageResolutionDialog.Designer.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 3a30a9af978ca6321aecfcc5fda26e9344a20939 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ImageResolutionDialog.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 3a30a9af978ca6321aecfcc5fda26e9344a20939 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.SharpMapGis/Tools/ImageResolutionDialog.resx'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 3a30a9af978ca6321aecfcc5fda26e9344a20939 refers to a dead (removed) revision in file `Core/Plugins/src/Core.Plugins.SharpMapGis/packages.config'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets.sln
===================================================================
diff -u -rde2cb399837c0b07f89f9a6e752ddfa5844b2910 -r3a30a9af978ca6321aecfcc5fda26e9344a20939
--- Ringtoets.sln (.../Ringtoets.sln) (revision de2cb399837c0b07f89f9a6e752ddfa5844b2910)
+++ Ringtoets.sln (.../Ringtoets.sln) (revision 3a30a9af978ca6321aecfcc5fda26e9344a20939)
@@ -112,8 +112,6 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Plugins.ProjectExplorer", "Core\Plugins\src\Core.Plugins.ProjectExplorer\Core.Plugins.ProjectExplorer.csproj", "{ED20DBA9-D577-423F-A68D-A0A8130FB10B}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Plugins.SharpMapGis", "Core\Plugins\src\Core.Plugins.SharpMapGis\Core.Plugins.SharpMapGis.csproj", "{696DAAEE-D1D8-42D0-86AC-471B970FB17E}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Plugins.CommonTools.Test", "Core\Plugins\test\Core.Plugins.CommonTools.Test\Core.Plugins.CommonTools.Test.csproj", "{8BD31773-6F6D-42EE-810D-0A5DAD809F9D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core.Plugins.ProjectExplorer.Test", "Core\Plugins\test\Core.Plugins.ProjectExplorer.Test\Core.Plugins.ProjectExplorer.Test.csproj", "{07206938-9671-4DC7-BDE4-35B0F6E20DBC}"
@@ -499,16 +497,6 @@
{ED20DBA9-D577-423F-A68D-A0A8130FB10B}.Release|x86.Build.0 = Release|x86
{ED20DBA9-D577-423F-A68D-A0A8130FB10B}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
{ED20DBA9-D577-423F-A68D-A0A8130FB10B}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
- {696DAAEE-D1D8-42D0-86AC-471B970FB17E}.CreateInstaller|x86.ActiveCfg = Release|x86
- {696DAAEE-D1D8-42D0-86AC-471B970FB17E}.CreateInstaller|x86.Build.0 = Release|x86
- {696DAAEE-D1D8-42D0-86AC-471B970FB17E}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86
- {696DAAEE-D1D8-42D0-86AC-471B970FB17E}.CreateInstallerWithDemoProject|x86.Build.0 = Release|x86
- {696DAAEE-D1D8-42D0-86AC-471B970FB17E}.Debug|x86.ActiveCfg = Debug|x86
- {696DAAEE-D1D8-42D0-86AC-471B970FB17E}.Debug|x86.Build.0 = Debug|x86
- {696DAAEE-D1D8-42D0-86AC-471B970FB17E}.Release|x86.ActiveCfg = Release|x86
- {696DAAEE-D1D8-42D0-86AC-471B970FB17E}.Release|x86.Build.0 = Release|x86
- {696DAAEE-D1D8-42D0-86AC-471B970FB17E}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
- {696DAAEE-D1D8-42D0-86AC-471B970FB17E}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
{8BD31773-6F6D-42EE-810D-0A5DAD809F9D}.CreateInstaller|x86.ActiveCfg = Release|x86
{8BD31773-6F6D-42EE-810D-0A5DAD809F9D}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86
{8BD31773-6F6D-42EE-810D-0A5DAD809F9D}.Debug|x86.ActiveCfg = Debug|x86
@@ -1088,7 +1076,6 @@
{0A82E7D2-26F8-4A30-9787-7EEABCD7F470} = {75F0E289-C1EC-497F-934B-738987FC6E7A}
{93E73FAB-FAE8-49C6-9ABB-27D24DF761F6} = {4B4F0984-5730-4E28-93E7-DDE0F29BA550}
{ED20DBA9-D577-423F-A68D-A0A8130FB10B} = {4B4F0984-5730-4E28-93E7-DDE0F29BA550}
- {696DAAEE-D1D8-42D0-86AC-471B970FB17E} = {4B4F0984-5730-4E28-93E7-DDE0F29BA550}
{16050ED1-3E4F-4540-9B5D-6ADD4FC43D9D} = {4B4F0984-5730-4E28-93E7-DDE0F29BA550}
{4163B996-3455-4324-A38A-9F2F0E6FCB52} = {4B4F0984-5730-4E28-93E7-DDE0F29BA550}
{610E0A9C-1997-4C43-A10E-39D4C66ADA93} = {4B4F0984-5730-4E28-93E7-DDE0F29BA550}