Index: Application/Application.Ringtoets/App.xaml.cs
===================================================================
diff -u -r79b1cdcf9dcdbe4c015f5fc6b42605a00386b120 -raa5c3620f316831e71797c558a13a0b73a8109df
--- Application/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision 79b1cdcf9dcdbe4c015f5fc6b42605a00386b120)
+++ Application/Application.Ringtoets/App.xaml.cs (.../App.xaml.cs) (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -23,9 +23,10 @@
using log4net;
using NDesk.Options;
+using Ringtoets.Integration.Plugin;
using Ringtoets.Piping.Plugin;
-using MessageBox = System.Windows.MessageBox;
+using MessageBox = System.Windows.MessageBox;
#if INCLUDE_DEMOPROJECT
using Ringtoets.Demo;
#endif
Index: Application/Application.Ringtoets/Application.Ringtoets.csproj
===================================================================
diff -u -r79b1cdcf9dcdbe4c015f5fc6b42605a00386b120 -raa5c3620f316831e71797c558a13a0b73a8109df
--- Application/Application.Ringtoets/Application.Ringtoets.csproj (.../Application.Ringtoets.csproj) (revision 79b1cdcf9dcdbe4c015f5fc6b42605a00386b120)
+++ Application/Application.Ringtoets/Application.Ringtoets.csproj (.../Application.Ringtoets.csproj) (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -159,6 +159,10 @@
{ffe3a667-3a4c-4f48-bc6b-1589867fcb41}
Ringtoets.Demo
+
+ {c8383b76-b3f1-4e6e-b56c-527b469fa20a}
+ Ringtoets.Integration.Plugin
+
{1D3D58B6-EF7E-401E-92A0-104067D222EE}
Ringtoets.Piping.Plugin
Index: Ringtoets.sln
===================================================================
diff -u -r7ded49d5730cf90fed55129fe811ea09cb0fa757 -raa5c3620f316831e71797c558a13a0b73a8109df
--- Ringtoets.sln (.../Ringtoets.sln) (revision 7ded49d5730cf90fed55129fe811ea09cb0fa757)
+++ Ringtoets.sln (.../Ringtoets.sln) (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -190,6 +190,18 @@
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Integration.Data.Test", "Ringtoets\Integration\test\Ringtoets.Integration.Data.Test\Ringtoets.Integration.Data.Test.csproj", "{16F1694E-1237-4B03-B34E-70E6871898FE}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Integration.Plugin", "Ringtoets\Integration\src\Ringtoets.Integration.Plugin\Ringtoets.Integration.Plugin.csproj", "{C8383B76-B3F1-4E6E-B56C-527B469FA20A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Integration.Plugin.Test", "Ringtoets\Integration\test\Ringtoets.Integration.Plugin.Test\Ringtoets.Integration.Plugin.Test.csproj", "{15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Integration.Forms", "Ringtoets\Integration\src\Ringtoets.Integration.Forms\Ringtoets.Integration.Forms.csproj", "{AD0CDC89-0A00-4068-AEEC-9838863C2FE8}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Common.Forms", "Ringtoets\Common\src\Ringtoets.Common.Forms\Ringtoets.Common.Forms.csproj", "{4D840673-3812-4338-A352-84854E32B8A0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Integration.Forms.Test", "Ringtoets\Integration\test\Ringtoets.Integration.Forms.Test\Ringtoets.Integration.Forms.Test.csproj", "{96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Common.Forms.Test", "Ringtoets\Common\test\Ringtoets.Common.Forms.Test\Ringtoets.Common.Forms.Test.csproj", "{886FDBE5-7065-4AB9-A894-869DBFD4E440}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
CreateInstaller|Any CPU = CreateInstaller|Any CPU
@@ -1423,6 +1435,144 @@
{16F1694E-1237-4B03-B34E-70E6871898FE}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{16F1694E-1237-4B03-B34E-70E6871898FE}.Release|x86.ActiveCfg = Release|x86
{16F1694E-1237-4B03-B34E-70E6871898FE}.Release|x86.Build.0 = Release|x86
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.CreateInstaller|Any CPU.ActiveCfg = Release|Any CPU
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.CreateInstaller|Any CPU.Build.0 = Release|Any CPU
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.CreateInstaller|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.CreateInstaller|Mixed Platforms.Build.0 = Release|Any CPU
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.CreateInstaller|x86.ActiveCfg = Release|x86
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.CreateInstaller|x86.Build.0 = Release|x86
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.CreateInstallerWithDemoProject|Any CPU.ActiveCfg = Release|Any CPU
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.CreateInstallerWithDemoProject|Any CPU.Build.0 = Release|Any CPU
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.CreateInstallerWithDemoProject|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.CreateInstallerWithDemoProject|Mixed Platforms.Build.0 = Release|Any CPU
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.CreateInstallerWithDemoProject|x86.ActiveCfg = CreateInstallerWithDemoProject|x86
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.CreateInstallerWithDemoProject|x86.Build.0 = CreateInstallerWithDemoProject|x86
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.Debug|x86.ActiveCfg = Debug|x86
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.Debug|x86.Build.0 = Debug|x86
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.Release|x86.ActiveCfg = Release|x86
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A}.Release|x86.Build.0 = Release|x86
+ {15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}.CreateInstaller|Any CPU.ActiveCfg = Release|Any CPU
+ {15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}.CreateInstaller|Any CPU.Build.0 = Release|Any CPU
+ {15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}.CreateInstaller|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}.CreateInstaller|Mixed Platforms.Build.0 = Release|Any CPU
+ {15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}.CreateInstaller|x86.ActiveCfg = Release|x86
+ {15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}.CreateInstallerWithDemoProject|Any CPU.ActiveCfg = Release|Any CPU
+ {15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}.CreateInstallerWithDemoProject|Any CPU.Build.0 = Release|Any CPU
+ {15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}.CreateInstallerWithDemoProject|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}.CreateInstallerWithDemoProject|Mixed Platforms.Build.0 = Release|Any CPU
+ {15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}.CreateInstallerWithDemoProject|x86.ActiveCfg = CreateInstallerWithDemoProject|x86
+ {15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}.Debug|x86.ActiveCfg = Debug|x86
+ {15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}.Debug|x86.Build.0 = Debug|x86
+ {15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}.Release|Any CPU.Build.0 = Release|Any CPU
+ {15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}.Release|x86.ActiveCfg = Release|x86
+ {15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC}.Release|x86.Build.0 = Release|x86
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.CreateInstaller|Any CPU.ActiveCfg = Release|Any CPU
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.CreateInstaller|Any CPU.Build.0 = Release|Any CPU
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.CreateInstaller|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.CreateInstaller|Mixed Platforms.Build.0 = Release|Any CPU
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.CreateInstaller|x86.ActiveCfg = Release|x86
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.CreateInstaller|x86.Build.0 = Release|x86
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.CreateInstallerWithDemoProject|Any CPU.ActiveCfg = Release|Any CPU
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.CreateInstallerWithDemoProject|Any CPU.Build.0 = Release|Any CPU
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.CreateInstallerWithDemoProject|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.CreateInstallerWithDemoProject|Mixed Platforms.Build.0 = Release|Any CPU
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.CreateInstallerWithDemoProject|x86.ActiveCfg = CreateInstallerWithDemoProject|x86
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.CreateInstallerWithDemoProject|x86.Build.0 = CreateInstallerWithDemoProject|x86
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.Debug|x86.ActiveCfg = Debug|x86
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.Debug|x86.Build.0 = Debug|x86
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.Release|Any CPU.Build.0 = Release|Any CPU
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.Release|x86.ActiveCfg = Release|x86
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}.Release|x86.Build.0 = Release|x86
+ {4D840673-3812-4338-A352-84854E32B8A0}.CreateInstaller|Any CPU.ActiveCfg = Release|Any CPU
+ {4D840673-3812-4338-A352-84854E32B8A0}.CreateInstaller|Any CPU.Build.0 = Release|Any CPU
+ {4D840673-3812-4338-A352-84854E32B8A0}.CreateInstaller|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {4D840673-3812-4338-A352-84854E32B8A0}.CreateInstaller|Mixed Platforms.Build.0 = Release|Any CPU
+ {4D840673-3812-4338-A352-84854E32B8A0}.CreateInstaller|x86.ActiveCfg = Release|x86
+ {4D840673-3812-4338-A352-84854E32B8A0}.CreateInstaller|x86.Build.0 = Release|x86
+ {4D840673-3812-4338-A352-84854E32B8A0}.CreateInstallerWithDemoProject|Any CPU.ActiveCfg = Release|Any CPU
+ {4D840673-3812-4338-A352-84854E32B8A0}.CreateInstallerWithDemoProject|Any CPU.Build.0 = Release|Any CPU
+ {4D840673-3812-4338-A352-84854E32B8A0}.CreateInstallerWithDemoProject|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {4D840673-3812-4338-A352-84854E32B8A0}.CreateInstallerWithDemoProject|Mixed Platforms.Build.0 = Release|Any CPU
+ {4D840673-3812-4338-A352-84854E32B8A0}.CreateInstallerWithDemoProject|x86.ActiveCfg = CreateInstallerWithDemoProject|x86
+ {4D840673-3812-4338-A352-84854E32B8A0}.CreateInstallerWithDemoProject|x86.Build.0 = CreateInstallerWithDemoProject|x86
+ {4D840673-3812-4338-A352-84854E32B8A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {4D840673-3812-4338-A352-84854E32B8A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {4D840673-3812-4338-A352-84854E32B8A0}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {4D840673-3812-4338-A352-84854E32B8A0}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {4D840673-3812-4338-A352-84854E32B8A0}.Debug|x86.ActiveCfg = Debug|x86
+ {4D840673-3812-4338-A352-84854E32B8A0}.Debug|x86.Build.0 = Debug|x86
+ {4D840673-3812-4338-A352-84854E32B8A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {4D840673-3812-4338-A352-84854E32B8A0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {4D840673-3812-4338-A352-84854E32B8A0}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {4D840673-3812-4338-A352-84854E32B8A0}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {4D840673-3812-4338-A352-84854E32B8A0}.Release|x86.ActiveCfg = Release|x86
+ {4D840673-3812-4338-A352-84854E32B8A0}.Release|x86.Build.0 = Release|x86
+ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB}.CreateInstaller|Any CPU.ActiveCfg = Release|Any CPU
+ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB}.CreateInstaller|Any CPU.Build.0 = Release|Any CPU
+ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB}.CreateInstaller|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB}.CreateInstaller|Mixed Platforms.Build.0 = Release|Any CPU
+ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB}.CreateInstaller|x86.ActiveCfg = Release|x86
+ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB}.CreateInstallerWithDemoProject|Any CPU.ActiveCfg = Release|Any CPU
+ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB}.CreateInstallerWithDemoProject|Any CPU.Build.0 = Release|Any CPU
+ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB}.CreateInstallerWithDemoProject|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB}.CreateInstallerWithDemoProject|Mixed Platforms.Build.0 = Release|Any CPU
+ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB}.CreateInstallerWithDemoProject|x86.ActiveCfg = CreateInstallerWithDemoProject|x86
+ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB}.Debug|x86.ActiveCfg = Debug|x86
+ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB}.Debug|x86.Build.0 = Debug|x86
+ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB}.Release|Any CPU.Build.0 = Release|Any CPU
+ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB}.Release|x86.ActiveCfg = Release|x86
+ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB}.Release|x86.Build.0 = Release|x86
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440}.CreateInstaller|Any CPU.ActiveCfg = Release|Any CPU
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440}.CreateInstaller|Any CPU.Build.0 = Release|Any CPU
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440}.CreateInstaller|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440}.CreateInstaller|Mixed Platforms.Build.0 = Release|Any CPU
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440}.CreateInstaller|x86.ActiveCfg = Release|x86
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440}.CreateInstallerWithDemoProject|Any CPU.ActiveCfg = Release|Any CPU
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440}.CreateInstallerWithDemoProject|Any CPU.Build.0 = Release|Any CPU
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440}.CreateInstallerWithDemoProject|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440}.CreateInstallerWithDemoProject|Mixed Platforms.Build.0 = Release|Any CPU
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440}.CreateInstallerWithDemoProject|x86.ActiveCfg = CreateInstallerWithDemoProject|x86
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440}.Debug|x86.ActiveCfg = Debug|x86
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440}.Debug|x86.Build.0 = Debug|x86
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440}.Release|Any CPU.Build.0 = Release|Any CPU
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440}.Release|x86.ActiveCfg = Release|x86
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -1490,6 +1640,8 @@
{B5F4F5A5-FD36-405D-ABA1-56C270207C8F} = {041EDC04-3A1E-4FBA-BEB7-F391571C609F}
{BC8DB1E0-0428-4FB1-9A63-028C749A8AF9} = {041EDC04-3A1E-4FBA-BEB7-F391571C609F}
{E38C11E0-4384-44DD-9F5B-EE73D79FD7F5} = {0590D3BB-EB3E-4B53-BD64-1725E1CBB1F4}
+ {4D840673-3812-4338-A352-84854E32B8A0} = {0590D3BB-EB3E-4B53-BD64-1725E1CBB1F4}
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440} = {B5F4F5A5-FD36-405D-ABA1-56C270207C8F}
{3ED34ACD-41C9-4251-81EC-7493E0BFF57D} = {F8FFD6DD-19DA-47CE-A0BD-53F4E7D8BB86}
{1F0D20C2-7F04-431D-AF22-95A31FD53733} = {F8FFD6DD-19DA-47CE-A0BD-53F4E7D8BB86}
{492FFA2C-351E-48DB-BA51-B837657BAF2F} = {F8FFD6DD-19DA-47CE-A0BD-53F4E7D8BB86}
@@ -1519,7 +1671,11 @@
{88E04195-C43E-40D3-B5F2-3A25E1E79E03} = {11FE8C37-49EB-4FF2-8583-DABC9816FFC8}
{E53693A0-421A-4CB4-B6CA-5870DDFD5895} = {11FE8C37-49EB-4FF2-8583-DABC9816FFC8}
{11F1F874-45AF-43E4-8AE5-15A5C9593E28} = {14E296C8-B6B9-458A-A402-68E8A0F9B97C}
+ {C8383B76-B3F1-4E6E-B56C-527B469FA20A} = {14E296C8-B6B9-458A-A402-68E8A0F9B97C}
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8} = {14E296C8-B6B9-458A-A402-68E8A0F9B97C}
{16F1694E-1237-4B03-B34E-70E6871898FE} = {88E04195-C43E-40D3-B5F2-3A25E1E79E03}
+ {15E7B9D9-A177-42AE-8BC7-91B6DFBAB0EC} = {88E04195-C43E-40D3-B5F2-3A25E1E79E03}
+ {96C8FDAE-9F59-4D2F-A66E-BE512BB5EECB} = {88E04195-C43E-40D3-B5F2-3A25E1E79E03}
EndGlobalSection
GlobalSection(TextTemplating) = postSolution
TextTemplating = 1
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Extensions/ContextMenuStripExtensions.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Extensions/ContextMenuStripExtensions.cs (revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Extensions/ContextMenuStripExtensions.cs (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -0,0 +1,35 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace Ringtoets.Common.Forms.Extensions
+{
+ ///
+ /// Extension methods for .
+ ///
+ public static class ContextMenuStripExtensions
+ {
+ ///
+ /// Adds a new with all standard parameters.
+ ///
+ /// The parent menu to which the new item is added.
+ /// Value for .
+ /// Value for .
+ /// Value for .
+ /// Method to handle the user clicking on the item..
+ /// The newly created menu item.
+ public static ToolStripItem AddMenuItem(this ContextMenuStrip parentMenu, string text, string tooltip, Image icon, EventHandler clickHandler)
+ {
+ var newItem = new ToolStripMenuItem(text)
+ {
+ ToolTipText = tooltip,
+ Image = icon
+ };
+ newItem.Click += clickHandler;
+
+ parentMenu.Items.Add(newItem);
+
+ return newItem;
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/AssemblyInfo.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/AssemblyInfo.cs (revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/AssemblyInfo.cs (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -0,0 +1,7 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+[assembly: AssemblyTitle("Ringtoets.Common.Forms")]
+[assembly: AssemblyProduct("Ringtoets.Common.Forms")]
+[assembly: Guid("74e2898d-5b63-4363-9a2c-3ed3c63ae489")]
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.Designer.cs (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -0,0 +1,82 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.18444
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace Ringtoets.Common.Forms.Properties {
+ using System;
+
+
+ ///
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ ///
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ public class Resources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources() {
+ }
+
+ ///
+ /// Returns the cached ResourceManager instance used by this class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ public static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Ringtoets.Common.Forms.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ ///
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ public static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ public static System.Drawing.Bitmap receipt_text {
+ get {
+ object obj = ResourceManager.GetObject("receipt_text", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Algemeen.
+ ///
+ public static string Ringtoets_Category {
+ get {
+ return ResourceManager.GetString("Ringtoets_Category", resourceCulture);
+ }
+ }
+ }
+}
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Properties/Resources.resx (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -0,0 +1,127 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+
+ ..\Resources\receipt-text.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Algemeen
+
+
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Resources/receipt-text.png
===================================================================
diff -u
Binary files differ
Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -0,0 +1,108 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {4D840673-3812-4338-A352-84854E32B8A0}
+ Library
+ Properties
+ Ringtoets.Common.Forms
+ Ringtoets.Common.Forms
+ v4.0
+ 512
+
+
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+ true
+ bin\Debug\
+ DEBUG;TRACE
+ full
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\Release\
+ TRACE
+ true
+ pdbonly
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\CreateInstallerWithDemoProject\
+ TRACE
+ true
+ pdbonly
+ AnyCPU
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\CreateInstallerWithDemoProject\
+ TRACE
+ true
+ pdbonly
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Properties\GlobalAssembly.cs
+
+
+
+
+ True
+ True
+ Resources.resx
+
+
+
+
+ PublicResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+
+
+
+
+
+
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Extensions/ContextMenuStripExtensionsTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Extensions/ContextMenuStripExtensionsTest.cs (revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Extensions/ContextMenuStripExtensionsTest.cs (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -0,0 +1,38 @@
+using System.Drawing;
+using System.Windows.Forms;
+using NUnit.Framework;
+
+using Ringtoets.Common.Forms.Extensions;
+using FormsResources = Ringtoets.Common.Forms.Properties.Resources;
+
+namespace Ringtoets.Common.Forms.Test.Extensions
+{
+ [TestFixture]
+ public class ContextMenuStripExtensionsTest
+ {
+ [Test]
+ public void AddMenuItem_AllDataProvided_AddFullyInitializedMenuItem()
+ {
+ // Setup
+ var menu = new ContextMenuStrip();
+ int callCount = 0;
+
+ const string menuItemsText = "";
+ const string menuItemsTooltip = "";
+
+ // Call
+ var newItem = menu.AddMenuItem(menuItemsText, menuItemsTooltip, FormsResources.receipt_text, (sender, args) => callCount++);
+
+ // Assert
+ Assert.AreEqual(1, menu.Items.Count);
+ var addedMenuItem = menu.Items[0];
+ Assert.AreSame(newItem, addedMenuItem);
+ Assert.AreEqual(menuItemsText, addedMenuItem.Text);
+ Assert.AreEqual(menuItemsTooltip, addedMenuItem.ToolTipText);
+ Assert.IsNotNull((Image)addedMenuItem.Image);
+
+ addedMenuItem.PerformClick();
+ Assert.AreEqual(1, callCount);
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Properties/AssemblyInfo.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Properties/AssemblyInfo.cs (revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Properties/AssemblyInfo.cs (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+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("Ringtoets.Common.Forms.Test")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Ringtoets.Common.Forms.Test")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2015")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components. If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("46a6bd14-7126-417a-8afe-284053946f5e")]
+
+// Version information for an assembly consists of the following four values:
+//
+// Major Version
+// Minor Version
+// Build Number
+// Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Ringtoets.Common.Forms.Test.csproj (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -0,0 +1,103 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {886FDBE5-7065-4AB9-A894-869DBFD4E440}
+ Library
+ Properties
+ Ringtoets.Common.Forms.Test
+ Ringtoets.Common.Forms.Test
+ v4.0
+ 512
+
+
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+ true
+ bin\Debug\
+ DEBUG;TRACE
+ full
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\Release\
+ TRACE
+ true
+ pdbonly
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\CreateInstallerWithDemoProject\
+ TRACE
+ true
+ pdbonly
+ AnyCPU
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\CreateInstallerWithDemoProject\
+ TRACE
+ true
+ pdbonly
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+
+ ..\..\..\..\lib\nunit.framework.dll
+
+
+ ..\..\..\..\lib\Rhino.Mocks.dll
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {4d840673-3812-4338-a352-84854e32b8a0}
+ Ringtoets.Common.Forms
+
+
+
+
+
\ No newline at end of file
Index: Ringtoets/Demo/src/Ringtoets.Demo/Commands/AddNewDemoAssessmentSectionCommand.cs
===================================================================
diff -u -r03cb43bd51e792d784654d90b33b6657ffeb4221 -raa5c3620f316831e71797c558a13a0b73a8109df
--- Ringtoets/Demo/src/Ringtoets.Demo/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 03cb43bd51e792d784654d90b33b6657ffeb4221)
+++ Ringtoets/Demo/src/Ringtoets.Demo/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -5,7 +5,7 @@
using Core.Common.Gui;
-using Ringtoets.Piping.Data;
+using Ringtoets.Integration.Data;
using Ringtoets.Piping.Plugin.FileImporter;
namespace Ringtoets.Demo.Commands
@@ -25,23 +25,18 @@
project.NotifyObservers();
}
- private AssessmentSection CreateNewDemoAssessmentSection()
+ private DikeAssessmentSection CreateNewDemoAssessmentSection()
{
- var demoAssessmentSection = new AssessmentSection
+ var demoAssessmentSection = new DikeAssessmentSection()
{
- Name = "Demo traject"
+ Name = "Demo dijktraject"
};
InitializeDemoPipingData(demoAssessmentSection);
return demoAssessmentSection;
}
- private void InitializeDemoPipingData(AssessmentSection demoAssessmentSection)
+ private void InitializeDemoPipingData(DikeAssessmentSection demoAssessmentSection)
{
- if (demoAssessmentSection.CanAddPipingFailureMechanism())
- {
- demoAssessmentSection.InitializePipingFailureMechanism();
- }
-
var pipingFailureMechanism = demoAssessmentSection.PipingFailureMechanism;
using (var tempPath = new TemporaryImportFile("DR6_surfacelines.csv"))
Index: Ringtoets/Demo/src/Ringtoets.Demo/Ringtoets.Demo.csproj
===================================================================
diff -u -r03cb43bd51e792d784654d90b33b6657ffeb4221 -raa5c3620f316831e71797c558a13a0b73a8109df
--- Ringtoets/Demo/src/Ringtoets.Demo/Ringtoets.Demo.csproj (.../Ringtoets.Demo.csproj) (revision 03cb43bd51e792d784654d90b33b6657ffeb4221)
+++ Ringtoets/Demo/src/Ringtoets.Demo/Ringtoets.Demo.csproj (.../Ringtoets.Demo.csproj) (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -109,6 +109,10 @@
{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}
Core.Common.Utils
+
+ {11f1f874-45af-43e4-8ae5-15a5c9593e28}
+ Ringtoets.Integration.Data
+
{ce994cc9-6f6a-48ac-b4be-02c30a21f4db}
Ringtoets.Piping.Data
Index: Ringtoets/Demo/test/Ringtoets.Demo.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs
===================================================================
diff -u -r03cb43bd51e792d784654d90b33b6657ffeb4221 -raa5c3620f316831e71797c558a13a0b73a8109df
--- Ringtoets/Demo/test/Ringtoets.Demo.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 03cb43bd51e792d784654d90b33b6657ffeb4221)
+++ Ringtoets/Demo/test/Ringtoets.Demo.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -9,6 +9,7 @@
using Rhino.Mocks;
using Ringtoets.Demo.Commands;
+using Ringtoets.Integration.Data;
using Ringtoets.Piping.Calculation.Piping;
using Ringtoets.Piping.Data;
using Ringtoets.Piping.Service;
@@ -58,8 +59,8 @@
// Assert
Assert.AreEqual(1, project.Items.Count);
- var demoAssessmentSection = (AssessmentSection) project.Items[0];
- Assert.AreEqual("Demo traject", demoAssessmentSection.Name);
+ var demoAssessmentSection = (DikeAssessmentSection) project.Items[0];
+ Assert.AreEqual("Demo dijktraject", demoAssessmentSection.Name);
var profiles = demoAssessmentSection.PipingFailureMechanism.SoilProfiles.ToArray();
Assert.AreEqual(26, profiles.Length);
Index: Ringtoets/Demo/test/Ringtoets.Demo.Test/Ringtoets.Demo.Test.csproj
===================================================================
diff -u -r03cb43bd51e792d784654d90b33b6657ffeb4221 -raa5c3620f316831e71797c558a13a0b73a8109df
--- Ringtoets/Demo/test/Ringtoets.Demo.Test/Ringtoets.Demo.Test.csproj (.../Ringtoets.Demo.Test.csproj) (revision 03cb43bd51e792d784654d90b33b6657ffeb4221)
+++ Ringtoets/Demo/test/Ringtoets.Demo.Test/Ringtoets.Demo.Test.csproj (.../Ringtoets.Demo.Test.csproj) (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -90,6 +90,10 @@
{f49bd8b2-332a-4c91-a196-8cce0a2c7d98}
Core.Common.Utils
+
+ {11f1f874-45af-43e4-8ae5-15a5c9593e28}
+ Ringtoets.Integration.Data
+
{d64e4f0e-e341-496f-82b2-941ad202b4e3}
Ringtoets.Piping.Calculation
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/DikeAssessmentSection.cs
===================================================================
diff -u -re4190343f86e5f4b5fa2bb60f9d5ec307d8053f5 -raa5c3620f316831e71797c558a13a0b73a8109df
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/DikeAssessmentSection.cs (.../DikeAssessmentSection.cs) (revision e4190343f86e5f4b5fa2bb60f9d5ec307d8053f5)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/DikeAssessmentSection.cs (.../DikeAssessmentSection.cs) (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -1,12 +1,14 @@
-using Ringtoets.Common.Placeholder;
+using Core.Common.Base;
+
+using Ringtoets.Common.Placeholder;
using Ringtoets.Piping.Data;
namespace Ringtoets.Integration.Data
{
///
/// The section to be assessed by the user for safety in regards of various failure mechanisms.
///
- public class DikeAssessmentSection
+ public class DikeAssessmentSection : Observable
{
///
/// Initializes a new instance of the class.
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/AssessmentSectionNodePresenter.cs
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/AssessmentSectionNodePresenter.cs (revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/AssessmentSectionNodePresenter.cs (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -0,0 +1,112 @@
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Windows.Forms;
+
+using Core.Common.Base;
+using Core.Common.Controls;
+using Core.Common.Utils.Collections;
+
+using Ringtoets.Common.Forms.Extensions;
+using Ringtoets.Integration.Data;
+
+using RingtoetsFormsResources = Ringtoets.Integration.Forms.Properties.Resources;
+
+namespace Ringtoets.Integration.Forms.NodePresenters
+{
+ ///
+ /// Node presenter for items in the tree view.
+ ///
+ public class AssessmentSectionNodePresenter : ITreeNodePresenter
+ {
+ public ITreeView TreeView { get; set; }
+
+ public Type NodeTagType
+ {
+ get
+ {
+ return typeof(DikeAssessmentSection);
+ }
+ }
+
+ public void UpdateNode(ITreeNode parentNode, ITreeNode node, object nodeData)
+ {
+ var assessmentSection = (DikeAssessmentSection)nodeData;
+ node.Text = assessmentSection.Name;
+ node.Image = RingtoetsFormsResources.AssessmentSectionFolderIcon;
+ }
+
+ public IEnumerable GetChildNodeObjects(object parentNodeData, ITreeNode node)
+ {
+ var assessmentSection = (DikeAssessmentSection)parentNodeData;
+ if (assessmentSection.PipingFailureMechanism != null)
+ {
+ yield return assessmentSection.PipingFailureMechanism;
+ }
+ }
+
+ public bool CanRenameNode(ITreeNode node)
+ {
+ return true;
+ }
+
+ public bool CanRenameNodeTo(ITreeNode node, string newName)
+ {
+ return true;
+ }
+
+ public void OnNodeRenamed(object nodeData, string newName)
+ {
+ var assessmentSection = (DikeAssessmentSection)nodeData;
+
+ assessmentSection.Name = newName;
+ assessmentSection.NotifyObservers();
+ }
+
+ public void OnNodeChecked(ITreeNode node) {}
+
+ public DragOperations CanDrag(object nodeData)
+ {
+ return DragOperations.None;
+ }
+
+ public DragOperations CanDrop(object item, ITreeNode sourceNode, ITreeNode targetNode, DragOperations validOperations)
+ {
+ return DragOperations.None;
+ }
+
+ public bool CanInsert(object item, ITreeNode sourceNode, ITreeNode targetNode)
+ {
+ return false;
+ }
+
+ public void OnDragDrop(object item, object sourceParentNodeData, object targetParentNodeData, DragOperations operation, int position) {}
+
+ public void OnNodeSelected(object nodeData) {}
+
+ public ContextMenuStrip GetContextMenu(ITreeNode sender, object nodeData)
+ {
+ return null;
+ }
+
+ public void OnPropertyChanged(object sender, ITreeNode node, PropertyChangedEventArgs e) {}
+
+ public void OnCollectionChanged(object sender, NotifyCollectionChangingEventArgs e) {}
+
+ public bool CanRemove(object parentNodeData, object nodeData)
+ {
+ return true;
+ }
+
+ public bool RemoveNodeData(object parentNodeData, object nodeData)
+ {
+ var parentProject = (Project) parentNodeData;
+ var assessmentSection = (DikeAssessmentSection) nodeData;
+
+ parentProject.Items.Remove(assessmentSection);
+ parentProject.NotifyObservers();
+
+ return true;
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/AssemblyInfo.cs
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/AssemblyInfo.cs (revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/AssemblyInfo.cs (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -0,0 +1,11 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+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("Ringtoets.Integration.Forms")]
+[assembly: AssemblyProduct("Ringtoets.Integration.Forms")]
+[assembly: Guid("29efee41-4016-4661-82b1-932c89986d24")]
+[assembly: InternalsVisibleTo("Ringtoets.Integration.Plugin")]
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.Designer.cs (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -0,0 +1,156 @@
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.18444
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace Ringtoets.Integration.Forms.Properties {
+ using System;
+
+
+ ///
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ ///
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ internal class Resources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources() {
+ }
+
+ ///
+ /// Returns the cached ResourceManager instance used by this class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Ringtoets.Integration.Forms.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ ///
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ internal static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Naam van het toetstraject..
+ ///
+ internal static string AssessmentSection_Name_Description {
+ get {
+ return ResourceManager.GetString("AssessmentSection_Name_Description", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Naam.
+ ///
+ internal static string AssessmentSection_Name_DisplayName {
+ get {
+ return ResourceManager.GetString("AssessmentSection_Name_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap AssessmentSectionFolderIcon {
+ get {
+ object obj = ResourceManager.GetObject("AssessmentSectionFolderIcon", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Voeg piping faalmechanisme toe.
+ ///
+ internal static string AssessmentSectionNodePresenter_ContextMenu_Add_PipingFailureMechanism {
+ get {
+ return ResourceManager.GetString("AssessmentSectionNodePresenter_ContextMenu_Add_PipingFailureMechanism", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Start een nieuwe piping toetsing voor dit project..
+ ///
+ internal static string AssessmentSectionNodePresenter_ContextMenu_Add_PipingFailureMechanism_Tooltip {
+ get {
+ return ResourceManager.GetString("AssessmentSectionNodePresenter_ContextMenu_Add_PipingFailureMechanism_Tooltip", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Kan geen nieuwe piping toetsing starten, omdat er al een piping toetsing is gestart voor dit project..
+ ///
+ internal static string AssessmentSectionNodePresenter_ContextMenu_PipingFailureMechanism_Already_Added_Tooltip {
+ get {
+ return ResourceManager.GetString("AssessmentSectionNodePresenter_ContextMenu_PipingFailureMechanism_Already_Added_T" +
+ "ooltip", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Toetstraject.
+ ///
+ internal static string AssessmentSectionProperties_DisplayName {
+ get {
+ return ResourceManager.GetString("AssessmentSectionProperties_DisplayName", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Algemeen.
+ ///
+ internal static string Categories_General {
+ get {
+ return ResourceManager.GetString("Categories_General", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized resource of type System.Drawing.Bitmap.
+ ///
+ internal static System.Drawing.Bitmap FailureMechanismIcon {
+ get {
+ object obj = ResourceManager.GetObject("FailureMechanismIcon", resourceCulture);
+ return ((System.Drawing.Bitmap)(obj));
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Algemeen.
+ ///
+ internal static string Ringtoets_Category {
+ get {
+ return ResourceManager.GetString("Ringtoets_Category", resourceCulture);
+ }
+ }
+ }
+}
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Properties/Resources.resx (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -0,0 +1,151 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ Algemeen
+
+
+ Toetstraject
+
+
+ Naam van het toetstraject.
+
+
+ Naam
+
+
+ Algemeen
+
+
+
+ ..\Resources\folder-stand.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
+ Voeg piping faalmechanisme toe
+
+
+ Start een nieuwe piping toetsing voor dit project.
+
+
+ Kan geen nieuwe piping toetsing starten, omdat er al een piping toetsing is gestart voor dit project.
+
+
+ ..\Resources\control_equalizer_blue.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a
+
+
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/AssessmentSectionProperties.cs
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/AssessmentSectionProperties.cs (revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PropertyClasses/AssessmentSectionProperties.cs (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -0,0 +1,31 @@
+using Core.Common.Gui;
+using Core.Common.Utils;
+
+using Ringtoets.Integration.Data;
+using Ringtoets.Integration.Forms.Properties;
+
+namespace Ringtoets.Integration.Forms.PropertyClasses
+{
+ ///
+ /// ViewModel of for properties panel.
+ ///
+ [ResourcesDisplayName(typeof(Resources), "AssessmentSectionProperties_DisplayName")]
+ public class AssessmentSectionProperties : ObjectProperties
+ {
+ [ResourcesCategory(typeof(Resources), "Categories_General")]
+ [ResourcesDisplayName(typeof(Resources), "AssessmentSection_Name_DisplayName")]
+ [ResourcesDescription(typeof(Resources), "AssessmentSection_Name_Description")]
+ public string Name
+ {
+ get
+ {
+ return data.Name;
+ }
+ set
+ {
+ data.Name = value;
+ data.NotifyObservers();
+ }
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Resources/control_equalizer_blue.png
===================================================================
diff -u
Binary files differ
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Resources/folder-stand.png
===================================================================
diff -u
Binary files differ
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj (revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -0,0 +1,142 @@
+
+
+
+
+ Debug
+ AnyCPU
+ {AD0CDC89-0A00-4068-AEEC-9838863C2FE8}
+ Library
+ Properties
+ Ringtoets.Integration.Forms
+ Ringtoets.Integration.Forms
+ v4.0
+ 512
+
+
+ true
+ full
+ false
+ bin\Debug\
+ DEBUG;TRACE
+ prompt
+ 4
+
+
+ pdbonly
+ true
+ bin\Release\
+ TRACE
+ prompt
+ 4
+
+
+ true
+ bin\Debug\
+ DEBUG;TRACE
+ full
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\Release\
+ TRACE
+ true
+ pdbonly
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\CreateInstallerWithDemoProject\
+ TRACE
+ true
+ pdbonly
+ AnyCPU
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+ bin\CreateInstallerWithDemoProject\
+ TRACE
+ true
+ pdbonly
+ x86
+ prompt
+ MinimumRecommendedRules.ruleset
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Properties\GlobalAssembly.cs
+
+
+
+
+ True
+ True
+ Resources.resx
+
+
+
+
+
+ {3bbfd65b-b277-4e50-ae6d-bd24c3434609}
+ Core.Common.Base
+
+
+ {9a2d67e6-26ac-4d17-b11a-2b4372f2f572}
+ Core.Common.Controls
+
+
+ {30e4c2ae-719e-4d70-9fa9-668a9767fbfa}
+ Core.Common.Gui
+
+
+ {f49bd8b2-332a-4c91-a196-8cce0a2c7d98}
+ Core.Common.Utils
+
+
+ {4d840673-3812-4338-a352-84854e32b8a0}
+ Ringtoets.Common.Forms
+
+
+ {ce994cc9-6f6a-48ac-b4be-02c30a21f4db}
+ Ringtoets.Piping.Data
+
+
+ {11f1f874-45af-43e4-8ae5-15a5c9593e28}
+ Ringtoets.Integration.Data
+
+
+
+
+ ResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
Fisheye: Tag 47ddc19835a668e6c1c5edad4a7bec58e2200c10 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/AssemblyInfo.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 47ddc19835a668e6c1c5edad4a7bec58e2200c10 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 47ddc19835a668e6c1c5edad4a7bec58e2200c10 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsApplicationPlugin.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 47ddc19835a668e6c1c5edad4a7bec58e2200c10 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/DikeAssessmentSectionTest.cs
===================================================================
diff -u -re4190343f86e5f4b5fa2bb60f9d5ec307d8053f5 -raa5c3620f316831e71797c558a13a0b73a8109df
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/DikeAssessmentSectionTest.cs (.../DikeAssessmentSectionTest.cs) (revision e4190343f86e5f4b5fa2bb60f9d5ec307d8053f5)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/DikeAssessmentSectionTest.cs (.../DikeAssessmentSectionTest.cs) (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -1,5 +1,7 @@
-using NUnit.Framework;
+using Core.Common.Base;
+using NUnit.Framework;
+
using Ringtoets.Piping.Data;
namespace Ringtoets.Integration.Data.Test
@@ -14,6 +16,8 @@
var section = new DikeAssessmentSection();
// Assert
+ Assert.IsInstanceOf(section);
+
Assert.AreEqual("Dijktraject", section.Name);
Assert.AreEqual("Referentielijn", section.ReferenceLine.Name);
Assert.AreEqual("Faalkansverdeling", section.FailureMechanismContribution.Name);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionNodePresenterTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionNodePresenterTest.cs (revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionNodePresenterTest.cs (revision aa5c3620f316831e71797c558a13a0b73a8109df)
@@ -0,0 +1,353 @@
+using System.ComponentModel;
+using System.Linq;
+
+using Core.Common.Base;
+using Core.Common.Controls;
+using Core.Common.Utils.Collections;
+
+using NUnit.Framework;
+
+using Rhino.Mocks;
+
+using Ringtoets.Integration.Data;
+using Ringtoets.Integration.Forms.NodePresenters;
+using Ringtoets.Piping.Data;
+
+namespace Ringtoets.Integration.Forms.Test.NodePresenters
+{
+ [TestFixture]
+ public class AssessmentSectionNodePresenterTest
+ {
+ [Test]
+ public void DefaultConstructor_ExpectedValues()
+ {
+ // Call
+ var nodePresenter = new AssessmentSectionNodePresenter();
+
+ // Assert
+ Assert.IsInstanceOf(nodePresenter);
+ Assert.IsNull(nodePresenter.TreeView);
+ Assert.AreEqual(typeof(DikeAssessmentSection), nodePresenter.NodeTagType);
+ }
+
+ [Test]
+ public void UpdateNode_WithData_InitializeNode()
+ {
+ // Setup
+ const string projectName = "";
+
+ var mocks = new MockRepository();
+ var projectNode = mocks.Stub();
+ mocks.ReplayAll();
+
+ var nodePresenter = new AssessmentSectionNodePresenter();
+
+ var assessmentSection = new DikeAssessmentSection
+ {
+ Name = projectName
+ };
+
+ // Call
+ nodePresenter.UpdateNode(null, projectNode, assessmentSection);
+
+ // Assert
+ Assert.AreEqual(projectName, projectNode.Text);
+ Assert.AreEqual(16, projectNode.Image.Height);
+ Assert.AreEqual(16, projectNode.Image.Width);
+ }
+
+ [Test]
+ public void GetChildNodeObjects_WithPipingFailureMechanism_ReturnPipingFailureMechanism()
+ {
+ // Setup
+ var mocks = new MockRepository();
+ var nodeMock = mocks.StrictMock();
+ mocks.ReplayAll();
+
+ var nodePresenter = new AssessmentSectionNodePresenter();
+
+ var assessmentSection = new DikeAssessmentSection();
+
+ // Call
+ var children = nodePresenter.GetChildNodeObjects(assessmentSection, nodeMock).Cast