Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -366,6 +366,11 @@
Core.Common.UtilsFalse
+
+ {c6309704-d67b-434c-bc98-9f8910bc1d10}
+ Ringtoets.ClosingStructures.Data
+ False
+ {87c2c553-c0bc-40bf-b1ea-b83bff357f27}Ringtoets.Revetment.Data
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensions.cs
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensions.cs (.../ClosingStructuresFailureMechanismCreateExtensions.cs) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensions.cs (.../ClosingStructuresFailureMechanismCreateExtensions.cs) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -22,8 +22,7 @@
using System;
using System.Collections.Generic;
using Application.Ringtoets.Storage.DbContext;
-using Ringtoets.Integration.Data.StandAlone;
-using Ringtoets.Integration.Data.StandAlone.SectionResults;
+using Ringtoets.ClosingStructures.Data;
namespace Application.Ringtoets.Storage.Create.ClosingStructures
{
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructuresFailureMechanismSectionResultCreateExtensions.cs
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructuresFailureMechanismSectionResultCreateExtensions.cs (.../ClosingStructuresFailureMechanismSectionResultCreateExtensions.cs) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/ClosingStructures/ClosingStructuresFailureMechanismSectionResultCreateExtensions.cs (.../ClosingStructuresFailureMechanismSectionResultCreateExtensions.cs) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -21,7 +21,7 @@
using System;
using Application.Ringtoets.Storage.DbContext;
-using Ringtoets.Integration.Data.StandAlone.SectionResults;
+using Ringtoets.ClosingStructures.Data;
namespace Application.Ringtoets.Storage.Create.ClosingStructures
{
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ClosingStructures/ClosingStructuresSectionResultEntityReadExtensions.cs
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ClosingStructures/ClosingStructuresSectionResultEntityReadExtensions.cs (.../ClosingStructuresSectionResultEntityReadExtensions.cs) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ClosingStructures/ClosingStructuresSectionResultEntityReadExtensions.cs (.../ClosingStructuresSectionResultEntityReadExtensions.cs) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -22,7 +22,7 @@
using System;
using Application.Ringtoets.Storage.DbContext;
using Core.Common.Base.Data;
-using Ringtoets.Integration.Data.StandAlone.SectionResults;
+using Ringtoets.ClosingStructures.Data;
namespace Application.Ringtoets.Storage.Read.ClosingStructures
{
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -29,6 +29,7 @@
using Application.Ringtoets.Storage.Read.Piping;
using Application.Ringtoets.Storage.Read.WaveImpactAsphaltCover;
using Core.Common.Base;
+using Ringtoets.ClosingStructures.Data;
using Ringtoets.Common.Data.Calculation;
using Ringtoets.Common.Data.DikeProfiles;
using Ringtoets.Common.Data.FailureMechanism;
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -222,6 +222,10 @@
{D749EE4C-CE50-4C17-BF01-9A953028C126}Core.Common.TestUtil
+
+ {C6309704-D67B-434C-BC98-9F8910BC1D10}
+ Ringtoets.ClosingStructures.Data
+ {87c2c553-c0bc-40bf-b1ea-b83bff357f27}Ringtoets.Revetment.Data
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs (.../ClosingStructuresFailureMechanismCreateExtensionsTest.cs) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismCreateExtensionsTest.cs (.../ClosingStructuresFailureMechanismCreateExtensionsTest.cs) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -26,7 +26,7 @@
using Application.Ringtoets.Storage.DbContext;
using Application.Ringtoets.Storage.TestUtil;
using NUnit.Framework;
-using Ringtoets.Integration.Data.StandAlone;
+using Ringtoets.ClosingStructures.Data;
namespace Application.Ringtoets.Storage.Test.Create.ClosingStructures
{
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs (.../ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/ClosingStructures/ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs (.../ClosingStructuresFailureMechanismSectionResultCreateExtensionsTest.cs) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -25,7 +25,7 @@
using Application.Ringtoets.Storage.TestUtil;
using Core.Common.Base.Data;
using NUnit.Framework;
-using Ringtoets.Integration.Data.StandAlone.SectionResults;
+using Ringtoets.ClosingStructures.Data;
namespace Application.Ringtoets.Storage.Test.Create.ClosingStructures
{
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -34,6 +34,7 @@
using Core.Common.Gui.Settings;
using Core.Common.TestUtil;
using NUnit.Framework;
+using Ringtoets.ClosingStructures.Data;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.Calculation;
using Ringtoets.Common.Data.DikeProfiles;
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructuresSectionResultEntityReadExtensionsTest.cs
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructuresSectionResultEntityReadExtensionsTest.cs (.../ClosingStructuresSectionResultEntityReadExtensionsTest.cs) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructures/ClosingStructuresSectionResultEntityReadExtensionsTest.cs (.../ClosingStructuresSectionResultEntityReadExtensionsTest.cs) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -25,6 +25,7 @@
using Application.Ringtoets.Storage.Read.ClosingStructures;
using Application.Ringtoets.Storage.TestUtil;
using NUnit.Framework;
+using Ringtoets.ClosingStructures.Data;
using Ringtoets.Integration.Data.StandAlone.SectionResults;
namespace Application.Ringtoets.Storage.Test.Read.ClosingStructures
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Application.Ringtoets.Storage.TestUtil.csproj
===================================================================
diff -u -reec9f1ac3701c6155c49101fcc9649d51ffdc319 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Application.Ringtoets.Storage.TestUtil.csproj (.../Application.Ringtoets.Storage.TestUtil.csproj) (revision eec9f1ac3701c6155c49101fcc9649d51ffdc319)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Application.Ringtoets.Storage.TestUtil.csproj (.../Application.Ringtoets.Storage.TestUtil.csproj) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -78,6 +78,10 @@
{3BBFD65B-B277-4E50-AE6D-BD24C3434609}Core.Common.Base
+
+ {C6309704-D67B-434C-BC98-9F8910BC1D10}
+ Ringtoets.ClosingStructures.Data
+ {87C2C553-C0BC-40BF-B1EA-B83BFF357F27}Ringtoets.Revetment.Data
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -26,6 +26,7 @@
using Core.Common.Base;
using Core.Common.Base.Data;
using Core.Common.Base.Geometry;
+using Ringtoets.ClosingStructures.Data;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.Calculation;
using Ringtoets.Common.Data.DikeProfiles;
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs
===================================================================
diff -u
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs (revision 0)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanism.cs (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -0,0 +1,75 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Collections.Generic;
+using Ringtoets.ClosingStructures.Data.Properties;
+using Ringtoets.Common.Data.Calculation;
+using Ringtoets.Common.Data.FailureMechanism;
+
+namespace Ringtoets.ClosingStructures.Data
+{
+ ///
+ /// Model containing input and output needed to perform different levels of the
+ /// Closing Structures failure mechanism.
+ ///
+ public class ClosingStructuresFailureMechanism : FailureMechanismBase, IHasSectionResults
+ {
+ private readonly List sectionResults;
+
+ ///
+ /// Initializes a new instance of the class.
+ ///
+ public ClosingStructuresFailureMechanism()
+ : base(Resources.ClosingStructuresFailureMechanism_DisplayName, Resources.ClosingStructuresFailureMechanism_Code)
+ {
+ sectionResults = new List();
+ }
+
+ public override IEnumerable Calculations
+ {
+ get
+ {
+ yield break;
+ }
+ }
+
+ public IEnumerable SectionResults
+ {
+ get
+ {
+ return sectionResults;
+ }
+ }
+
+ public override void AddSection(FailureMechanismSection section)
+ {
+ base.AddSection(section);
+
+ sectionResults.Add(new ClosingStructuresFailureMechanismSectionResult(section));
+ }
+
+ public override void ClearAllSections()
+ {
+ base.ClearAllSections();
+ sectionResults.Clear();
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResult.cs
===================================================================
diff -u
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResult.cs (revision 0)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/ClosingStructuresFailureMechanismSectionResult.cs (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -0,0 +1,80 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using Core.Common.Base.Data;
+using Ringtoets.Common.Data.FailureMechanism;
+using Ringtoets.Common.Data.Properties;
+
+namespace Ringtoets.ClosingStructures.Data
+{
+ ///
+ /// This class holds information about the result of a calculation on section level for the
+ /// Closing Structures failure mechanism.
+ ///
+ public class ClosingStructuresFailureMechanismSectionResult : FailureMechanismSectionResult
+ {
+ private double assessmentLayerTwoA;
+
+ ///
+ /// Creates a new instance of .
+ ///
+ /// The for which the
+ /// will hold the result.
+ /// Thrown when is null.
+ public ClosingStructuresFailureMechanismSectionResult(FailureMechanismSection section)
+ : base(section)
+ {
+ AssessmentLayerTwoA = double.NaN;
+ AssessmentLayerThree = (RoundedDouble) double.NaN;
+ }
+
+ ///
+ /// Gets or sets the value representing whether the simple assessment of safety passed.
+ ///
+ public bool AssessmentLayerOne { get; set; }
+
+ ///
+ /// Gets or sets the value for the detailed assessment of safety per failure mechanism section as a probability.
+ ///
+ /// Thrown when is not in range [0,1].
+ public double AssessmentLayerTwoA
+ {
+ get
+ {
+ return assessmentLayerTwoA;
+ }
+ set
+ {
+ if (!double.IsNaN(value) && (value < 0 || value > 1))
+ {
+ throw new ArgumentException(Resources.ArbitraryProbabilityFailureMechanismSectionResult_AssessmentLayerTwoA_Value_needs_to_be_between_0_and_1);
+ }
+ assessmentLayerTwoA = value;
+ }
+ }
+
+ ///
+ /// Gets or sets the value of the tailored assessment of safety.
+ ///
+ public RoundedDouble AssessmentLayerThree { get; set; }
+ }
+}
\ No newline at end of file
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.Designer.cs
===================================================================
diff -u
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.Designer.cs (revision 0)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.Designer.cs (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -0,0 +1,102 @@
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//------------------------------------------------------------------------------
+//
+// This code was generated by a tool.
+// Runtime Version:4.0.30319.42000
+//
+// Changes to this file may cause incorrect behavior and will be lost if
+// the code is regenerated.
+//
+//------------------------------------------------------------------------------
+
+namespace Ringtoets.ClosingStructures.Data.Properties {
+ using System;
+
+
+ ///
+ /// A strongly-typed resource class, for looking up localized strings, etc.
+ ///
+ // This class was auto-generated by the StronglyTypedResourceBuilder
+ // class via a tool like ResGen or Visual Studio.
+ // To add or remove a member, edit your .ResX file then rerun ResGen
+ // with the /str option, or rebuild your VS project.
+ [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+ [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+ [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+ public class Resources {
+
+ private static global::System.Resources.ResourceManager resourceMan;
+
+ private static global::System.Globalization.CultureInfo resourceCulture;
+
+ [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+ internal Resources() {
+ }
+
+ ///
+ /// Returns the cached ResourceManager instance used by this class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ public static global::System.Resources.ResourceManager ResourceManager {
+ get {
+ if (object.ReferenceEquals(resourceMan, null)) {
+ global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("Ringtoets.ClosingStructures.Data.Properties.Resources", typeof(Resources).Assembly);
+ resourceMan = temp;
+ }
+ return resourceMan;
+ }
+ }
+
+ ///
+ /// Overrides the current thread's CurrentUICulture property for all
+ /// resource lookups using this strongly typed resource class.
+ ///
+ [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+ public static global::System.Globalization.CultureInfo Culture {
+ get {
+ return resourceCulture;
+ }
+ set {
+ resourceCulture = value;
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to BSKW.
+ ///
+ public static string ClosingStructuresFailureMechanism_Code {
+ get {
+ return ResourceManager.GetString("ClosingStructuresFailureMechanism_Code", resourceCulture);
+ }
+ }
+
+ ///
+ /// Looks up a localized string similar to Kunstwerken - Betrouwbaarheid sluiting kunstwerk.
+ ///
+ public static string ClosingStructuresFailureMechanism_DisplayName {
+ get {
+ return ResourceManager.GetString("ClosingStructuresFailureMechanism_DisplayName", resourceCulture);
+ }
+ }
+ }
+}
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.resx
===================================================================
diff -u
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.resx (revision 0)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Properties/Resources.resx (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ text/microsoft-resx
+
+
+ 2.0
+
+
+ System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ BSKW
+
+
+ Kunstwerken - Betrouwbaarheid sluiting kunstwerk
+
+
\ No newline at end of file
Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Ringtoets.ClosingStructures.Data.csproj
===================================================================
diff -u -r5b93e866c25c39a178b2fdd6d10b1baf5a05d070 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Ringtoets.ClosingStructures.Data.csproj (.../Ringtoets.ClosingStructures.Data.csproj) (revision 5b93e866c25c39a178b2fdd6d10b1baf5a05d070)
+++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Data/Ringtoets.ClosingStructures.Data.csproj (.../Ringtoets.ClosingStructures.Data.csproj) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -39,13 +39,38 @@
Properties\GlobalAssembly.cs
+
+
+
+ True
+ True
+ Resources.resx
+
Copying.licenseheader
+
+
+ {3bbfd65b-b277-4e50-ae6d-bd24c3434609}
+ Core.Common.Base
+ False
+
+
+ {D4200F43-3F72-4F42-AF0A-8CED416A38EC}
+ Ringtoets.Common.Data
+ False
+
+
+
+
+ PublicResXFileCodeGenerator
+ Resources.Designer.cs
+
+
+
+
+
\ No newline at end of file
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj
===================================================================
diff -u -r5b93e866c25c39a178b2fdd6d10b1baf5a05d070 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj (.../Ringtoets.ClosingStructures.Forms.Test.csproj) (revision 5b93e866c25c39a178b2fdd6d10b1baf5a05d070)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Ringtoets.ClosingStructures.Forms.Test.csproj (.../Ringtoets.ClosingStructures.Forms.Test.csproj) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -37,20 +37,71 @@
none
+
+ ..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll
+ True
+
+
+ ..\..\..\..\lib\NUnitForms.dll
+
+
+ ..\..\..\..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll
+ True
+
+
+
Properties\GlobalAssembly.cs
+
+
Copying.licenseheader
+
+
+
+
+ {3BBFD65B-B277-4E50-AE6D-BD24C3434609}
+ Core.Common.Base
+
+
+ {9a2d67e6-26ac-4d17-b11a-2b4372f2f572}
+ Core.Common.Controls
+
+
+ {F49BD8B2-332A-4C91-A196-8CCE0A2C7D98}
+ Core.Common.Utils
+
+
+ {D4200F43-3F72-4F42-AF0A-8CED416A38EC}
+ Ringtoets.Common.Data
+
+
+ {4D840673-3812-4338-A352-84854E32B8A0}
+ Ringtoets.Common.Forms
+
+
+ {4843D6E5-066F-4795-94F5-1D53932DD03C}
+ Ringtoets.Common.Data.TestUtil
+
+
+ {C6309704-D67B-434C-BC98-9F8910BC1D10}
+ Ringtoets.ClosingStructures.Data
+
+
+ {22E191F2-B2E3-413C-9511-4C2CDEDB2EFF}
+ Ringtoets.ClosingStructures.Forms
+
+
+
+
+
+
\ No newline at end of file
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/Ringtoets.ClosingStructures.Plugin.Test.csproj
===================================================================
diff -u -r5b93e866c25c39a178b2fdd6d10b1baf5a05d070 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/Ringtoets.ClosingStructures.Plugin.Test.csproj (.../Ringtoets.ClosingStructures.Plugin.Test.csproj) (revision 5b93e866c25c39a178b2fdd6d10b1baf5a05d070)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/Ringtoets.ClosingStructures.Plugin.Test.csproj (.../Ringtoets.ClosingStructures.Plugin.Test.csproj) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -37,6 +37,10 @@
none
+
+ ..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll
+ True
+
@@ -50,6 +54,7 @@
Copying.licenseheader
+
+
+
+
\ No newline at end of file
Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/Ringtoets.ClosingStructures.Service.Test.csproj
===================================================================
diff -u -r5b93e866c25c39a178b2fdd6d10b1baf5a05d070 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/Ringtoets.ClosingStructures.Service.Test.csproj (.../Ringtoets.ClosingStructures.Service.Test.csproj) (revision 5b93e866c25c39a178b2fdd6d10b1baf5a05d070)
+++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Service.Test/Ringtoets.ClosingStructures.Service.Test.csproj (.../Ringtoets.ClosingStructures.Service.Test.csproj) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -37,6 +37,10 @@
none
+
+ ..\..\..\..\packages\NUnit.2.6.4\lib\nunit.framework.dll
+ True
+
@@ -50,6 +54,7 @@
Copying.licenseheader
+
+
+
+
\ No newline at end of file
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/AssessmentSection.cs (.../AssessmentSection.cs) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -23,6 +23,7 @@
using System.Collections.Generic;
using Core.Common.Base;
using Core.Common.Base.Geometry;
+using Ringtoets.ClosingStructures.Data;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.Contribution;
using Ringtoets.Common.Data.FailureMechanism;
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -100,24 +100,6 @@
}
///
- /// Looks up a localized string similar to BSKW.
- ///
- public static string ClosingStructuresFailureMechanism_Code {
- get {
- return ResourceManager.GetString("ClosingStructuresFailureMechanism_Code", resourceCulture);
- }
- }
-
- ///
- /// Looks up a localized string similar to Kunstwerken - Betrouwbaarheid sluiting kunstwerk.
- ///
- public static string ClosingStructuresFailureMechanism_DisplayName {
- get {
- return ResourceManager.GetString("ClosingStructuresFailureMechanism_DisplayName", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized string similar to DA.
///
public static string DuneErosionFailureMechanism_Code {
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx (.../Resources.resx) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Properties/Resources.resx (.../Resources.resx) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -135,9 +135,6 @@
Kunstwerken - Sterkte en stabiliteit puntconstructies
-
- Kunstwerken - Betrouwbaarheid sluiting kunstwerk
-
Dijken en dammen - Grasbekleding afschuiven buitentalud
@@ -150,9 +147,6 @@
GABU
-
- BSKW
-
STKWp
Index: Ringtoets/Integration/src/Ringtoets.Integration.Data/Ringtoets.Integration.Data.csproj
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Ringtoets/Integration/src/Ringtoets.Integration.Data/Ringtoets.Integration.Data.csproj (.../Ringtoets.Integration.Data.csproj) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Data/Ringtoets.Integration.Data.csproj (.../Ringtoets.Integration.Data.csproj) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -44,7 +44,6 @@
-
@@ -63,7 +62,6 @@
-
@@ -79,6 +77,11 @@
Core.Common.BaseFalse
+
+ {C6309704-D67B-434C-BC98-9F8910BC1D10}
+ Ringtoets.ClosingStructures.Data
+ False
+ {567E0B69-5280-41CE-ADD6-443725A61C86}Ringtoets.WaveImpactAsphaltCover.Data
Fisheye: Tag 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/ClosingStructuresFailureMechanism.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Data/StandAlone/SectionResults/ClosingStructuresFailureMechanismSectionResult.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj (.../Ringtoets.Integration.Forms.csproj) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/Ringtoets.Integration.Forms.csproj (.../Ringtoets.Integration.Forms.csproj) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -98,7 +98,6 @@
DesignWaterLevelLocationsView.cs
-
@@ -110,9 +109,6 @@
-
- UserControl
- UserControl
Fisheye: Tag 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultRows/ClosingStructuresSectionResultRow.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6 refers to a dead (removed) revision in file `Ringtoets/Integration/src/Ringtoets.Integration.Forms/Views/SectionResultViews/ClosingStructuresResultView.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj
===================================================================
diff -u -ra8163cf0aa69df29f6c37a8cccd2981cf97b4b35 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj (.../Ringtoets.Integration.Plugin.csproj) (revision a8163cf0aa69df29f6c37a8cccd2981cf97b4b35)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj (.../Ringtoets.Integration.Plugin.csproj) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -107,6 +107,16 @@
Core.Components.Gis.FormsFalse
+
+ {C6309704-D67B-434C-BC98-9F8910BC1D10}
+ Ringtoets.ClosingStructures.Data
+ False
+
+
+ {22E191F2-B2E3-413C-9511-4C2CDEDB2EFF}
+ Ringtoets.ClosingStructures.Forms
+ False
+ {9b3ed064-e29f-4d38-85e0-3a82b77ba702}Ringtoets.GrassCoverErosionOutwards.Plugin
Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -35,6 +35,8 @@
using Core.Common.IO.Exceptions;
using Core.Common.Utils.Extensions;
using log4net;
+using Ringtoets.ClosingStructures.Data;
+using Ringtoets.ClosingStructures.Forms.Views;
using Ringtoets.Common.Data;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.Calculation;
@@ -52,7 +54,6 @@
using Ringtoets.GrassCoverErosionInwards.Forms.PresentationObjects;
using Ringtoets.GrassCoverErosionOutwards.Data;
using Ringtoets.GrassCoverErosionOutwards.Forms.PresentationObjects;
-using Ringtoets.GrassCoverErosionOutwards.Plugin;
using Ringtoets.HeightStructures.Data;
using Ringtoets.HeightStructures.Forms.PresentationObjects;
using Ringtoets.HydraRing.Data;
@@ -66,13 +67,10 @@
using Ringtoets.Integration.Forms.Views;
using Ringtoets.Integration.Forms.Views.SectionResultViews;
using Ringtoets.Integration.Plugin.FileImporters;
-using Ringtoets.Integration.Plugin.Properties;
using Ringtoets.Integration.Service;
using Ringtoets.Integration.Service.MessageProviders;
using Ringtoets.Piping.Data;
using Ringtoets.Piping.Forms.PresentationObjects;
-using Ringtoets.Revetment.Forms.PresentationObjects;
-using Ringtoets.Revetment.Forms.PropertyClasses;
using Ringtoets.StabilityStoneCover.Data;
using Ringtoets.StabilityStoneCover.Forms.PresentationObjects;
using Ringtoets.WaveImpactAsphaltCover.Data;
@@ -386,7 +384,7 @@
yield return new ViewInfo, ICommentable, CommentView>
{
- GetViewName = (v, o) => Resources.Comment_DisplayName,
+ GetViewName = (v, o) => RingtoetsIntegrationPluginResources.Comment_DisplayName,
GetViewData = context => context.WrappedData,
Image = RingtoetsCommonFormsResources.EditDocumentIcon,
CloseForData = CloseCommentViewForData
@@ -418,8 +416,8 @@
yield return new ImportInfo
{
CreateFileImporter = (context, filePath) => new ForeshoreProfilesImporter(context.WrappedData,
- context.ParentAssessmentSection.ReferenceLine,
- filePath),
+ context.ParentAssessmentSection.ReferenceLine,
+ filePath),
Name = RingtoetsIntegrationPluginResources.ForeshoreProfilesImporter_DisplayName,
Category = RingtoetsCommonFormsResources.Ringtoets_Category,
Image = RingtoetsIntegrationPluginResources.Foreshore,
@@ -452,8 +450,8 @@
yield return new ExportInfo
{
CreateFileExporter = (context, filePath) => new HydraulicBoundaryLocationsExporter(
- context.WrappedData.HydraulicBoundaryDatabase.Locations, filePath,
- Resources.DesignWaterLevel_Description, Resources.WaveHeight_Description),
+ context.WrappedData.HydraulicBoundaryDatabase.Locations, filePath,
+ RingtoetsIntegrationPluginResources.DesignWaterLevel_Description, RingtoetsIntegrationPluginResources.WaveHeight_Description),
IsEnabled = context => context.WrappedData.HydraulicBoundaryDatabase != null,
FileFilter = RingtoetsCommonIoResources.DataTypeDisplayName_shape_file_filter
};
@@ -608,7 +606,7 @@
yield return new TreeNodeInfo
{
Text = foreshoreProfile => foreshoreProfile.Name,
- Image = context => Resources.Foreshore,
+ Image = context => RingtoetsIntegrationPluginResources.Foreshore,
ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
.AddPropertiesItem()
.Build()
@@ -629,7 +627,7 @@
yield return new TreeNodeInfo>
{
- Text = comment => Resources.Comment_DisplayName,
+ Text = comment => RingtoetsIntegrationPluginResources.Comment_DisplayName,
Image = context => RingtoetsCommonFormsResources.EditDocumentIcon,
ContextMenuStrip = (nodeData, parentData, treeViewControl) => Gui.Get(nodeData, treeViewControl)
.AddOpenItem()
@@ -1148,7 +1146,7 @@
bool successfulCalculation = hydraulicBoundaryLocationCalculationGuiService.CalculateDesignWaterLevels(assessmentSection.HydraulicBoundaryDatabase.FilePath,
assessmentSection.HydraulicBoundaryDatabase.Locations,
assessmentSection.Id,
- assessmentSection.FailureMechanismContribution.Norm,
+ assessmentSection.FailureMechanismContribution.Norm,
new DesignWaterLevelCalculationMessageProvider());
if (successfulCalculation)
{
@@ -1185,10 +1183,10 @@
}
IAssessmentSection assessmentSection = nodeData.WrappedData;
bool successfulCalculation = hydraulicBoundaryLocationCalculationGuiService.CalculateWaveHeights(assessmentSection.HydraulicBoundaryDatabase.FilePath,
- assessmentSection.HydraulicBoundaryDatabase.Locations,
- assessmentSection.Id,
- assessmentSection.FailureMechanismContribution.Norm,
- new WaveHeightCalculationMessageProvider());
+ assessmentSection.HydraulicBoundaryDatabase.Locations,
+ assessmentSection.Id,
+ assessmentSection.FailureMechanismContribution.Norm,
+ new WaveHeightCalculationMessageProvider());
if (successfulCalculation)
{
nodeData.NotifyObservers();
Index: Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Ringtoets.Integration.Data.Test.csproj
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Ringtoets.Integration.Data.Test.csproj (.../Ringtoets.Integration.Data.Test.csproj) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/Ringtoets.Integration.Data.Test.csproj (.../Ringtoets.Integration.Data.Test.csproj) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -56,10 +56,8 @@
-
-
@@ -87,6 +85,10 @@
{3bbfd65b-b277-4e50-ae6d-bd24c3434609}Core.Common.Base
+
+ {c6309704-d67b-434c-bc98-9f8910bc1d10}
+ Ringtoets.ClosingStructures.Data
+ {567e0b69-5280-41ce-add6-443725a61c86}Ringtoets.WaveImpactAsphaltCover.Data
Fisheye: Tag 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6 refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/ClosingStructuresFailureMechanismTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6 refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Data.Test/StandAlone/SectionResults/ClosingStructuresFailureMechanismSectionResultTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj (.../Ringtoets.Integration.Forms.Test.csproj) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Ringtoets.Integration.Forms.Test.csproj (.../Ringtoets.Integration.Forms.Test.csproj) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -127,7 +127,6 @@
-
@@ -145,7 +144,6 @@
-
@@ -193,6 +191,10 @@
{318ba582-88c9-4816-a54a-a7e431461de3}Core.Components.Gis
+
+ {C6309704-D67B-434C-BC98-9F8910BC1D10}
+ Ringtoets.ClosingStructures.Data
+ {73E7E100-C015-4874-A548-AD6E33E7955E}Ringtoets.Common.Service.TestUtil
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ClosingStructuresFailureMechanismSectionResultContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ClosingStructuresFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../ClosingStructuresFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/ClosingStructuresFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../ClosingStructuresFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -26,10 +26,9 @@
using Core.Common.TestUtil;
using NUnit.Framework;
using Rhino.Mocks;
+using Ringtoets.ClosingStructures.Data;
using Ringtoets.Common.Forms.PresentationObjects;
using Ringtoets.Common.Forms.Properties;
-using Ringtoets.Integration.Data.StandAlone;
-using Ringtoets.Integration.Data.StandAlone.SectionResults;
using Ringtoets.Integration.Plugin;
namespace Ringtoets.Integration.Forms.Test.TreeNodeInfos
Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs (.../FailureMechanismContextTreeNodeInfoTest.cs) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs (.../FailureMechanismContextTreeNodeInfoTest.cs) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -36,6 +36,7 @@
using Core.Common.Utils.Reflection;
using NUnit.Framework;
using Rhino.Mocks;
+using Ringtoets.ClosingStructures.Data;
using Ringtoets.Common.Data;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.FailureMechanism;
Fisheye: Tag 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6 refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultRows/ClosingStructuresSectionResultRowTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6 refers to a dead (removed) revision in file `Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/ClosingStructuresResultViewTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/DikeProfilesContextImportInfoTest.cs
===================================================================
diff -u -r866c784ab07dfe5f28c0b25eeaa7d8a82ab55253 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/DikeProfilesContextImportInfoTest.cs (.../DikeProfilesContextImportInfoTest.cs) (revision 866c784ab07dfe5f28c0b25eeaa7d8a82ab55253)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ImportInfos/DikeProfilesContextImportInfoTest.cs (.../DikeProfilesContextImportInfoTest.cs) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -1,4 +1,25 @@
-using System.Drawing;
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System.Drawing;
using System.IO;
using System.Linq;
using Core.Common.Base;
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj (.../Ringtoets.Integration.Plugin.Test.csproj) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Ringtoets.Integration.Plugin.Test.csproj (.../Ringtoets.Integration.Plugin.Test.csproj) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -135,6 +135,14 @@
{4a06df0d-5d75-4bad-a95a-a3db9b7c4ad5}Core.Components.Gis.Forms
+
+ {C6309704-D67B-434C-BC98-9F8910BC1D10}
+ Ringtoets.ClosingStructures.Data
+
+
+ {22E191F2-B2E3-413C-9511-4C2CDEDB2EFF}
+ Ringtoets.ClosingStructures.Forms
+ {AF1ACFA2-AEE5-4DB7-98CA-8B3720E46AD9}Ringtoets.Revetment.Forms
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -37,6 +37,8 @@
using NUnit.Extensions.Forms;
using NUnit.Framework;
using Rhino.Mocks;
+using Ringtoets.ClosingStructures.Data;
+using Ringtoets.ClosingStructures.Forms.Views;
using Ringtoets.Common.Data;
using Ringtoets.Common.Data.AssessmentSection;
using Ringtoets.Common.Data.Calculation;
@@ -54,8 +56,6 @@
using Ringtoets.Integration.Forms.PropertyClasses;
using Ringtoets.Integration.Forms.Views;
using Ringtoets.Integration.Forms.Views.SectionResultViews;
-using Ringtoets.Revetment.Forms.PresentationObjects;
-using Ringtoets.Revetment.Forms.PropertyClasses;
using RingtoetsFormsResources = Ringtoets.Integration.Forms.Properties.Resources;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources;
@@ -204,40 +204,40 @@
Assert.AreEqual(12, propertyInfos.Length);
PropertyInfo ringtoetsProjectProperties = PluginTestHelper.AssertPropertyInfoDefined(
- propertyInfos,
- typeof(IProject),
+ propertyInfos,
+ typeof(IProject),
typeof(RingtoetsProjectProperties));
Assert.IsNull(ringtoetsProjectProperties.AdditionalDataCheck);
Assert.IsNull(ringtoetsProjectProperties.GetObjectPropertiesData);
Assert.IsNull(ringtoetsProjectProperties.AfterCreate);
PropertyInfo assessmentSectionProperties = PluginTestHelper.AssertPropertyInfoDefined(
- propertyInfos,
- typeof(IAssessmentSection),
+ propertyInfos,
+ typeof(IAssessmentSection),
typeof(AssessmentSectionProperties));
Assert.IsNull(assessmentSectionProperties.AdditionalDataCheck);
Assert.IsNull(assessmentSectionProperties.GetObjectPropertiesData);
Assert.IsNull(assessmentSectionProperties.AfterCreate);
PropertyInfo hydraulicBoundaryDatabaseProperties = PluginTestHelper.AssertPropertyInfoDefined(
propertyInfos,
- typeof(HydraulicBoundaryDatabaseContext),
+ typeof(HydraulicBoundaryDatabaseContext),
typeof(HydraulicBoundaryDatabaseProperties));
Assert.IsNull(hydraulicBoundaryDatabaseProperties.AdditionalDataCheck);
Assert.IsNull(hydraulicBoundaryDatabaseProperties.GetObjectPropertiesData);
Assert.IsNull(hydraulicBoundaryDatabaseProperties.AfterCreate);
PropertyInfo standAloneFailureMechanismProperties = PluginTestHelper.AssertPropertyInfoDefined(
propertyInfos,
- typeof(FailureMechanismContext),
+ typeof(FailureMechanismContext),
typeof(StandAloneFailureMechanismContextProperties));
Assert.IsNull(standAloneFailureMechanismProperties.AdditionalDataCheck);
Assert.IsNull(standAloneFailureMechanismProperties.GetObjectPropertiesData);
Assert.IsNull(standAloneFailureMechanismProperties.AfterCreate);
PropertyInfo calculationGroupProperties = PluginTestHelper.AssertPropertyInfoDefined(
propertyInfos,
- typeof(ICalculationContext),
+ typeof(ICalculationContext),
typeof(CalculationGroupContextProperties));
Assert.IsNull(calculationGroupProperties.AdditionalDataCheck);
Assert.IsNull(calculationGroupProperties.GetObjectPropertiesData);
@@ -253,38 +253,38 @@
PropertyInfo outputContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
propertyInfos,
- typeof(ProbabilityAssessmentOutput),
+ typeof(ProbabilityAssessmentOutput),
typeof(ProbabilityAssessmentOutputProperties));
Assert.IsNull(outputContextProperties.AdditionalDataCheck);
Assert.IsNull(outputContextProperties.GetObjectPropertiesData);
Assert.IsNull(outputContextProperties.AfterCreate);
PropertyInfo designWaterLevelLocationsContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
propertyInfos,
- typeof(DesignWaterLevelLocationsContext),
+ typeof(DesignWaterLevelLocationsContext),
typeof(DesignWaterLevelLocationsContextProperties));
Assert.IsNull(designWaterLevelLocationsContextProperties.AdditionalDataCheck);
Assert.IsNotNull(designWaterLevelLocationsContextProperties.GetObjectPropertiesData);
Assert.IsNull(designWaterLevelLocationsContextProperties.AfterCreate);
PropertyInfo designWaterLevelLocationContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
propertyInfos,
- typeof(DesignWaterLevelLocationContext),
+ typeof(DesignWaterLevelLocationContext),
typeof(DesignWaterLevelLocationContextProperties));
Assert.IsNull(designWaterLevelLocationContextProperties.AdditionalDataCheck);
Assert.IsNull(designWaterLevelLocationContextProperties.GetObjectPropertiesData);
Assert.IsNull(designWaterLevelLocationContextProperties.AfterCreate);
PropertyInfo waveHeightLocationsContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
- propertyInfos,
+ propertyInfos,
typeof(WaveHeightLocationsContext),
typeof(WaveHeightLocationsContextProperties));
Assert.IsNull(waveHeightLocationsContextProperties.AdditionalDataCheck);
Assert.IsNotNull(waveHeightLocationsContextProperties.GetObjectPropertiesData);
Assert.IsNull(waveHeightLocationsContextProperties.AfterCreate);
PropertyInfo waveHeightLocationContextProperties = PluginTestHelper.AssertPropertyInfoDefined(
- propertyInfos,
+ propertyInfos,
typeof(WaveHeightLocationContext),
typeof(WaveHeightLocationContextProperties));
Assert.IsNull(waveHeightLocationContextProperties.AdditionalDataCheck);
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/ClosingStructuresResultViewInfoTest.cs
===================================================================
diff -u -rb3af39ba024b8e12fe238d85130697255db28c59 -r3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/ClosingStructuresResultViewInfoTest.cs (.../ClosingStructuresResultViewInfoTest.cs) (revision b3af39ba024b8e12fe238d85130697255db28c59)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/ClosingStructuresResultViewInfoTest.cs (.../ClosingStructuresResultViewInfoTest.cs) (revision 3fad85f24665fdcfe75cba4e2f9ab30c2ca6a4b6)
@@ -25,13 +25,12 @@
using Core.Common.TestUtil;
using NUnit.Framework;
using Rhino.Mocks;
+using Ringtoets.ClosingStructures.Data;
+using Ringtoets.ClosingStructures.Forms.Views;
using Ringtoets.Common.Data.AssessmentSection;
+using Ringtoets.Common.Data.Calculation;
using Ringtoets.Common.Data.FailureMechanism;
using Ringtoets.Common.Forms.PresentationObjects;
-using Ringtoets.Integration.Data.StandAlone;
-using Ringtoets.Integration.Data.StandAlone.SectionResults;
-using Ringtoets.Integration.Forms.Views.SectionResultViews;
-using Ringtoets.Piping.Data;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
namespace Ringtoets.Integration.Plugin.Test.ViewInfos
@@ -195,7 +194,7 @@
assessmentSectionMock.Expect(asm => asm.GetFailureMechanisms()).Return(new IFailureMechanism[]
{
- new PipingFailureMechanism(),
+ new TetsFailureMechanism(),
failureMechanism
});
@@ -313,4 +312,17 @@
mocks.VerifyAll();
}
}
+
+ public class TetsFailureMechanism : FailureMechanismBase
+ {
+ public TetsFailureMechanism() : base("Name", "FailureMechanismCode") {}
+
+ public override IEnumerable Calculations
+ {
+ get
+ {
+ return null;
+ }
+ }
+ }
}
\ No newline at end of file