Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs =================================================================== diff -u -r5deab7d49ce4ee20f8a2c0b52a952b22e8e89563 -rdd0789232e8d39c64a6e89e0637f6848b02eae1e --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5deab7d49ce4ee20f8a2c0b52a952b22e8e89563) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision dd0789232e8d39c64a6e89e0637f6848b02eae1e) @@ -181,6 +181,42 @@ } /// + /// Looks up a localized string similar to A+-> A. + /// + public static string Hydraulic_category_boundary_name_1 { + get { + return ResourceManager.GetString("Hydraulic_category_boundary_name_1", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to A->B. + /// + public static string Hydraulic_category_boundary_name_2 { + get { + return ResourceManager.GetString("Hydraulic_category_boundary_name_2", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to B->C. + /// + public static string Hydraulic_category_boundary_name_3 { + get { + return ResourceManager.GetString("Hydraulic_category_boundary_name_3", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to C->D. + /// + public static string Hydraulic_category_boundary_name_4 { + get { + return ResourceManager.GetString("Hydraulic_category_boundary_name_4", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Na het importeren van een aangepaste ligging van de referentielijn zullen alle geïmporteerde en berekende gegevens van alle toetssporen worden gewist. /// ///Wilt u doorgaan?. Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx =================================================================== diff -u -r5deab7d49ce4ee20f8a2c0b52a952b22e8e89563 -rdd0789232e8d39c64a6e89e0637f6848b02eae1e --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision 5deab7d49ce4ee20f8a2c0b52a952b22e8e89563) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Properties/Resources.resx (.../Resources.resx) (revision dd0789232e8d39c64a6e89e0637f6848b02eae1e) @@ -173,4 +173,16 @@ Weet u zeker dat u wilt doorgaan? + + A+-> A + + + A->B + + + B->C + + + C->D + \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -re5d8b58dcb5fcf82338b0511f3e9dc4d78633fda -rdd0789232e8d39c64a6e89e0637f6848b02eae1e --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision e5d8b58dcb5fcf82338b0511f3e9dc4d78633fda) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision dd0789232e8d39c64a6e89e0637f6848b02eae1e) @@ -1872,21 +1872,45 @@ { return new object[] { - new DesignWaterLevelLocationsContext(context.WrappedData, context.AssessmentSection, hbl => hbl.DesignWaterLevelCalculation1), - new DesignWaterLevelLocationsContext(context.WrappedData, context.AssessmentSection, hbl => hbl.DesignWaterLevelCalculation2), - new DesignWaterLevelLocationsContext(context.WrappedData, context.AssessmentSection, hbl => hbl.DesignWaterLevelCalculation3), - new DesignWaterLevelLocationsContext(context.WrappedData, context.AssessmentSection, hbl => hbl.DesignWaterLevelCalculation4) + new DesignWaterLevelLocationsContext(context.WrappedData, + context.AssessmentSection, + hbl => hbl.DesignWaterLevelCalculation1, + RingtoetsIntegrationPluginResources.Hydraulic_category_boundary_name_1), + new DesignWaterLevelLocationsContext(context.WrappedData, + context.AssessmentSection, + hbl => hbl.DesignWaterLevelCalculation2, + RingtoetsIntegrationPluginResources.Hydraulic_category_boundary_name_2), + new DesignWaterLevelLocationsContext(context.WrappedData, + context.AssessmentSection, + hbl => hbl.DesignWaterLevelCalculation3, + RingtoetsIntegrationPluginResources.Hydraulic_category_boundary_name_3), + new DesignWaterLevelLocationsContext(context.WrappedData, + context.AssessmentSection, + hbl => hbl.DesignWaterLevelCalculation4, + RingtoetsIntegrationPluginResources.Hydraulic_category_boundary_name_4) }; } private static object[] WaveHeightLocationsGroupContextChildNodeObjects(WaveHeightLocationsGroupContext context) { return new object[] { - new WaveHeightLocationsContext(context.WrappedData, context.AssessmentSection, hbl => hbl.WaveHeightCalculation1), - new WaveHeightLocationsContext(context.WrappedData, context.AssessmentSection, hbl => hbl.WaveHeightCalculation2), - new WaveHeightLocationsContext(context.WrappedData, context.AssessmentSection, hbl => hbl.WaveHeightCalculation3), - new WaveHeightLocationsContext(context.WrappedData, context.AssessmentSection, hbl => hbl.WaveHeightCalculation4) + new WaveHeightLocationsContext(context.WrappedData, + context.AssessmentSection, + hbl => hbl.WaveHeightCalculation1, + RingtoetsIntegrationPluginResources.Hydraulic_category_boundary_name_1), + new WaveHeightLocationsContext(context.WrappedData, + context.AssessmentSection, + hbl => hbl.WaveHeightCalculation2, + RingtoetsIntegrationPluginResources.Hydraulic_category_boundary_name_2), + new WaveHeightLocationsContext(context.WrappedData, + context.AssessmentSection, + hbl => hbl.WaveHeightCalculation3, + RingtoetsIntegrationPluginResources.Hydraulic_category_boundary_name_3), + new WaveHeightLocationsContext(context.WrappedData, + context.AssessmentSection, + hbl => hbl.WaveHeightCalculation4, + RingtoetsIntegrationPluginResources.Hydraulic_category_boundary_name_4) }; } Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelLocationsContextPropertyInfoTest.cs =================================================================== diff -u -r44d4c114a254db9859fbf71812e599c468dcbe77 -rdd0789232e8d39c64a6e89e0637f6848b02eae1e --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelLocationsContextPropertyInfoTest.cs (.../DesignWaterLevelLocationsContextPropertyInfoTest.cs) (revision 44d4c114a254db9859fbf71812e599c468dcbe77) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/DesignWaterLevelLocationsContextPropertyInfoTest.cs (.../DesignWaterLevelLocationsContextPropertyInfoTest.cs) (revision dd0789232e8d39c64a6e89e0637f6848b02eae1e) @@ -59,7 +59,10 @@ var assessmentSection = mockRepository.Stub(); mockRepository.ReplayAll(); - var context = new DesignWaterLevelLocationsContext(hydraulicBoundaryDatabase.Locations, assessmentSection, hbl => new HydraulicBoundaryLocationCalculation()); + var context = new DesignWaterLevelLocationsContext(hydraulicBoundaryDatabase.Locations, + assessmentSection, + hbl => new HydraulicBoundaryLocationCalculation(), + "Category"); using (var plugin = new RingtoetsPlugin()) { Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightLocationsContextPropertyInfoTest.cs =================================================================== diff -u -r44d4c114a254db9859fbf71812e599c468dcbe77 -rdd0789232e8d39c64a6e89e0637f6848b02eae1e --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightLocationsContextPropertyInfoTest.cs (.../WaveHeightLocationsContextPropertyInfoTest.cs) (revision 44d4c114a254db9859fbf71812e599c468dcbe77) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/WaveHeightLocationsContextPropertyInfoTest.cs (.../WaveHeightLocationsContextPropertyInfoTest.cs) (revision dd0789232e8d39c64a6e89e0637f6848b02eae1e) @@ -59,7 +59,10 @@ var assessmentSection = mockRepository.Stub(); mockRepository.ReplayAll(); - var context = new WaveHeightLocationsContext(hydraulicBoundaryDatabase.Locations, assessmentSection, hbl => new HydraulicBoundaryLocationCalculation()); + var context = new WaveHeightLocationsContext(hydraulicBoundaryDatabase.Locations, + assessmentSection, + hbl => new HydraulicBoundaryLocationCalculation(), + "Category"); using (var plugin = new RingtoetsPlugin()) { Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs =================================================================== diff -u -re5d8b58dcb5fcf82338b0511f3e9dc4d78633fda -rdd0789232e8d39c64a6e89e0637f6848b02eae1e --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision e5d8b58dcb5fcf82338b0511f3e9dc4d78633fda) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision dd0789232e8d39c64a6e89e0637f6848b02eae1e) @@ -139,7 +139,8 @@ var nodeData = new DesignWaterLevelLocationsContext(new ObservableList(), assessmentSection, - hbl => new HydraulicBoundaryLocationCalculation()); + hbl => new HydraulicBoundaryLocationCalculation(), + "Category"); using (var treeViewControl = new TreeViewControl()) { @@ -172,7 +173,8 @@ var nodeData = new DesignWaterLevelLocationsContext(new ObservableList(), assessmentSection, - hbl => new HydraulicBoundaryLocationCalculation()); + hbl => new HydraulicBoundaryLocationCalculation(), + "Category"); using (var treeViewControl = new TreeViewControl()) { @@ -213,7 +215,8 @@ var nodeData = new DesignWaterLevelLocationsContext(assessmentSection.HydraulicBoundaryDatabase.Locations, assessmentSection, - hbl => new HydraulicBoundaryLocationCalculation()); + hbl => new HydraulicBoundaryLocationCalculation(), + "Category"); using (var treeViewControl = new TreeViewControl()) { @@ -260,7 +263,8 @@ var nodeData = new DesignWaterLevelLocationsContext(hydraulicBoundaryDatabase.Locations, assessmentSection, - hbl => new HydraulicBoundaryLocationCalculation()); + hbl => new HydraulicBoundaryLocationCalculation(), + "Category"); using (var treeViewControl = new TreeViewControl()) { @@ -312,7 +316,8 @@ var context = new DesignWaterLevelLocationsContext(assessmentSection.HydraulicBoundaryDatabase.Locations, assessmentSection, - hbl => new HydraulicBoundaryLocationCalculation()); + hbl => new HydraulicBoundaryLocationCalculation(), + "Category"); using (var treeViewControl = new TreeViewControl()) { @@ -382,7 +387,8 @@ var context = new DesignWaterLevelLocationsContext(assessmentSection.HydraulicBoundaryDatabase.Locations, assessmentSection, - hbl => new HydraulicBoundaryLocationCalculation()); + hbl => new HydraulicBoundaryLocationCalculation(), + "Category"); using (var treeViewControl = new TreeViewControl()) { @@ -451,7 +457,8 @@ var context = new DesignWaterLevelLocationsContext(assessmentSection.HydraulicBoundaryDatabase.Locations, assessmentSection, - hbl => new HydraulicBoundaryLocationCalculation()); + hbl => new HydraulicBoundaryLocationCalculation(), + "Category"); using (var treeViewControl = new TreeViewControl()) { @@ -518,7 +525,8 @@ var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(); var context = new DesignWaterLevelLocationsContext(assessmentSection.HydraulicBoundaryDatabase.Locations, assessmentSection, - hbl => hydraulicBoundaryLocationCalculation); + hbl => hydraulicBoundaryLocationCalculation, + "Category"); using (var treeViewControl = new TreeViewControl()) { Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs =================================================================== diff -u -re5d8b58dcb5fcf82338b0511f3e9dc4d78633fda -rdd0789232e8d39c64a6e89e0637f6848b02eae1e --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs (.../WaveHeightLocationsContextTreeNodeInfoTest.cs) (revision e5d8b58dcb5fcf82338b0511f3e9dc4d78633fda) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs (.../WaveHeightLocationsContextTreeNodeInfoTest.cs) (revision dd0789232e8d39c64a6e89e0637f6848b02eae1e) @@ -140,7 +140,8 @@ var nodeData = new WaveHeightLocationsContext(new ObservableList(), assessmentSection, - hbl => new HydraulicBoundaryLocationCalculation()); + hbl => new HydraulicBoundaryLocationCalculation(), + "Category"); using (var treeViewControl = new TreeViewControl()) { @@ -173,7 +174,8 @@ var nodeData = new WaveHeightLocationsContext(new ObservableList(), assessmentSection, - hbl => new HydraulicBoundaryLocationCalculation()); + hbl => new HydraulicBoundaryLocationCalculation(), + "Category"); using (var treeViewControl = new TreeViewControl()) { @@ -214,7 +216,8 @@ var nodeData = new WaveHeightLocationsContext(assessmentSection.HydraulicBoundaryDatabase.Locations, assessmentSection, - hbl => new HydraulicBoundaryLocationCalculation()); + hbl => new HydraulicBoundaryLocationCalculation(), + "Category"); using (var treeViewControl = new TreeViewControl()) { @@ -261,7 +264,8 @@ var nodeData = new WaveHeightLocationsContext(hydraulicBoundaryDatabase.Locations, assessmentSection, - hbl => new HydraulicBoundaryLocationCalculation()); + hbl => new HydraulicBoundaryLocationCalculation(), + "Category"); using (var treeViewControl = new TreeViewControl()) { @@ -313,7 +317,8 @@ var context = new WaveHeightLocationsContext(assessmentSection.HydraulicBoundaryDatabase.Locations, assessmentSection, - hbl => new HydraulicBoundaryLocationCalculation()); + hbl => new HydraulicBoundaryLocationCalculation(), + "Category"); using (var treeViewControl = new TreeViewControl()) { @@ -383,7 +388,8 @@ var context = new WaveHeightLocationsContext(assessmentSection.HydraulicBoundaryDatabase.Locations, assessmentSection, - hbl => new HydraulicBoundaryLocationCalculation()); + hbl => new HydraulicBoundaryLocationCalculation(), + "Category"); using (var treeViewControl = new TreeViewControl()) { @@ -452,7 +458,8 @@ var context = new WaveHeightLocationsContext(assessmentSection.HydraulicBoundaryDatabase.Locations, assessmentSection, - hbl => new HydraulicBoundaryLocationCalculation()); + hbl => new HydraulicBoundaryLocationCalculation(), + "Category"); using (var treeViewControl = new TreeViewControl()) { @@ -521,7 +528,8 @@ var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(); var context = new WaveHeightLocationsContext(assessmentSection.HydraulicBoundaryDatabase.Locations, assessmentSection, - hbl => hydraulicBoundaryLocationCalculation); + hbl => hydraulicBoundaryLocationCalculation, + "Category"); using (var treeViewControl = new TreeViewControl()) { Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs =================================================================== diff -u -rb2d403b53ea5b4bba4cbe852858bf48d4d04b81e -rdd0789232e8d39c64a6e89e0637f6848b02eae1e --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs (.../DesignWaterLevelLocationsViewInfoTest.cs) (revision b2d403b53ea5b4bba4cbe852858bf48d4d04b81e) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs (.../DesignWaterLevelLocationsViewInfoTest.cs) (revision dd0789232e8d39c64a6e89e0637f6848b02eae1e) @@ -116,7 +116,8 @@ ObservableList locations = assessmentSection.HydraulicBoundaryDatabase.Locations; var context = new DesignWaterLevelLocationsContext(locations, assessmentSection, - hbl => new HydraulicBoundaryLocationCalculation()); + hbl => new HydraulicBoundaryLocationCalculation(), + "Category"); // Call object viewData = info.GetViewData(context); @@ -132,7 +133,8 @@ var assessmentSection = new ObservableTestAssessmentSectionStub(); var context = new DesignWaterLevelLocationsContext(new ObservableList(), assessmentSection, - hbl => new HydraulicBoundaryLocationCalculation()); + hbl => new HydraulicBoundaryLocationCalculation(), + "Category"); using (var ringtoetsPlugin = new RingtoetsPlugin()) { @@ -164,7 +166,8 @@ var locations = new ObservableList(); var context = new DesignWaterLevelLocationsContext(locations, assessmentSection, - hbl => new HydraulicBoundaryLocationCalculation()); + hbl => new HydraulicBoundaryLocationCalculation(), + "Category"); using (var view = new DesignWaterLevelLocationsView(locations, hbl => new HydraulicBoundaryLocationCalculation(), Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs =================================================================== diff -u -rb2d403b53ea5b4bba4cbe852858bf48d4d04b81e -rdd0789232e8d39c64a6e89e0637f6848b02eae1e --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs (.../WaveHeightLocationsViewInfoTest.cs) (revision b2d403b53ea5b4bba4cbe852858bf48d4d04b81e) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs (.../WaveHeightLocationsViewInfoTest.cs) (revision dd0789232e8d39c64a6e89e0637f6848b02eae1e) @@ -117,7 +117,8 @@ var context = new WaveHeightLocationsContext(locations, assessmentSection, - hbl => new HydraulicBoundaryLocationCalculation()); + hbl => new HydraulicBoundaryLocationCalculation(), + "Category"); // Call object viewData = info.GetViewData(context); @@ -133,7 +134,8 @@ var assessmentSection = new ObservableTestAssessmentSectionStub(); var context = new WaveHeightLocationsContext(new ObservableList(), assessmentSection, - hbl => new HydraulicBoundaryLocationCalculation()); + hbl => new HydraulicBoundaryLocationCalculation(), + "Category"); using (var ringtoetsPlugin = new RingtoetsPlugin()) { @@ -166,7 +168,8 @@ var locations = new ObservableList(); var context = new WaveHeightLocationsContext(locations, assessmentSection, - hbl => new HydraulicBoundaryLocationCalculation()); + hbl => new HydraulicBoundaryLocationCalculation(), + "Category"); using (var view = new WaveHeightLocationsView(locations, hbl => new HydraulicBoundaryLocationCalculation(),