Fisheye: Tag 75aa4fefacf584d5172dc3bdffd348b0aacb05a4 refers to a dead (removed) revision in file `Core/Common/src/Core.Common.Gui/ColorTheme.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj
===================================================================
diff -u -r8376f3f25a98f8755479ed069c318e0b70922b38 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision 8376f3f25a98f8755479ed069c318e0b70922b38)
+++ Core/Common/src/Core.Common.Gui/Core.Common.Gui.csproj	(.../Core.Common.Gui.csproj)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -115,7 +115,8 @@
     </Compile>
     <Compile Include="Appenders\RingtoetsUserDataFolderConverter.cs" />
     <Compile Include="Appenders\RunReportLogAppender.cs" />
-    <Compile Include="ColorTheme.cs" />
+    <Compile Include="Theme\ColorTheme.cs" />
+    <Compile Include="Theme\ColorThemeExtensions.cs" />
     <Compile Include="ContextMenu\ContextMenuBuilderException.cs" />
     <Compile Include="ContextMenu\IContextMenuBuilder.cs" />
     <Compile Include="ControlHelper.cs" />
Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs
===================================================================
diff -u -r3ede22c08da5f2050eb231137a2c6dd552e1ebdf -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 3ede22c08da5f2050eb231137a2c6dd552e1ebdf)
+++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs	(.../MainWindow.xaml.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -16,10 +16,11 @@
 using System.Windows.Input;
 using System.Windows.Interop;
 using System.Windows.Media.Imaging;
-using Core.Common.Controls;
 using Core.Common.Controls.Dialogs;
 using Core.Common.Gui.Forms.MessageWindow;
 using Core.Common.Gui.Forms.Options;
+using Core.Common.Gui.Properties;
+using Core.Common.Gui.Theme;
 using Core.Common.Utils;
 using Core.Common.Utils.Collections;
 using Core.Common.Utils.Interop;
@@ -31,10 +32,10 @@
 using Xceed.Wpf.AvalonDock.Layout;
 using Xceed.Wpf.AvalonDock.Layout.Serialization;
 using Xceed.Wpf.AvalonDock.Themes;
-using WindowsFormApplication = System.Windows.Forms.Application;
 using Button = Fluent.Button;
 using Cursors = System.Windows.Input.Cursors;
 using IWin32Window = System.Windows.Forms.IWin32Window;
+using WindowsFormApplication = System.Windows.Forms.Application;
 
 namespace Core.Common.Gui.Forms.MainWindow
 {
@@ -163,7 +164,7 @@
         {
             get
             {
-                return Enumerable.OfType<IProjectExplorer>(Gui.ToolWindowViews).FirstOrDefault();
+                return Gui.ToolWindowViews.OfType<IProjectExplorer>().FirstOrDefault();
             }
         }
 
@@ -224,7 +225,7 @@
 
         public void SaveLayout()
         {
-            if (Properties.Settings.Default.autosaveWindowLayout)
+            if (Settings.Default.autosaveWindowLayout)
             {
                 SaveWindowAppearance();
                 OnSaveLayout("normal");
@@ -522,7 +523,7 @@
 
         private void AddRecentlyOpenedProjectsToFileMenu()
         {
-            var mruList = Properties.Settings.Default["mruList"] as StringCollection;
+            var mruList = Settings.Default["mruList"] as StringCollection;
 
             foreach (var recent in mruList)
             {
@@ -574,7 +575,7 @@
 
         private void CommitMruToSettings()
         {
-            var mruList = (StringCollection) Properties.Settings.Default["mruList"];
+            var mruList = (StringCollection) Settings.Default["mruList"];
 
             mruList.Clear();
 
@@ -633,7 +634,6 @@
         private void OnFileSaveClicked(object sender, RoutedEventArgs e)
         {
             //TODO: Implement
-            return;
 
             // Original code:
             //var saveProject = Gui.CommandHandler.SaveProject();
@@ -643,7 +643,6 @@
         private void OnFileSaveAsClicked(object sender, RoutedEventArgs e)
         {
             //TODO: Implement
-            return;
 
             // Original code:
             //var saveProject = Gui.CommandHandler.SaveProjectAs();
@@ -653,7 +652,6 @@
         private void OnAfterProjectSaveOrOpen(bool actionSuccesful)
         {
             //TODO: Implement
-            return;
 
             // Original code:
             /*
@@ -669,7 +667,6 @@
         private void OnFileOpenClicked(object sender, RoutedEventArgs e)
         {
             //TODO: Implement
-            return;
 
             // Original code:
             //var succesful = Gui.CommandHandler.TryOpenExistingProject();
@@ -679,7 +676,6 @@
         private void OnFileCloseClicked(object sender, RoutedEventArgs e)
         {
             //TODO: Implement
-            return;
 
             // Original code:
             //Gui.CommandHandler.TryCloseProject();
@@ -816,10 +812,10 @@
         private void RestoreWindowAppearance()
         {
             WindowStartupLocation = WindowStartupLocation.Manual;
-            var x = Properties.Settings.Default.MainWindow_X;
-            var y = Properties.Settings.Default.MainWindow_Y;
-            var width = Properties.Settings.Default.MainWindow_Width;
-            var height = Properties.Settings.Default.MainWindow_Height;
+            var x = Settings.Default.MainWindow_X;
+            var y = Settings.Default.MainWindow_Y;
+            var width = Settings.Default.MainWindow_Width;
+            var height = Settings.Default.MainWindow_Height;
             var rec = new Rectangle(x, y, width, height);
 
             if (!IsVisibleOnAnyScreen(rec))
@@ -828,7 +824,7 @@
                 height = Screen.PrimaryScreen.Bounds.Height - 200;
             }
 
-            var fs = Properties.Settings.Default.MainWindow_FullScreen;
+            var fs = Settings.Default.MainWindow_FullScreen;
             Width = width;
             Height = height;
             if (fs)
@@ -854,15 +850,15 @@
         {
             if (WindowState == WindowState.Maximized)
             {
-                Properties.Settings.Default.MainWindow_FullScreen = true;
+                Settings.Default.MainWindow_FullScreen = true;
             }
             else
             {
-                Properties.Settings.Default.MainWindow_Width = (int) Width;
-                Properties.Settings.Default.MainWindow_Height = (int) Height;
-                Properties.Settings.Default.MainWindow_FullScreen = false;
+                Settings.Default.MainWindow_Width = (int) Width;
+                Settings.Default.MainWindow_Height = (int) Height;
+                Settings.Default.MainWindow_FullScreen = false;
             }
-            Properties.Settings.Default.Save();
+            Settings.Default.Save();
         }
 
         private void MainWindow_OnLoaded(object sender, RoutedEventArgs e)
@@ -899,7 +895,7 @@
         private void UpdateRibbonExtensions()
         {
             // get all ribbon controls
-            ribbonCommandHandlers = Enumerable.Where<GuiPlugin>(Gui.Plugins, p => p.RibbonCommandHandler != null).Select(p => p.RibbonCommandHandler).ToArray();
+            ribbonCommandHandlers = Gui.Plugins.Where(p => p.RibbonCommandHandler != null).Select(p => p.RibbonCommandHandler).ToArray();
 
             foreach (var ribbonExtension in ribbonCommandHandlers)
             {
@@ -1158,7 +1154,7 @@
         // Alt + Shift + M
         private void ShowMapLegendView(object sender, ExecutedRoutedEventArgs e)
         {
-            var mapContents = Enumerable.FirstOrDefault<IView>(Gui.ToolWindowViews, v => v.Text == Properties.Resources.ToolWindow_Name_Map);
+            var mapContents = Gui.ToolWindowViews.FirstOrDefault(v => v.Text == Properties.Resources.ToolWindow_Name_Map);
             if (mapContents != null)
             {
                 Gui.ToolWindowViews.ActiveView = mapContents;
@@ -1174,7 +1170,7 @@
         // Alt + Shift + C
         private void ShowChartContentsWindow(object sender, ExecutedRoutedEventArgs e)
         {
-            var chartContents = Enumerable.FirstOrDefault<IView>(Gui.ToolWindowViews, v => v.Text == Properties.Resources.ToolWindow_Name_Chart);
+            var chartContents = Gui.ToolWindowViews.FirstOrDefault(v => v.Text == Properties.Resources.ToolWindow_Name_Chart);
             if (chartContents != null)
             {
                 Gui.ToolWindowViews.ActiveView = chartContents;
@@ -1183,7 +1179,7 @@
 
         private void CanCloseDocumentTab(object sender, CanExecuteRoutedEventArgs e)
         {
-            e.CanExecute = Enumerable.Any<IView>(Gui.DocumentViews);
+            e.CanExecute = Gui.DocumentViews.Any();
         }
 
         private void ButtonResetUILayout_Click(object sender, RoutedEventArgs e)
@@ -1193,7 +1189,7 @@
 
         private void OnAboutDialog_Clicked(object sender, RoutedEventArgs e)
         {
-            var aboutDialog = new SplashScreen.SplashScreen()
+            var aboutDialog = new SplashScreen.SplashScreen
             {
                 HasProgress = false,
                 VersionText = SettingsHelper.ApplicationVersion,
Index: Core/Common/src/Core.Common.Gui/Forms/Options/OptionsDialog.cs
===================================================================
diff -u -r00561a8c93e3a28b5f0e078fa7219a65408e931b -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Core/Common/src/Core.Common.Gui/Forms/Options/OptionsDialog.cs	(.../OptionsDialog.cs)	(revision 00561a8c93e3a28b5f0e078fa7219a65408e931b)
+++ Core/Common/src/Core.Common.Gui/Forms/Options/OptionsDialog.cs	(.../OptionsDialog.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -2,6 +2,7 @@
 using System.Collections.ObjectModel;
 using System.Configuration;
 using System.Windows.Forms;
+using Core.Common.Gui.Theme;
 using Core.Common.Gui.Properties;
 using Core.Common.Utils.Reflection;
 
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs
===================================================================
diff -u -ra795ec78ef4456ab9c8ad42029eb744093dfc600 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision a795ec78ef4456ab9c8ad42029eb744093dfc600)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     Runtime Version:4.0.30319.34209
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -887,6 +887,33 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Toetsspoor.
+        /// </summary>
+        public static string FailureMechanismContributionView_GridColumn_Assessment {
+            get {
+                return ResourceManager.GetString("FailureMechanismContributionView_GridColumn_Assessment", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Toegestane bijdrage aan faalkans [%].
+        /// </summary>
+        public static string FailureMechanismContributionView_GridColumn_Contribution {
+            get {
+                return ResourceManager.GetString("FailureMechanismContributionView_GridColumn_Contribution", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Faalkansruimte (per jaar) [-].
+        /// </summary>
+        public static string FailureMechanismContributionView_GridColumn_ProbabilitySpace {
+            get {
+                return ResourceManager.GetString("FailureMechanismContributionView_GridColumn_ProbabilitySpace", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
         public static System.Drawing.Bitmap feed {
Index: Core/Common/src/Core.Common.Gui/Properties/Resources.resx
===================================================================
diff -u -ra795ec78ef4456ab9c8ad42029eb744093dfc600 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision a795ec78ef4456ab9c8ad42029eb744093dfc600)
+++ Core/Common/src/Core.Common.Gui/Properties/Resources.resx	(.../Resources.resx)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -910,4 +910,13 @@
   <data name="OptionsHS1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\OptionsHS.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="FailureMechanismContributionView_GridColumn_ProbabilitySpace" xml:space="preserve">
+    <value>Faalkansruimte (per jaar) [-]</value>
+  </data>
+  <data name="FailureMechanismContributionView_GridColumn_Contribution" xml:space="preserve">
+    <value>Toegestane bijdrage aan faalkans [%]</value>
+  </data>
+  <data name="FailureMechanismContributionView_GridColumn_Assessment" xml:space="preserve">
+    <value>Toetsspoor</value>
+  </data>
 </root>
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Properties/Settings.Designer.cs
===================================================================
diff -u -re3fe000640536463811a1051aedf6da711ee0f56 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Core/Common/src/Core.Common.Gui/Properties/Settings.Designer.cs	(.../Settings.Designer.cs)	(revision e3fe000640536463811a1051aedf6da711ee0f56)
+++ Core/Common/src/Core.Common.Gui/Properties/Settings.Designer.cs	(.../Settings.Designer.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -202,9 +202,9 @@
         [global::System.Configuration.UserScopedSettingAttribute()]
         [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
         [global::System.Configuration.DefaultSettingValueAttribute("Generic")]
-        public global::Core.Common.Gui.ColorTheme colorTheme {
+        public global::Core.Common.Gui.Theme.ColorTheme colorTheme {
             get {
-                return ((global::Core.Common.Gui.ColorTheme)(this["colorTheme"]));
+                return ((global::Core.Common.Gui.Theme.ColorTheme)(this["colorTheme"]));
             }
             set {
                 this["colorTheme"] = value;
Index: Core/Common/src/Core.Common.Gui/Theme/ColorTheme.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Gui/Theme/ColorTheme.cs	(revision 0)
+++ Core/Common/src/Core.Common.Gui/Theme/ColorTheme.cs	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -0,0 +1,15 @@
+namespace Core.Common.Gui.Theme
+{
+    /// <summary>
+    /// Enumeration for the all the possible color themes in the application.
+    /// </summary>
+    public enum ColorTheme
+    {
+        Dark,
+        Light,
+        Metro,
+        Aero,
+        VS2010,
+        Generic
+    }
+}
\ No newline at end of file
Index: Core/Common/src/Core.Common.Gui/Theme/ColorThemeExtensions.cs
===================================================================
diff -u
--- Core/Common/src/Core.Common.Gui/Theme/ColorThemeExtensions.cs	(revision 0)
+++ Core/Common/src/Core.Common.Gui/Theme/ColorThemeExtensions.cs	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -0,0 +1,22 @@
+using System;
+using Core.Common.Gui.Properties;
+
+namespace Core.Common.Gui.Theme
+{
+    /// <summary>
+    /// Extension methods for the <see cref="ColorTheme"/> class
+    /// </summary>
+    public static class ColorThemeExtensions
+    {
+        /// <summary>
+        /// Gets the localized string from the <see cref="Resources"/> based on the 
+        /// name of the <see cref="ColorTheme"/>.
+        /// </summary>
+        /// <param name="theme">The <see cref="ColorTheme"/> for which to get the localized name.</param>
+        /// <returns>The localized name from the <see cref="Resources"/>.</returns>
+        public static string Localized(this ColorTheme theme)
+        {
+            return Resources.ResourceManager.GetString(Enum.GetName(typeof(ColorTheme), theme));
+        }
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj
===================================================================
diff -u -rd6e6eadf4a2521df75b6d371bacbb181a43058a3 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj	(.../Core.Common.Gui.Test.csproj)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
+++ Core/Common/test/Core.Common.Gui.Test/Core.Common.Gui.Test.csproj	(.../Core.Common.Gui.Test.csproj)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -60,7 +60,8 @@
     <Compile Include="ContextMenu\TreeViewContextMenuItemFactoryTest.cs" />
     <Compile Include="ContextMenu\GuiContextMenuItemFactoryTest.cs" />
     <Compile Include="ExpandableArrayConverterTest.cs" />
-    <Compile Include="Forms\Options\ColorThemeTest.cs" />
+    <Compile Include="Theme\ColorThemeExtensionsTest.cs" />
+    <Compile Include="Theme\ColorThemeTest.cs" />
     <Compile Include="Forms\Options\OptionsDialogTest.cs" />
     <Compile Include="Forms\SplashScreenTest.cs" />
     <Compile Include="GuiCommandHandlerTest.cs" />
Fisheye: Tag 75aa4fefacf584d5172dc3bdffd348b0aacb05a4 refers to a dead (removed) revision in file `Core/Common/test/Core.Common.Gui.Test/Forms/Options/ColorThemeTest.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Core/Common/test/Core.Common.Gui.Test/Theme/ColorThemeExtensionsTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Gui.Test/Theme/ColorThemeExtensionsTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Gui.Test/Theme/ColorThemeExtensionsTest.cs	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -0,0 +1,37 @@
+using System;
+using System.Collections.ObjectModel;
+using Core.Common.Gui.Properties;
+using Core.Common.Gui.Theme;
+using NUnit.Framework;
+
+namespace Core.Common.Gui.Test.Theme
+{
+    [TestFixture]
+    public class ColorThemeExtensionsTest
+    {
+        [Test]
+        public void Localized_ForEveryItem_ExpectedTranslatedString()
+        {
+            // Setup
+            var nameList = new[]
+            {
+                Resources.Dark,
+                Resources.Light,
+                Resources.Metro,
+                Resources.Aero,
+                Resources.VS2010,
+                Resources.Generic
+            };
+            var translations = new Collection<string>();
+
+            // Call
+            foreach (ColorTheme item in Enum.GetValues(typeof(ColorTheme)))
+            {
+                translations.Add(item.Localized());
+            }
+
+            // Assert
+            CollectionAssert.AreEqual(nameList, translations);
+        } 
+    }
+}
\ No newline at end of file
Index: Core/Common/test/Core.Common.Gui.Test/Theme/ColorThemeTest.cs
===================================================================
diff -u
--- Core/Common/test/Core.Common.Gui.Test/Theme/ColorThemeTest.cs	(revision 0)
+++ Core/Common/test/Core.Common.Gui.Test/Theme/ColorThemeTest.cs	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -0,0 +1,35 @@
+using System;
+using Core.Common.Gui.Theme;
+using NUnit.Framework;
+
+namespace Core.Common.Gui.Test.Theme
+{
+    [TestFixture]
+    public class ColorThemeTest
+    {
+        [Test]
+        public void ColorTheme_Values_HasSix()
+        {
+            // Call & Assert
+            Assert.AreEqual(6, Enum.GetValues(typeof(ColorTheme)).Length);
+        }
+
+        [Test]
+        public void ColorTheme_GetNames_HasSix()
+        {
+            // Setup
+            var nameList = new[]
+            {
+                "Dark",
+                "Light",
+                "Metro",
+                "Aero",
+                "VS2010",
+                "Generic"
+            };
+
+            // Call & Assert
+            CollectionAssert.AreEqual(nameList, Enum.GetNames(typeof(ColorTheme)));
+        }
+    }
+}
\ No newline at end of file
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs
===================================================================
diff -u -rd37e350b3c62d61768313c57c2d8d8d05d22458a -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs	(.../ProjectExplorer.cs)	(revision d37e350b3c62d61768313c57c2d8d8d05d22458a)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorer.cs	(.../ProjectExplorer.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -33,7 +33,6 @@
             treeViewPanel.Controls.Add(ProjectTreeView);
 
             gui.DocumentViews.ActiveViewChanged += DocumentViewsActiveViewChanged;
-            ProjectTreeView.TreeView.OnUpdate += (s,e) => gui.UpdateToolTips();
         }
 
         public ProjectTreeView ProjectTreeView { get; private set; }
Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerGuiPlugin.cs
===================================================================
diff -u -r074232b001ecb5ae110c0b95c05264d4372cbfb5 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerGuiPlugin.cs	(.../ProjectExplorerGuiPlugin.cs)	(revision 074232b001ecb5ae110c0b95c05264d4372cbfb5)
+++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerGuiPlugin.cs	(.../ProjectExplorerGuiPlugin.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -62,6 +62,7 @@
 
                 ProjectExplorer.ProjectTreeView.Project = Gui.Project;
                 ProjectExplorer.Text = Properties.Resources.ProjectExplorerPluginGui_InitializeProjectTreeView_Project_Explorer;
+                ProjectExplorer.ProjectTreeView.TreeView.OnUpdate += (s, e) => Gui.UpdateToolTips();
             }
 
             //add project treeview as a toolwindowview.
Index: Ringtoets.sln
===================================================================
diff -u -rd6e6eadf4a2521df75b6d371bacbb181a43058a3 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets.sln	(.../Ringtoets.sln)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
+++ Ringtoets.sln	(.../Ringtoets.sln)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -223,6 +223,8 @@
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Piping.Data.TestUtil.Test", "Ringtoets\Piping\test\Ringtoets.Piping.Data.TestUtil.Test\Ringtoets.Piping.Data.TestUtil.Test.csproj", "{35B78215-420B-4D7D-9959-9E9010601200}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.Common.Data.Test", "Ringtoets\Common\test\Ringtoets.Common.Data.Test\Ringtoets.Common.Data.Test.csproj", "{7BABA02F-4809-43D2-93E5-DA9ED69BDDE2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		CreateInstaller|x86 = CreateInstaller|x86
@@ -888,6 +890,14 @@
 		{35B78215-420B-4D7D-9959-9E9010601200}.Release|x86.Build.0 = Release|x86
 		{35B78215-420B-4D7D-9959-9E9010601200}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
 		{35B78215-420B-4D7D-9959-9E9010601200}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
+		{7BABA02F-4809-43D2-93E5-DA9ED69BDDE2}.CreateInstaller|x86.ActiveCfg = Release|x86
+		{7BABA02F-4809-43D2-93E5-DA9ED69BDDE2}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86
+		{7BABA02F-4809-43D2-93E5-DA9ED69BDDE2}.Debug|x86.ActiveCfg = Debug|x86
+		{7BABA02F-4809-43D2-93E5-DA9ED69BDDE2}.Debug|x86.Build.0 = Debug|x86
+		{7BABA02F-4809-43D2-93E5-DA9ED69BDDE2}.Release|x86.ActiveCfg = Release|x86
+		{7BABA02F-4809-43D2-93E5-DA9ED69BDDE2}.Release|x86.Build.0 = Release|x86
+		{7BABA02F-4809-43D2-93E5-DA9ED69BDDE2}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
+		{7BABA02F-4809-43D2-93E5-DA9ED69BDDE2}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -962,6 +972,7 @@
 		{4D840673-3812-4338-A352-84854E32B8A0} = {0590D3BB-EB3E-4B53-BD64-1725E1CBB1F4}
 		{D4200F43-3F72-4F42-AF0A-8CED416A38EC} = {0590D3BB-EB3E-4B53-BD64-1725E1CBB1F4}
 		{886FDBE5-7065-4AB9-A894-869DBFD4E440} = {B5F4F5A5-FD36-405D-ABA1-56C270207C8F}
+		{7BABA02F-4809-43D2-93E5-DA9ED69BDDE2} = {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}
Index: Ringtoets/Common/src/Ringtoets.Common.Data/BaseFailureMechanism.cs
===================================================================
diff -u
--- Ringtoets/Common/src/Ringtoets.Common.Data/BaseFailureMechanism.cs	(revision 0)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/BaseFailureMechanism.cs	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -0,0 +1,30 @@
+using System;
+using Core.Common.Base;
+using Ringtoets.Common.Data.Properties;
+
+namespace Ringtoets.Common.Data
+{
+
+    public abstract class BaseFailureMechanism : Observable, IFailureMechanism
+    {
+        private double contribution;
+
+        public double Contribution
+        {
+            get
+            {
+                return contribution;
+            }
+            set
+            {
+                if (value < 0 || value > 100)
+                {
+                    throw new ArgumentException(Resources.FailureMechanism_Contribution_Value_should_be_in_interval_0_100, "value");
+                }
+                contribution = value;
+            }
+        }
+
+        public string Name { get; set; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/IFailureMechanism.cs
===================================================================
diff -u -r5c044a6799b45bec77af170dca0a84bc434c5f6f -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Common/src/Ringtoets.Common.Data/IFailureMechanism.cs	(.../IFailureMechanism.cs)	(revision 5c044a6799b45bec77af170dca0a84bc434c5f6f)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/IFailureMechanism.cs	(.../IFailureMechanism.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -1,10 +1,22 @@
-namespace Ringtoets.Common.Data
+using System;
+
+namespace Ringtoets.Common.Data
 {
     /// <summary>
     /// Defines a failure mechanism.
     /// </summary>
     public interface IFailureMechanism
     {
-         
+        /// <summary>
+        /// Gets the amount of contribution as a percentage (0-100) for the <see cref="IFailureMechanism"/>
+        /// as part of the overall verdict.
+        /// </summary>
+        /// <exception cref="ArgumentException">Thrown when the <paramref name="value"/> is not in interval [0-100].</exception>
+        double Contribution { get; set; }
+
+        /// <summary>
+        /// The name of the <see cref="IFailureMechanism"/>.
+        /// </summary>
+        string Name { get; }
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -rf11bebcc0a2f2356ef04653812d383b270929888 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision f11bebcc0a2f2356ef04653812d383b270929888)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.18444
+//     Runtime Version:4.0.30319.34209
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -79,6 +79,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to De waarde voor de toegestane bijdrage aan faalkans moet in interval [0-100] liggen..
+        /// </summary>
+        public static string FailureMechanism_Contribution_Value_should_be_in_interval_0_100 {
+            get {
+                return ResourceManager.GetString("FailureMechanism_Contribution_Value_should_be_in_interval_0_100", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Locaties.
         /// </summary>
         public static string FailureMechanism_Locations_DisplayName {
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx
===================================================================
diff -u -rf11bebcc0a2f2356ef04653812d383b270929888 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx	(.../Resources.resx)	(revision f11bebcc0a2f2356ef04653812d383b270929888)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Properties/Resources.resx	(.../Resources.resx)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -123,6 +123,9 @@
   <data name="FailureMechanism_BoundaryConditions_DisplayName" xml:space="preserve">
     <value>Randvoorwaarden</value>
   </data>
+  <data name="FailureMechanism_Contribution_Value_should_be_in_interval_0_100" xml:space="preserve">
+    <value>De waarde voor de toegestane bijdrage aan faalkans moet in interval [0-100] liggen.</value>
+  </data>
   <data name="FailureMechanism_Locations_DisplayName" xml:space="preserve">
     <value>Locaties</value>
   </data>
Index: Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj
===================================================================
diff -u -r3f1a2b8718a744b49b160c89df46dee6b7fb5fdd -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision 3f1a2b8718a744b49b160c89df46dee6b7fb5fdd)
+++ Ringtoets/Common/src/Ringtoets.Common.Data/Ringtoets.Common.Data.csproj	(.../Ringtoets.Common.Data.csproj)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -39,6 +39,7 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
+    <Compile Include="BaseFailureMechanism.cs" />
     <Compile Include="IFailureMechanism.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
@@ -54,6 +55,12 @@
       <SubType>Designer</SubType>
     </EmbeddedResource>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
+      <Project>{3BBFD65B-B277-4E50-AE6D-BD24C3434609}</Project>
+      <Name>Core.Common.Base</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
Index: Ringtoets/Common/src/Ringtoets.Common.Placeholder/PlaceholderWithReadonlyName.cs
===================================================================
diff -u -re4190343f86e5f4b5fa2bb60f9d5ec307d8053f5 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Common/src/Ringtoets.Common.Placeholder/PlaceholderWithReadonlyName.cs	(.../PlaceholderWithReadonlyName.cs)	(revision e4190343f86e5f4b5fa2bb60f9d5ec307d8053f5)
+++ Ringtoets/Common/src/Ringtoets.Common.Placeholder/PlaceholderWithReadonlyName.cs	(.../PlaceholderWithReadonlyName.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -1,9 +1,11 @@
-namespace Ringtoets.Common.Placeholder
+using Ringtoets.Common.Data;
+
+namespace Ringtoets.Common.Placeholder
 {
     /// <summary>
     /// Simple placeholder object with only a name that cannot be changed.
     /// </summary>
-    public class PlaceholderWithReadonlyName
+    public class PlaceholderWithReadonlyName : BaseFailureMechanism
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PlaceholderWithReadonlyName"/> class.
@@ -13,10 +15,5 @@
         {
             Name = name;
         }
-
-        /// <summary>
-        /// Gets the name of the placeholder.
-        /// </summary>
-        public string Name { get; private set; } 
     }
 }
\ No newline at end of file
Index: Ringtoets/Common/src/Ringtoets.Common.Placeholder/Ringtoets.Common.Placeholder.csproj
===================================================================
diff -u -r3f1a2b8718a744b49b160c89df46dee6b7fb5fdd -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Common/src/Ringtoets.Common.Placeholder/Ringtoets.Common.Placeholder.csproj	(.../Ringtoets.Common.Placeholder.csproj)	(revision 3f1a2b8718a744b49b160c89df46dee6b7fb5fdd)
+++ Ringtoets/Common/src/Ringtoets.Common.Placeholder/Ringtoets.Common.Placeholder.csproj	(.../Ringtoets.Common.Placeholder.csproj)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -46,11 +46,19 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
+      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
+      <Name>Core.Common.Base</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Version\Core.Common.Version.csproj">
       <Project>{c90b77da-e421-43cc-b82e-529651bc21ac}</Project>
       <Name>Core.Common.Version</Name>
       <Private>False</Private>
     </ProjectReference>
+    <ProjectReference Include="..\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
+      <Project>{D4200F43-3F72-4F42-AF0A-8CED416A38EC}</Project>
+      <Name>Ringtoets.Common.Data</Name>
+    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/BaseFailureMechanismTest.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/BaseFailureMechanismTest.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/BaseFailureMechanismTest.cs	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -0,0 +1,37 @@
+using NUnit.Framework;
+using Rhino.Mocks;
+
+namespace Ringtoets.Common.Data.Test
+{
+    [TestFixture]
+    public class BaseFailureMechanismTest
+    {
+        private MockRepository mockRepository;
+
+        [SetUp]
+        public void SetUp()
+        {
+            mockRepository = new MockRepository();
+        }
+
+        [Test]
+        [TestCase(101)]
+        [TestCase(-1)]
+        [TestCase(-1e-6)]
+        [TestCase(100+1e-6)]
+        public void Contribution_ValueOutsideValidRegion_ThrowsArgumentException(double value)
+        {
+            // Setup
+            var failureMechanism = mockRepository.StrictMock<BaseFailureMechanism>();
+
+            mockRepository.ReplayAll();
+
+            // Call
+            TestDelegate test = () => failureMechanism.Contribution = value;
+
+            // Assert
+
+            mockRepository.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Properties/AssemblyInfo.cs
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Properties/AssemblyInfo.cs	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Properties/AssemblyInfo.cs	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -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.Data.Test")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("Ringtoets.Common.Data.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("49c4edef-1301-4c22-b27f-3958a9fb55e0")]
+
+// 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.Data.Test/Ringtoets.Common.Data.Test.csproj
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Ringtoets.Common.Data.Test.csproj	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
+    <ProjectGuid>{7BABA02F-4809-43D2-93E5-DA9ED69BDDE2}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>Ringtoets.Common.Data.Test</RootNamespace>
+    <AssemblyName>Ringtoets.Common.Data.Test</AssemblyName>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
+    <DebugSymbols>true</DebugSymbols>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DebugType>full</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>none</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'ReleaseForCodeCoverage|x86'">
+    <OutputPath>bin\ReleaseForCodeCoverage\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <Optimize>true</Optimize>
+    <DebugType>pdbonly</DebugType>
+    <PlatformTarget>x86</PlatformTarget>
+    <ErrorReport>prompt</ErrorReport>
+    <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="nunit.framework">
+      <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
+    </Reference>
+    <Reference Include="Rhino.Mocks">
+      <HintPath>..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Core" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="BaseFailureMechanismTest.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\Core\Common\src\Core.Common.Base\Core.Common.Base.csproj">
+      <Project>{3bbfd65b-b277-4e50-ae6d-bd24c3434609}</Project>
+      <Name>Core.Common.Base</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\src\Ringtoets.Common.Data\Ringtoets.Common.Data.csproj">
+      <Project>{D4200F43-3F72-4F42-AF0A-8CED416A38EC}</Project>
+      <Name>Ringtoets.Common.Data</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
\ No newline at end of file
Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/packages.config
===================================================================
diff -u
--- Ringtoets/Common/test/Ringtoets.Common.Data.Test/packages.config	(revision 0)
+++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/packages.config	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit" version="2.6.4" targetFramework="net40" />
+  <package id="RhinoMocks" version="3.6.1" targetFramework="net40" />
+</packages>
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSectionBase.cs
===================================================================
diff -u -r6fc99be8198e5795ca4be54719dab3d1be3c6299 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSectionBase.cs	(.../AssessmentSectionBase.cs)	(revision 6fc99be8198e5795ca4be54719dab3d1be3c6299)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSectionBase.cs	(.../AssessmentSectionBase.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -4,6 +4,7 @@
 
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Placeholder;
+using Ringtoets.Integration.Data.Contribution;
 using Ringtoets.Integration.Data.Properties;
 
 namespace Ringtoets.Integration.Data
@@ -20,7 +21,6 @@
         {
             Name = "";
             ReferenceLine = new InputPlaceholder(Resources.ReferenceLine_DisplayName);
-            FailureMechanismContribution = new FailureMechanismContribution(3000);
             HydraulicBoundaryDatabase = new InputPlaceholder(Resources.HydraulicBoundaryDatabase_DisplayName);
         }
 
@@ -37,7 +37,7 @@
         /// <summary>
         /// Gets or sets the contribution of each failure mechanism available in this assessment section.
         /// </summary>
-        public FailureMechanismContribution FailureMechanismContribution { get; private set; }
+        public FailureMechanismContribution FailureMechanismContribution { get; protected set; }
 
         /// <summary>
         /// Gets or sets the hydraulic boundary database.
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Contribution/FailureMechanismContribution.cs
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Contribution/FailureMechanismContribution.cs	(revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Contribution/FailureMechanismContribution.cs	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -0,0 +1,98 @@
+using System;
+using System.Collections.Generic;
+using Core.Common.Base;
+using Core.Common.Utils.Collections;
+using Ringtoets.Common.Data;
+using Ringtoets.Integration.Data.Properties;
+
+namespace Ringtoets.Integration.Data.Contribution
+{
+    /// <summary>
+    /// This class represents the distribution of contribution for all failure mechanism.
+    /// </summary>
+    public class FailureMechanismContribution : Observable
+    {
+        private readonly ICollection<FailureMechanismContributionItem> distribution = new List<FailureMechanismContributionItem>();
+        private int norm;
+
+        /// <summary>
+        /// Creates a new instance of <see cref="FailureMechanismContribution"/>. Values are taken from the 
+        /// <paramref name="failureMechanisms"/> and one item is added with a value of <paramref name="otherContribution"/>
+        /// which represents the contribution of any other failure mechanisms.
+        /// </summary>
+        /// <param name="failureMechanisms">The <see cref="IEnumerable{T}"/> of <see cref="IFailureMechanism"/> on which to base
+        /// the <see cref="FailureMechanismContribution"/>.</param>
+        /// <param name="otherContribution">The collective contribution for other failure mechanisms.</param>
+        /// <param name="norm">The norm defined on a assessment section.</param>
+        /// <exception cref="ArgumentException">Thrown when:
+        /// <list type="bullet">
+        /// <item>any of the <paramref name="failureMechanisms"/> has a value for <see cref="IFailureMechanism.Contribution"/> not in interval [0,100].</item>
+        /// <item>the value of <paramref name="otherContribution"/> is not in interval [0,100]</item>
+        /// </list>
+        /// </exception>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanisms"/> is <c>null</c>.</exception>
+        public FailureMechanismContribution(IEnumerable<IFailureMechanism> failureMechanisms, double otherContribution, int norm)
+        {
+            if (failureMechanisms == null)
+            {
+                throw new ArgumentNullException("failureMechanisms", Resources.FailureMechanismContribution_FailureMechanismContribution_Can_not_create_FailureMechanismContribution_without_FailureMechanism_collection);
+            }
+            this.norm = norm;
+            failureMechanisms.ForEach(AddContributionItem);
+            AddOtherContributionItem(otherContribution);
+        }
+
+        /// <summary>
+        /// Gets or sets the norm which has been defined on the assessment section.
+        /// </summary>
+        public int Norm
+        {
+            get
+            {
+                return norm;
+            }
+            set
+            {
+                norm = value;
+                distribution.ForEach(d => d.Norm = norm);
+            }
+        }
+
+        /// <summary>
+        /// Gets the distribution of failure mechanism contributions.
+        /// </summary>
+        public IEnumerable<FailureMechanismContributionItem> Distribution
+        {
+            get
+            {
+                return distribution;
+            }
+        }
+
+        /// <summary>
+        /// Adds a <see cref="FailureMechanismContributionItem"/> based on <paramref name="failureMechanism"/>.
+        /// </summary>
+        /// <param name="failureMechanism">The <see cref="IFailureMechanism"/> to add a <see cref="FailureMechanismContributionItem"/> for.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/> is <c>null</c>.</exception>
+        private void AddContributionItem(IFailureMechanism failureMechanism)
+        {
+            distribution.Add(new FailureMechanismContributionItem(failureMechanism, norm));
+        }
+
+        /// <summary>
+        /// Adds a <see cref="FailureMechanismContributionItem"/> representing all other failure mechanisms not in the failure mechanism
+        /// list supported within Ringtoets.
+        /// </summary>
+        /// <param name="otherContribution">The contribution to set for other failure mechanisms.</param>
+        /// <exception cref="ArgumentException">Thrown when <paramref name="otherContribution"/> is not in interval [0,100]</exception>
+        private void AddOtherContributionItem(double otherContribution)
+        {
+            var otherFailureMechanism = new OtherFailureMechanism
+            {
+                Contribution = otherContribution
+            };
+            var otherContributionItem = new FailureMechanismContributionItem(otherFailureMechanism, norm);
+            distribution.Add(otherContributionItem);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Contribution/FailureMechanismContributionItem.cs
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Contribution/FailureMechanismContributionItem.cs	(revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Contribution/FailureMechanismContributionItem.cs	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -0,0 +1,57 @@
+using System;
+using Ringtoets.Common.Data;
+using Ringtoets.Integration.Data.Properties;
+
+namespace Ringtoets.Integration.Data.Contribution
+{
+    /// <summary>
+    /// This class represents an amount for which a failure mechanism will contribute to the 
+    /// overall verdict of a dike section.
+    /// </summary>
+    public class FailureMechanismContributionItem
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="FailureMechanismContributionItem"/>. With
+        /// <see cref="Assessment"/>, <see cref="Contribution"/> and <see cref="Norm"/> set.
+        /// </summary>
+        /// <param name="failureMechanism">The <see cref="IFailureMechanism"/> for which the contribution is defined.</param>
+        /// <param name="norm">The norm used to calculate the probability space.</param>
+        /// <exception cref="ArgumentNullException">Thrown when <paramref name="failureMechanism"/> is <c>null</c>.</exception>
+        public FailureMechanismContributionItem(IFailureMechanism failureMechanism, int norm)
+        {
+            if (failureMechanism == null)
+            {
+                throw new ArgumentNullException("failureMechanism", Resources.FailureMechanismContributionItem_Can_not_create_contribution_item_without_failure_mechanism);
+            }
+            Assessment = failureMechanism.Name;
+            Contribution = failureMechanism.Contribution;
+            Norm = norm;
+        }
+
+        /// <summary>
+        /// Gets the name of the assessment for which to configure the <see cref="FailureMechanismContribution"/>.
+        /// </summary>
+        public string Assessment { get; private set; }
+
+        /// <summary>
+        /// Gets the amount of contribution as a percentage.
+        /// </summary>
+        public double Contribution { get; private set; }
+
+        /// <summary>
+        /// Gets the probability space per year for the <see cref="FailureMechanismContribution"/>.
+        /// </summary>
+        public double ProbabilitySpace
+        {
+            get
+            {
+                return (Norm / Contribution) * 100;
+            }
+        }
+
+        /// <summary>
+        /// Gets or sets the norm of the complete dike section.
+        /// </summary>
+        internal double Norm { private get; set; }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Contribution/OtherFailureMechanism.cs
===================================================================
diff -u
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Contribution/OtherFailureMechanism.cs	(revision 0)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Contribution/OtherFailureMechanism.cs	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -0,0 +1,21 @@
+using System;
+using Ringtoets.Common.Data;
+using Ringtoets.Integration.Data.Properties;
+
+namespace Ringtoets.Integration.Data.Contribution
+{
+    /// <summary>
+    /// This class represents a failure mechanism which has no representative within Ringtoets but 
+    /// contributes to the overall verdict nonetheless.
+    /// </summary>
+    public class OtherFailureMechanism : BaseFailureMechanism
+    {
+        /// <summary>
+        /// Creates a new instance of <see cref="OtherFailureMechanism"/>.
+        /// </summary>
+        public OtherFailureMechanism()
+        {
+            Name = Resources.OtherFailureMechanism_DisplayName;
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/DikeAssessmentSection.cs
===================================================================
diff -u -r8ed458d0460c2bab956a7c3a75c2cdb5c1aae3e6 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/DikeAssessmentSection.cs	(.../DikeAssessmentSection.cs)	(revision 8ed458d0460c2bab956a7c3a75c2cdb5c1aae3e6)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/DikeAssessmentSection.cs	(.../DikeAssessmentSection.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -1,5 +1,6 @@
 using System.Collections.Generic;
 using Ringtoets.Common.Data;
+using Ringtoets.Integration.Data.Contribution;
 using Ringtoets.Integration.Data.Placeholders;
 using Ringtoets.Integration.Data.Properties;
 using Ringtoets.Piping.Data;
@@ -9,7 +10,7 @@
     /// <summary>
     /// The dike-based section to be assessed by the user for safety in regards of various failure mechanisms.
     /// </summary>
-    public class DikeAssessmentSection : AssessmentSectionBase
+    public sealed class DikeAssessmentSection : AssessmentSectionBase
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="DikeAssessmentSection"/> class.
@@ -18,15 +19,44 @@
         {
             Name = Resources.DikeAssessmentSection_DisplayName;
 
-            PipingFailureMechanism = new PipingFailureMechanism();
-            GrassErosionFailureMechanism = new FailureMechanismPlaceholder(Resources.GrassErosionFailureMechanism_DisplayName);
-            MacrostabilityInwardFailureMechanism = new FailureMechanismPlaceholder(Resources.MacrostabilityInwardFailureMechanism_DisplayName);
-            OvertoppingFailureMechanism = new FailureMechanismPlaceholder(Resources.OvertoppingFailureMechanism_DisplayName);
-            ClosingFailureMechanism = new FailureMechanismPlaceholder(Resources.ClosingFailureMechanism_DisplayName);
-            FailingOfConstructionFailureMechanism = new FailureMechanismPlaceholder(Resources.FailingOfConstructionFailureMechanism_DisplayName);
-            StoneRevetmentFailureMechanism = new FailureMechanismPlaceholder(Resources.StoneRevetmentFailureMechanism_DisplayName);
-            AsphaltRevetmentFailureMechanism = new FailureMechanismPlaceholder(Resources.AsphaltRevetmentFailureMechanism_DisplayName);
-            GrassRevetmentFailureMechanism = new FailureMechanismPlaceholder(Resources.GrassRevetmentFailureMechanism_DisplayName);
+            PipingFailureMechanism = new PipingFailureMechanism
+            {
+                Contribution = 24
+            };
+            GrassErosionFailureMechanism = new FailureMechanismPlaceholder(Resources.GrassErosionFailureMechanism_DisplayName)
+            {
+                Contribution = 24
+            };
+            MacrostabilityInwardFailureMechanism = new FailureMechanismPlaceholder(Resources.MacrostabilityInwardFailureMechanism_DisplayName)
+            {
+                Contribution = 4
+            };
+            OvertoppingFailureMechanism = new FailureMechanismPlaceholder(Resources.OvertoppingFailureMechanism_DisplayName)
+            {
+                Contribution = 2
+            };
+            ClosingFailureMechanism = new FailureMechanismPlaceholder(Resources.ClosingFailureMechanism_DisplayName)
+            {
+                Contribution = 4
+            };
+            FailingOfConstructionFailureMechanism = new FailureMechanismPlaceholder(Resources.FailingOfConstructionFailureMechanism_DisplayName)
+            {
+                Contribution = 2
+            };
+            StoneRevetmentFailureMechanism = new FailureMechanismPlaceholder(Resources.StoneRevetmentFailureMechanism_DisplayName)
+            {
+                Contribution = 4
+            };
+            AsphaltRevetmentFailureMechanism = new FailureMechanismPlaceholder(Resources.AsphaltRevetmentFailureMechanism_DisplayName)
+            {
+                Contribution = 3
+            };
+            GrassRevetmentFailureMechanism = new FailureMechanismPlaceholder(Resources.GrassRevetmentFailureMechanism_DisplayName)
+            {
+                Contribution = 3
+            };
+
+            FailureMechanismContribution = new FailureMechanismContribution(GetFailureMechanisms(), 30, 3000);
         }
 
         /// <summary>
@@ -83,7 +113,7 @@
             yield return ClosingFailureMechanism;
             yield return FailingOfConstructionFailureMechanism;
             yield return StoneRevetmentFailureMechanism;
-            yield return AsphaltRevetmentFailureMechanism;
+            yield return AsphaltRevetmentFailureMechanism; 
             yield return GrassRevetmentFailureMechanism;
         }
     }
Fisheye: Tag 75aa4fefacf584d5172dc3bdffd348b0aacb05a4 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Data/FailureMechanismContribution.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 75aa4fefacf584d5172dc3bdffd348b0aacb05a4 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Data/FailureMechanismContributionItem.cs'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Placeholders/FailureMechanismPlaceholder.cs
===================================================================
diff -u -rf11bebcc0a2f2356ef04653812d383b270929888 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Placeholders/FailureMechanismPlaceholder.cs	(.../FailureMechanismPlaceholder.cs)	(revision f11bebcc0a2f2356ef04653812d383b270929888)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Placeholders/FailureMechanismPlaceholder.cs	(.../FailureMechanismPlaceholder.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -1,6 +1,5 @@
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Placeholder;
-
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
 namespace Ringtoets.Integration.Data.Placeholders
@@ -41,5 +40,7 @@
         /// Gets the calculation results for this failure mechanism.
         /// </summary>
         public OutputPlaceholder AssessmentResult { get; private set; }
+
+        public double Contribution { get; set; }
     }
 }
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -r5600bdc79b866be64b1c51026ce5f13c1f1c9226 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 5600bdc79b866be64b1c51026ce5f13c1f1c9226)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -124,15 +124,26 @@
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to Overig.
+        ///   Looks up a localized string similar to Kan geen bijdrageoverzicht maken zonder faalmechanismen..
         /// </summary>
-        public static string FailureMechanismContribution_FailureMechanismContribution_Other {
+        public static string FailureMechanismContribution_FailureMechanismContribution_Can_not_create_FailureMechanismContribution_without_FailureMechanism_collection {
             get {
-                return ResourceManager.GetString("FailureMechanismContribution_FailureMechanismContribution_Other", resourceCulture);
+                return ResourceManager.GetString("FailureMechanismContribution_FailureMechanismContribution_Can_not_create_FailureM" +
+                        "echanismContribution_without_FailureMechanism_collection", resourceCulture);
             }
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Kan geen bijdrage item maken zonder een faalmechanisme..
+        /// </summary>
+        public static string FailureMechanismContributionItem_Can_not_create_contribution_item_without_failure_mechanism {
+            get {
+                return ResourceManager.GetString("FailureMechanismContributionItem_Can_not_create_contribution_item_without_failure" +
+                        "_mechanism", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Dijken - Graserosie kruin en binnentalud.
         /// </summary>
         public static string GrassErosionFailureMechanism_DisplayName {
@@ -169,6 +180,15 @@
         }
         
         /// <summary>
+        ///   Looks up a localized string similar to Overig.
+        /// </summary>
+        public static string OtherFailureMechanism_DisplayName {
+            get {
+                return ResourceManager.GetString("OtherFailureMechanism_DisplayName", resourceCulture);
+            }
+        }
+        
+        /// <summary>
         ///   Looks up a localized string similar to Kunstwerken - Overslag en overloop.
         /// </summary>
         public static string OvertoppingFailureMechanism_DisplayName {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx
===================================================================
diff -u -r5600bdc79b866be64b1c51026ce5f13c1f1c9226 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx	(.../Resources.resx)	(revision 5600bdc79b866be64b1c51026ce5f13c1f1c9226)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx	(.../Resources.resx)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -159,7 +159,13 @@
   <data name="GrassRevetmentFailureMechanism_DisplayName" xml:space="preserve">
     <value>Dijken - Grasbekledingen</value>
   </data>
-  <data name="FailureMechanismContribution_FailureMechanismContribution_Other" xml:space="preserve">
+  <data name="OtherFailureMechanism_DisplayName" xml:space="preserve">
     <value>Overig</value>
   </data>
+  <data name="FailureMechanismContributionItem_Can_not_create_contribution_item_without_failure_mechanism" xml:space="preserve">
+    <value>Kan geen bijdrage item maken zonder een faalmechanisme.</value>
+  </data>
+  <data name="FailureMechanismContribution_FailureMechanismContribution_Can_not_create_FailureMechanismContribution_without_FailureMechanism_collection" xml:space="preserve">
+    <value>Kan geen bijdrageoverzicht maken zonder faalmechanismen.</value>
+  </data>
 </root>
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Ringtoets.Integration.Data.csproj
===================================================================
diff -u -r3f1a2b8718a744b49b160c89df46dee6b7fb5fdd -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Ringtoets.Integration.Data.csproj	(.../Ringtoets.Integration.Data.csproj)	(revision 3f1a2b8718a744b49b160c89df46dee6b7fb5fdd)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Ringtoets.Integration.Data.csproj	(.../Ringtoets.Integration.Data.csproj)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -40,11 +40,12 @@
     <Compile Include="..\..\..\..\Core\Common\src\Core.Common.Version\GlobalAssembly.cs">
       <Link>Properties\GlobalAssembly.cs</Link>
     </Compile>
-    <Compile Include="FailureMechanismContribution.cs" />
-    <Compile Include="FailureMechanismContributionItem.cs" />
+    <Compile Include="Contribution\FailureMechanismContribution.cs" />
+    <Compile Include="Contribution\FailureMechanismContributionItem.cs" />
     <Compile Include="AssessmentSectionBase.cs" />
     <Compile Include="DikeAssessmentSection.cs" />
     <Compile Include="DuneAssessmentSection.cs" />
+    <Compile Include="Contribution\OtherFailureMechanism.cs" />
     <Compile Include="Placeholders\FailureMechanismPlaceholder.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/FailureMechanismContributionNodePresenter.cs
===================================================================
diff -u -r0a222f4f3c0054ec9cc70f94480c0dc504fea411 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/FailureMechanismContributionNodePresenter.cs	(.../FailureMechanismContributionNodePresenter.cs)	(revision 0a222f4f3c0054ec9cc70f94480c0dc504fea411)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/NodePresenters/FailureMechanismContributionNodePresenter.cs	(.../FailureMechanismContributionNodePresenter.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -3,6 +3,7 @@
 using Core.Common.Gui;
 using Ringtoets.Common.Forms.NodePresenters;
 using Ringtoets.Integration.Data;
+using Ringtoets.Integration.Data.Contribution;
 using Ringtoets.Integration.Forms.Properties;
 
 namespace Ringtoets.Integration.Forms.NodePresenters
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.Designer.cs
===================================================================
diff -u -r5600bdc79b866be64b1c51026ce5f13c1f1c9226 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.Designer.cs	(.../FailureMechanismContributionView.Designer.cs)	(revision 5600bdc79b866be64b1c51026ce5f13c1f1c9226)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.Designer.cs	(.../FailureMechanismContributionView.Designer.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -54,12 +54,16 @@
             // 
             // probabilityDistributionGrid
             // 
+            this.probabilityDistributionGrid.AllowUserToResizeColumns = false;
+            this.probabilityDistributionGrid.AllowUserToResizeRows = false;
             resources.ApplyResources(this.probabilityDistributionGrid, "probabilityDistributionGrid");
             this.probabilityDistributionGrid.ColumnHeadersHeightSizeMode = System.Windows.Forms.DataGridViewColumnHeadersHeightSizeMode.AutoSize;
             this.tableLayoutPanel.SetColumnSpan(this.probabilityDistributionGrid, 3);
             this.probabilityDistributionGrid.Name = "probabilityDistributionGrid";
             this.probabilityDistributionGrid.ReadOnly = true;
             this.probabilityDistributionGrid.RowHeadersVisible = false;
+            this.probabilityDistributionGrid.SelectionMode = System.Windows.Forms.DataGridViewSelectionMode.FullRowSelect;
+            this.probabilityDistributionGrid.TabStop = false;
             // 
             // normInput
             // 
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs
===================================================================
diff -u -rffe7599d814964e179f97e33e4c3713b8ea869f8 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs	(.../FailureMechanismContributionView.cs)	(revision ffe7599d814964e179f97e33e4c3713b8ea869f8)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.cs	(.../FailureMechanismContributionView.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -3,7 +3,10 @@
 using System.Windows.Forms;
 using Core.Common.Base;
 using Core.Common.Controls;
+using Core.Common.Gui.Properties;
+using Core.Common.Utils.Reflection;
 using Ringtoets.Integration.Data;
+using Ringtoets.Integration.Data.Contribution;
 
 namespace Ringtoets.Integration.Forms.Views
 {
@@ -105,27 +108,31 @@
 
         private void InitializeGridColumns()
         {
+            var assessmentName = TypeUtils.GetMemberName<FailureMechanismContributionItem>(e => e.Assessment);
+            var columnNameFormat = "column_{0}";
             var assessmentColumn = new DataGridViewTextBoxColumn
             {
-                DataPropertyName = "Assessment",
-                HeaderText = "Toetsspoor",
-                Name = "column_Assessment",
+                DataPropertyName = assessmentName,
+                HeaderText = Resources.FailureMechanismContributionView_GridColumn_Assessment,
+                Name = string.Format(columnNameFormat, assessmentName),
                 AutoSizeMode = DataGridViewAutoSizeColumnMode.AllCellsExceptHeader
             };
 
+            var contributionName = TypeUtils.GetMemberName<FailureMechanismContributionItem>(e => e.Contribution);
             var probabilityColumn = new DataGridViewTextBoxColumn
             {
-                DataPropertyName = "Probability",
-                HeaderText = "Toegestane bijdrage aan faalkans [%]",
-                Name = "column_Probability",
+                DataPropertyName = contributionName,
+                HeaderText = Resources.FailureMechanismContributionView_GridColumn_Contribution,
+                Name = string.Format(columnNameFormat, contributionName),
                 AutoSizeMode = DataGridViewAutoSizeColumnMode.ColumnHeader
             };
 
+            var probabilitySpaceName = TypeUtils.GetMemberName<FailureMechanismContributionItem>(e => e.ProbabilitySpace);
             var probabilityPerYearColumn = new DataGridViewTextBoxColumn
             {
-                DataPropertyName = "ProbabilityPerYear",
-                HeaderText = "Faalkansruimte (per jaar)",
-                Name = "column_ProbabilityPerYear",
+                DataPropertyName = probabilitySpaceName,
+                HeaderText = Resources.FailureMechanismContributionView_GridColumn_ProbabilitySpace,
+                Name = string.Format(columnNameFormat, probabilitySpaceName),
                 AutoSizeMode = DataGridViewAutoSizeColumnMode.Fill
             };
 
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.resx
===================================================================
diff -u -r5600bdc79b866be64b1c51026ce5f13c1f1c9226 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.resx	(.../FailureMechanismContributionView.resx)	(revision 5600bdc79b866be64b1c51026ce5f13c1f1c9226)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/FailureMechanismContributionView.resx	(.../FailureMechanismContributionView.resx)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -153,18 +153,6 @@
   <data name="probabilityDistributionGrid.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
     <value>Top, Bottom, Left, Right</value>
   </data>
-  <data name="normInput.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Left, Right</value>
-  </data>
-  <data name="normInput.Location" type="System.Drawing.Point, System.Drawing">
-    <value>68, 3</value>
-  </data>
-  <data name="normInput.Size" type="System.Drawing.Size, System.Drawing">
-    <value>74, 20</value>
-  </data>
-  <data name="normInput.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
   <data name="&gt;&gt;normInput.Name" xml:space="preserve">
     <value>normInput</value>
   </data>
@@ -177,27 +165,6 @@
   <data name="&gt;&gt;normInput.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="perYearLabel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Bottom, Left</value>
-  </data>
-  <data name="perYearLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="perYearLabel.Location" type="System.Drawing.Point, System.Drawing">
-    <value>148, 0</value>
-  </data>
-  <data name="perYearLabel.Size" type="System.Drawing.Size, System.Drawing">
-    <value>50, 26</value>
-  </data>
-  <data name="perYearLabel.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="perYearLabel.Text" xml:space="preserve">
-    <value>per jaar</value>
-  </data>
-  <data name="perYearLabel.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
-    <value>MiddleLeft</value>
-  </data>
   <data name="&gt;&gt;perYearLabel.Name" xml:space="preserve">
     <value>perYearLabel</value>
   </data>
@@ -244,7 +211,7 @@
     <value>206, 139</value>
   </data>
   <data name="probabilityDistributionGrid.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
+    <value>1</value>
   </data>
   <data name="&gt;&gt;probabilityDistributionGrid.Name" xml:space="preserve">
     <value>probabilityDistributionGrid</value>
@@ -258,6 +225,63 @@
   <data name="&gt;&gt;probabilityDistributionGrid.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="normInput.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="normInput.Location" type="System.Drawing.Point, System.Drawing">
+    <value>68, 3</value>
+  </data>
+  <data name="normInput.Size" type="System.Drawing.Size, System.Drawing">
+    <value>74, 20</value>
+  </data>
+  <data name="normInput.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;normInput.Name" xml:space="preserve">
+    <value>normInput</value>
+  </data>
+  <data name="&gt;&gt;normInput.Type" xml:space="preserve">
+    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;normInput.Parent" xml:space="preserve">
+    <value>tableLayoutPanel</value>
+  </data>
+  <data name="&gt;&gt;normInput.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="perYearLabel.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Left</value>
+  </data>
+  <data name="perYearLabel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="perYearLabel.Location" type="System.Drawing.Point, System.Drawing">
+    <value>148, 0</value>
+  </data>
+  <data name="perYearLabel.Size" type="System.Drawing.Size, System.Drawing">
+    <value>50, 26</value>
+  </data>
+  <data name="perYearLabel.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="perYearLabel.Text" xml:space="preserve">
+    <value>per jaar</value>
+  </data>
+  <data name="perYearLabel.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleLeft</value>
+  </data>
+  <data name="&gt;&gt;perYearLabel.Name" xml:space="preserve">
+    <value>perYearLabel</value>
+  </data>
+  <data name="&gt;&gt;perYearLabel.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;perYearLabel.Parent" xml:space="preserve">
+    <value>tableLayoutPanel</value>
+  </data>
+  <data name="&gt;&gt;perYearLabel.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs
===================================================================
diff -u -r2ea5055c818880a8c2e03f74e2f4e19a427fbb8e -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 2ea5055c818880a8c2e03f74e2f4e19a427fbb8e)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsGuiPlugin.cs	(.../RingtoetsGuiPlugin.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -8,6 +8,7 @@
 
 using Ringtoets.Common.Forms.NodePresenters;
 using Ringtoets.Integration.Data;
+using Ringtoets.Integration.Data.Contribution;
 using Ringtoets.Integration.Data.Properties;
 using Ringtoets.Integration.Forms.NodePresenters;
 using Ringtoets.Integration.Forms.PropertyClasses;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Contribution/FailureMechanismContributionItemTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Contribution/FailureMechanismContributionItemTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Contribution/FailureMechanismContributionItemTest.cs	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -0,0 +1,86 @@
+using System;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data;
+using Ringtoets.Integration.Data.Contribution;
+using Ringtoets.Integration.Data.Properties;
+
+namespace Ringtoets.Integration.Data.Test.Contribution
+{
+    [TestFixture]
+    public class FailureMechanismContributionItemTest
+    {
+        private MockRepository mockRepository;
+
+        [SetUp]
+        public void SetUp()
+        {
+            mockRepository = new MockRepository();
+        }
+
+        [Test]
+        public void Constructor_WithoutFailureMechanism_ThrowsArgumentNullException()
+        {
+            // Setup
+
+            // Call
+            TestDelegate test = () => new FailureMechanismContributionItem(null, new Random(21).Next());
+
+            // Assert
+            var message = Assert.Throws<ArgumentNullException>(test).Message;
+            StringAssert.StartsWith(Resources.FailureMechanismContributionItem_Can_not_create_contribution_item_without_failure_mechanism, message);
+            StringAssert.EndsWith("failureMechanism", message);
+        }
+
+        [Test]
+        public void Constructor_WithFailureMechanism_SetProperties()
+        {
+            // Setup
+            string name = "SomeName";
+            double contribution = new Random(21).NextDouble();
+
+            var failureMechanism = mockRepository.StrictMock<IFailureMechanism>();
+
+            failureMechanism.Expect(fm => fm.Name).Return(name);
+            failureMechanism.Expect(fm => fm.Contribution).Return(contribution);
+
+            mockRepository.ReplayAll();
+
+            // Call
+            var result = new FailureMechanismContributionItem(failureMechanism, new Random(21).Next());
+
+            // Assert
+            Assert.AreEqual(name,result.Assessment);
+            Assert.AreEqual(contribution,result.Contribution);
+
+            mockRepository.VerifyAll();
+        }
+
+        [Test]
+        [TestCase(20, 2000, 10000)]
+        [TestCase(3, 100, 10000/3.0)]
+        [TestCase(25.5, 2550, 10000)]
+        public void ProbabilitySpace_DifferentContributionAndNorm_ReturnsExpectedValue(double contribution, int norm, double expectedResult)
+        {
+            // Setup
+            string name = "SomeName";
+
+            var failureMechanism = mockRepository.StrictMock<IFailureMechanism>();
+
+            failureMechanism.Expect(fm => fm.Name).Return(name);
+            failureMechanism.Expect(fm => fm.Contribution).Return(contribution);
+
+            mockRepository.ReplayAll();
+
+            var contributionItem = new FailureMechanismContributionItem(failureMechanism, norm);
+
+            // Call
+            var result = contributionItem.ProbabilitySpace;
+
+            // Assert
+            Assert.AreEqual(expectedResult, result, double.Epsilon);
+
+            mockRepository.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Contribution/FailureMechanismContributionTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Contribution/FailureMechanismContributionTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Contribution/FailureMechanismContributionTest.cs	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -0,0 +1,138 @@
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using NUnit.Framework;
+using Rhino.Mocks;
+using Ringtoets.Common.Data;
+using Ringtoets.Integration.Data.Contribution;
+using Ringtoets.Integration.Data.Properties;
+
+namespace Ringtoets.Integration.Data.Test.Contribution
+{
+    [TestFixture]
+    public class FailureMechanismContributionTest
+    {
+        private MockRepository mockRepository;
+
+        [SetUp]
+        public void SetUp()
+        {
+            mockRepository = new MockRepository();
+        }
+
+        [Test]
+        public void Constructor_WithNullFailureMechanisms_ThrowsArgumentNullException()
+        {
+            // Setup
+            var random = new Random(21);
+
+            // Call
+            TestDelegate test = () => new FailureMechanismContribution(null, random.NextDouble(), random.Next());
+
+            // Assert
+            var message = Assert.Throws<ArgumentNullException>(test).Message;
+            StringAssert.StartsWith(Resources.FailureMechanismContribution_FailureMechanismContribution_Can_not_create_FailureMechanismContribution_without_FailureMechanism_collection, message);
+            StringAssert.EndsWith("failureMechanisms", message);
+        }
+
+        [Test]
+        public void Constructor_WithNullFailureMechanism_ThrowsArgumentNullException()
+        {
+            // Setup
+            var random = new Random(21);
+
+            // Call
+            TestDelegate test = () => new FailureMechanismContribution(new IFailureMechanism[]{null}, random.NextDouble(), random.Next());
+
+            // Assert
+            var message = Assert.Throws<ArgumentNullException>(test).Message;
+            StringAssert.StartsWith(Resources.FailureMechanismContributionItem_Can_not_create_contribution_item_without_failure_mechanism, message);
+            StringAssert.EndsWith("failureMechanism", message);
+        }
+
+        [Test]
+        [TestCase(-10)]
+        [TestCase(-1e-6)]
+        [TestCase(100+1e-6)]
+        [TestCase(150)]
+        public void Constructor_OtherContributionOutside0To100_ArgumentException(double contribution)
+        {
+            // Setup
+            var random = new Random(21);
+
+            // Call
+            TestDelegate test = () => new FailureMechanismContribution(new IFailureMechanism[] { }, contribution, random.Next());
+
+            // Assert
+            var message = Assert.Throws<ArgumentException>(test).Message;
+            StringAssert.StartsWith(Common.Data.Properties.Resources.FailureMechanism_Contribution_Value_should_be_in_interval_0_100, message);
+            StringAssert.EndsWith("value", message);
+        }
+
+        [Test]
+        public void Constructor_EmptyFailureMechanisms_OnlyOtherFailureMechanismAdded()
+        {
+            // Setup
+            var random = new Random(21);
+            var otherContribution = (double)random.Next(0, 100);
+            var norm = random.Next();
+
+            // Call
+            var result =  new FailureMechanismContribution(new IFailureMechanism[] { }, otherContribution, norm);
+            
+            // Assert
+            Assert.AreEqual(1, result.Distribution.Count());
+            Assert.AreEqual(otherContribution, result.Distribution.ElementAt(0).Contribution);
+            Assert.AreEqual((norm / otherContribution) * 100, result.Distribution.ElementAt(0).ProbabilitySpace);
+            Assert.AreEqual(norm, result.Norm);
+        }
+
+        [Test]
+        [TestCase(1)]
+        [TestCase(2)]
+        [TestCase(5)]
+        public void Constructor_OneOrMoreFailureMechanisms_DistributionForFailureMechanismsWithOtherAtEnd(int failureMechanismCount)
+        {
+            // Setup
+            var random = new Random(21);
+            var otherContribution = (double)random.Next(0, 100);
+
+            var failureMechanismNames = new Collection<string>();
+            var failureMechanismContributions = new Collection<double>();
+
+            var failureMechanisms = new Collection<IFailureMechanism>();
+            var namePrefixFormat = "mechanism_{0}";
+
+            for (var i = 0; i < failureMechanismCount; i++)
+            {
+                var name = string.Format(namePrefixFormat, i);
+                var contribution = random.Next(0, 100);
+                var failureMechanism = mockRepository.StrictMock<IFailureMechanism>();
+                failureMechanism.Expect(fm => fm.Name).Return(name);
+                failureMechanism.Expect(fm => fm.Contribution).Return(contribution);
+
+                failureMechanisms.Add(failureMechanism);
+                failureMechanismNames.Add(name);
+                failureMechanismContributions.Add(contribution);
+            }
+
+            failureMechanismNames.Add(Resources.OtherFailureMechanism_DisplayName);
+            failureMechanismContributions.Add(otherContribution);
+
+            mockRepository.ReplayAll();
+            var norm = random.Next();
+
+            // Call
+            var result = new FailureMechanismContribution(failureMechanisms, otherContribution, norm);
+
+            // Assert
+            Assert.AreEqual(failureMechanismCount + 1, result.Distribution.Count());
+
+            CollectionAssert.AreEqual(failureMechanismNames, result.Distribution.Select(d => d.Assessment));
+            CollectionAssert.AreEqual(failureMechanismContributions, result.Distribution.Select(d => d.Contribution));
+            CollectionAssert.AreEqual(failureMechanismContributions.Select(c => (norm / c) * 100), result.Distribution.Select(d => d.ProbabilitySpace));
+
+            mockRepository.VerifyAll();
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Contribution/OtherFailureMechanismTest.cs
===================================================================
diff -u
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Contribution/OtherFailureMechanismTest.cs	(revision 0)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Contribution/OtherFailureMechanismTest.cs	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -0,0 +1,20 @@
+using NUnit.Framework;
+using Ringtoets.Integration.Data.Contribution;
+using Ringtoets.Integration.Data.Properties;
+
+namespace Ringtoets.Integration.Data.Test.Contribution
+{
+    [TestFixture]
+    public class OtherFailureMechanismTest
+    {
+        [Test]
+        public void Constructor_Always_NameSet()
+        {
+            // Call
+            var result = new OtherFailureMechanism();
+
+            // Assert
+            Assert.AreEqual(Resources.OtherFailureMechanism_DisplayName, result.Name);
+        }
+    }
+}
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/DikeAssessmentSectionTest.cs
===================================================================
diff -u -r6fc99be8198e5795ca4be54719dab3d1be3c6299 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/DikeAssessmentSectionTest.cs	(.../DikeAssessmentSectionTest.cs)	(revision 6fc99be8198e5795ca4be54719dab3d1be3c6299)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/DikeAssessmentSectionTest.cs	(.../DikeAssessmentSectionTest.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -3,7 +3,7 @@
 using Core.Common.Base;
 
 using NUnit.Framework;
-
+using Ringtoets.Integration.Data.Contribution;
 using Ringtoets.Piping.Data;
 
 namespace Ringtoets.Integration.Data.Test
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/DuneAssessmentSectionTest.cs
===================================================================
diff -u -r6fc99be8198e5795ca4be54719dab3d1be3c6299 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/DuneAssessmentSectionTest.cs	(.../DuneAssessmentSectionTest.cs)	(revision 6fc99be8198e5795ca4be54719dab3d1be3c6299)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/DuneAssessmentSectionTest.cs	(.../DuneAssessmentSectionTest.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -18,7 +18,7 @@
             // Assert
             Assert.IsInstanceOf<Observable>(section);
             Assert.IsInstanceOf<AssessmentSectionBase>(section);
-            Assert.IsInstanceOf<FailureMechanismContribution>(section.FailureMechanismContribution);
+            Assert.IsNull(section.FailureMechanismContribution);
 
             Assert.AreEqual("Duintraject", section.Name);
             Assert.AreEqual("Referentielijn", section.ReferenceLine.Name);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Placeholders/FailureMechanismPlaceholderTest.cs
===================================================================
diff -u -rbe35a7226351969e98f08dec755809139ce5f081 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Placeholders/FailureMechanismPlaceholderTest.cs	(.../FailureMechanismPlaceholderTest.cs)	(revision be35a7226351969e98f08dec755809139ce5f081)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Placeholders/FailureMechanismPlaceholderTest.cs	(.../FailureMechanismPlaceholderTest.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+using System;
+using NUnit.Framework;
 
 using Ringtoets.Integration.Data.Placeholders;
 
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Ringtoets.Integration.Data.Test.csproj
===================================================================
diff -u -r7a8e3d1718cb12c53c2b0573b056037ed02e9913 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Ringtoets.Integration.Data.Test.csproj	(.../Ringtoets.Integration.Data.Test.csproj)	(revision 7a8e3d1718cb12c53c2b0573b056037ed02e9913)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Ringtoets.Integration.Data.Test.csproj	(.../Ringtoets.Integration.Data.Test.csproj)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -44,13 +44,19 @@
       <HintPath>..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Rhino.Mocks">
+      <HintPath>..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssessmentSectionBaseTest.cs" />
+    <Compile Include="Contribution\OtherFailureMechanismTest.cs" />
     <Compile Include="DikeAssessmentSectionTest.cs" />
     <Compile Include="DuneAssessmentSectionTest.cs" />
+    <Compile Include="Contribution\FailureMechanismContributionItemTest.cs" />
+    <Compile Include="Contribution\FailureMechanismContributionTest.cs" />
     <Compile Include="Placeholders\FailureMechanismPlaceholderTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/packages.config
===================================================================
diff -u -r3aa69a0ff858d591479a1b33ef1ad36ae76a5052 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/packages.config	(.../packages.config)	(revision 3aa69a0ff858d591479a1b33ef1ad36ae76a5052)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/packages.config	(.../packages.config)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -2,4 +2,5 @@
 <packages>
   <package id="log4net" version="2.0.4" targetFramework="net40" />
   <package id="NUnit" version="2.6.4" targetFramework="net40" />
+  <package id="RhinoMocks" version="3.6.1" targetFramework="net40" />
 </packages>
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs
===================================================================
diff -u -rd6e6eadf4a2521df75b6d371bacbb181a43058a3 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs	(.../AssessmentSectionBaseNodePresenterTest.cs)	(revision d6e6eadf4a2521df75b6d371bacbb181a43058a3)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/NodePresenters/AssessmentSectionBaseNodePresenterTest.cs	(.../AssessmentSectionBaseNodePresenterTest.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -74,16 +74,14 @@
 
             var mocks = new MockRepository();
             var projectNode = mocks.Stub<ITreeNode>();
+            var assessmentSection = mocks.Stub<AssessmentSectionBase>();
             var contextMenuBuilderProviderMock = mockRepository.StrictMock<IContextMenuBuilderProvider>();
 
             mocks.ReplayAll();
 
             var nodePresenter = new AssessmentSectionBaseNodePresenter(contextMenuBuilderProviderMock);
 
-            var assessmentSection = new DikeAssessmentSection
-            {
-                Name = projectName
-            };
+            assessmentSection.Name = projectName;
 
             // Call
             nodePresenter.UpdateNode(null, projectNode, assessmentSection);
@@ -95,7 +93,7 @@
         }
 
         [Test]
-        public void GetChildNodeObjects_DataIsDikeAssessmentSection_ReturnDikeInputsAndFailureMechanisms()
+        public void GetChildNodeObjects_DataIsAssessmentSectionBase_ReturnDikeInputsAndFailureMechanisms()
         {
             // Setup
             var mocks = new MockRepository();
@@ -176,6 +174,7 @@
             // Setup
             var mocks = new MockRepository();
             var assessmentSectionObserver = mocks.StrictMock<IObserver>();
+            var assessmentSection = mocks.Stub<AssessmentSectionBase>();
             var contextMenuBuilderProviderMock = mockRepository.StrictMock<IContextMenuBuilderProvider>();
 
             assessmentSectionObserver.Expect(o => o.UpdateObserver());
@@ -184,7 +183,6 @@
 
             var nodePresenter = new AssessmentSectionBaseNodePresenter(contextMenuBuilderProviderMock);
 
-            var assessmentSection = new DikeAssessmentSection();
             assessmentSection.Attach(assessmentSectionObserver);
 
             // Call
@@ -220,7 +218,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<DikeAssessmentSection>();
+            var dataMock = mocks.StrictMock<AssessmentSectionBase>();
             var contextMenuBuilderProviderMock = mockRepository.StrictMock<IContextMenuBuilderProvider>();
 
             mocks.ReplayAll();
@@ -240,7 +238,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<DikeAssessmentSection>();
+            var dataMock = mocks.StrictMock<AssessmentSectionBase>();
             var sourceMock = mocks.StrictMock<ITreeNode>();
             var targetMock = mocks.StrictMock<ITreeNode>();
             var contextMenuBuilderProviderMock = mockRepository.StrictMock<IContextMenuBuilderProvider>();
@@ -262,7 +260,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<DikeAssessmentSection>();
+            var dataMock = mocks.StrictMock<AssessmentSectionBase>();
             var sourceMock = mocks.StrictMock<ITreeNode>();
             var targetMock = mocks.StrictMock<ITreeNode>();
             var contextMenuBuilderProviderMock = mockRepository.StrictMock<IContextMenuBuilderProvider>();
@@ -286,7 +284,7 @@
             var mocks = new MockRepository();
             var dataMock = mocks.StrictMock<object>();
             var dataMockOwner = mocks.StrictMock<object>();
-            var targetMock = mocks.StrictMock<DikeAssessmentSection>();
+            var targetMock = mocks.StrictMock<AssessmentSectionBase>();
             var contextMenuBuilderProviderMock = mockRepository.StrictMock<IContextMenuBuilderProvider>();
 
             mocks.ReplayAll();
@@ -305,7 +303,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<DikeAssessmentSection>();
+            var dataMock = mocks.StrictMock<AssessmentSectionBase>();
             var contextMenuBuilderProviderMock = mockRepository.StrictMock<IContextMenuBuilderProvider>();
 
             mocks.ReplayAll();
@@ -324,7 +322,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<DikeAssessmentSection>();
+            var dataMock = mocks.StrictMock<AssessmentSectionBase>();
             var eventArgsMock = mocks.StrictMock<NotifyCollectionChangingEventArgs>();
             var contextMenuBuilderProviderMock = mockRepository.StrictMock<IContextMenuBuilderProvider>();
 
@@ -344,7 +342,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<DikeAssessmentSection>();
+            var dataMock = mocks.StrictMock<AssessmentSectionBase>();
             var nodeMock = mocks.StrictMock<ITreeNode>();
             var contextMenuBuilderProviderMock = mockRepository.StrictMock<IContextMenuBuilderProvider>();
 
@@ -366,14 +364,13 @@
             // Setup
             var mocks = new MockRepository();
             var observerMock = mocks.StrictMock<IObserver>();
+            var assessmentSection = mocks.Stub<AssessmentSectionBase>();
             var contextMenuBuilderProviderMock = mockRepository.StrictMock<IContextMenuBuilderProvider>();
 
             observerMock.Expect(o => o.UpdateObserver());
 
             mocks.ReplayAll();
 
-            var assessmentSection = new DikeAssessmentSection();
-
             var project = new Project();
             project.Items.Add(assessmentSection);
             project.Attach(observerMock);
@@ -394,7 +391,7 @@
         {
             // Setup
             var mocks = new MockRepository();
-            var dataMock = mocks.StrictMock<DikeAssessmentSection>();
+            var dataMock = mocks.StrictMock<AssessmentSectionBase>();
             var nodeMock = mocks.StrictMock<ITreeNode>();
             var eventArgsMock = mocks.StrictMock<PropertyChangedEventArgs>("");
             var contextMenuBuilderProviderMock = mockRepository.StrictMock<IContextMenuBuilderProvider>();
@@ -417,6 +414,7 @@
             var mocks = new MockRepository();
             var contextMenuBuilderProviderMock = mocks.StrictMock<IContextMenuBuilderProvider>();
             var menuBuilderMock = mocks.StrictMock<IContextMenuBuilder>();
+            var assessmentSection = mocks.Stub<AssessmentSectionBase>();
             var nodeMock = mocks.StrictMock<ITreeNode>();
 
             menuBuilderMock.Expect(mb => mb.AddDeleteItem()).Return(menuBuilderMock);
@@ -437,7 +435,7 @@
             var nodePresenter = new AssessmentSectionBaseNodePresenter(contextMenuBuilderProviderMock);
 
             // Call
-            nodePresenter.GetContextMenu(nodeMock, new DikeAssessmentSection());
+            nodePresenter.GetContextMenu(nodeMock, assessmentSection);
 
             // Assert
             mocks.VerifyAll();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs
===================================================================
diff -u -r9f57710e6e75471cc3d44e55e514c48909b19dc4 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs	(.../FailureMechanismContributionViewTest.cs)	(revision 9f57710e6e75471cc3d44e55e514c48909b19dc4)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs	(.../FailureMechanismContributionViewTest.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -1,10 +1,12 @@
-using System.Windows.Forms;
+using System;
+using System.Windows.Forms;
 using Core.Common.Base;
 using Core.Common.TestUtil;
 using NUnit.Extensions.Forms;
 using NUnit.Framework;
 using Rhino.Mocks;
-using Ringtoets.Integration.Data;
+using Ringtoets.Common.Data;
+using Ringtoets.Integration.Data.Contribution;
 using Ringtoets.Integration.Forms.Views;
 
 namespace Ringtoets.Integration.Forms.Test.Views
@@ -13,20 +15,25 @@
     public class FailureMechanismContributionViewTest
     {
         private MockRepository mockRepository;
+        private FailureMechanismContribution distribution;
 
         [SetUp]
         public void Setup()
         {
             mockRepository = new MockRepository();
+            var random = new Random(21);
+            var norm = random.Next(0, 200000);
+            var otherContribution = random.Next(0,100);
+            var failureMechanism = mockRepository.Stub<IFailureMechanism>();
+            distribution = new FailureMechanismContribution(new[] { failureMechanism }, otherContribution, norm);
         }
 
         [Test]
         public void NormTextBox_Initialize_TextSetToData()
         {
             // Setup
-            var norm = 3000;
+            mockRepository.ReplayAll();
 
-            var distribution = new FailureMechanismContribution(norm);
             var distributionView = new FailureMechanismContributionView
             {
                 Data = distribution
@@ -36,7 +43,7 @@
             var result = distributionView.Controls.Find("normInput", true)[0].Text;
 
             // Assert
-            Assert.AreEqual(norm.ToString(), result);
+            Assert.AreEqual(distribution.Norm.ToString(), result);
         }
 
         [Test]
@@ -48,9 +55,6 @@
 
             mockRepository.ReplayAll();
 
-            var norm = 3000;
-
-            var distribution = new FailureMechanismContribution(norm);
             distribution.Attach(observerMock);
             var distributionView = new FailureMechanismContributionView
             {
@@ -69,9 +73,6 @@
 
             mockRepository.ReplayAll();
 
-            var norm = 3000;
-
-            var distribution = new FailureMechanismContribution(norm);
             distribution.Attach(observerMock);
             var distributionView = new FailureMechanismContributionView
             {
@@ -85,7 +86,7 @@
             var normTester = new ControlTester("normInput");
 
             // Precondition
-            Assert.AreEqual(norm.ToString(), normTester.Text);
+            Assert.AreEqual(distribution.Norm.ToString(), normTester.Text);
 
             // Call
             normTester.Properties.Text = 200.ToString();
Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs
===================================================================
diff -u -r6bcbd610ececdc293a8883b50448f369e1fa4a25 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs	(.../PipingFailureMechanism.cs)	(revision 6bcbd610ececdc293a8883b50448f369e1fa4a25)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanism.cs	(.../PipingFailureMechanism.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -1,19 +1,16 @@
 using System.Collections.Generic;
-
 using Core.Common.Base;
-
 using Ringtoets.Common.Data;
 using Ringtoets.Common.Placeholder;
 using Ringtoets.Piping.Data.Properties;
-
 using RingtoetsCommonDataResources = Ringtoets.Common.Data.Properties.Resources;
 
 namespace Ringtoets.Piping.Data
 {
     /// <summary>
     /// Model for performing piping calculations.
     /// </summary>
-    public class PipingFailureMechanism : Observable, IFailureMechanism
+    public class PipingFailureMechanism : BaseFailureMechanism
     {
         /// <summary>
         /// Initializes a new instance of the <see cref="PipingFailureMechanism"/> class.
@@ -28,6 +25,7 @@
             pipingCalculationGroup.Children.Add(new PipingCalculation());
             CalculationsGroup = pipingCalculationGroup;
             AssessmentResult = new OutputPlaceholder(RingtoetsCommonDataResources.FailureMechanism_AssessmentResult_DisplayName);
+            Name = Resources.PipingFailureMechanism_DisplayName;
         }
 
         /// <summary>
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs
===================================================================
diff -u -r5600bdc79b866be64b1c51026ce5f13c1f1c9226 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs	(.../PipingFailureMechanismNodePresenter.cs)	(revision 5600bdc79b866be64b1c51026ce5f13c1f1c9226)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/NodePresenters/PipingFailureMechanismNodePresenter.cs	(.../PipingFailureMechanismNodePresenter.cs)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -42,7 +42,7 @@
 
         protected override void UpdateNode(ITreeNode parentNode, ITreeNode node, PipingFailureMechanism nodeData)
         {
-            node.Text = PipingDataResources.PipingFailureMechanism_DisplayName;
+            node.Text = nodeData.Name;
             node.Image = PipingFormsResources.PipingIcon;
             node.ForegroundColor = Color.FromKnownColor(KnownColor.ControlText);
         }
Index: packages/repositories.config
===================================================================
diff -u -r9f57710e6e75471cc3d44e55e514c48909b19dc4 -r75aa4fefacf584d5172dc3bdffd348b0aacb05a4
--- packages/repositories.config	(.../repositories.config)	(revision 9f57710e6e75471cc3d44e55e514c48909b19dc4)
+++ packages/repositories.config	(.../repositories.config)	(revision 75aa4fefacf584d5172dc3bdffd348b0aacb05a4)
@@ -12,10 +12,13 @@
   <repository path="..\Core\Common\test\Core.Common.Gui.Swf.Test\packages.config" />
   <repository path="..\Core\Common\test\Core.Common.Gui.Test\packages.config" />
   <repository path="..\Core\Common\test\Core.Common.Gui.TestUtil\packages.config" />
+  <repository path="..\Core\Common\test\Core.Common.Gui.TestUtils\packages.config" />
   <repository path="..\Core\Common\test\Core.Common.Integration.Test\packages.config" />
   <repository path="..\Core\Common\test\Core.Common.Test\packages.config" />
   <repository path="..\Core\Common\test\Core.Common.TestUtil.Test\packages.config" />
   <repository path="..\Core\Common\test\Core.Common.TestUtil\packages.config" />
+  <repository path="..\Core\Common\test\Core.Common.TestUtils.Test\packages.config" />
+  <repository path="..\Core\Common\test\Core.Common.TestUtils\packages.config" />
   <repository path="..\Core\Common\test\Core.Common.Utils.Test\packages.config" />
   <repository path="..\Core\GIS\src\Core.GIS.NetTopologySuite\packages.config" />
   <repository path="..\Core\GIS\src\Core.GIS.SharpMap.Extensions\packages.config" />
@@ -33,6 +36,7 @@
   <repository path="..\Core\Plugins\test\Core.Plugins.CommonTools.Test\packages.config" />
   <repository path="..\Core\Plugins\test\Core.Plugins.ProjectExplorer.Test\packages.config" />
   <repository path="..\Core\Plugins\test\Core.Plugins.SharpMapGis.Test\packages.config" />
+  <repository path="..\Ringtoets.Common.Data.Test\packages.config" />
   <repository path="..\Ringtoets\Common\test\Ringtoets.Common.Forms.Test\packages.config" />
   <repository path="..\Ringtoets\Demo\src\Ringtoets.Demo\packages.config" />
   <repository path="..\Ringtoets\Demo\test\Ringtoets.Demo.Test\packages.config" />