Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs =================================================================== diff -u -re6f1b6dc84961a06eef46dba4ef4d78597699361 -ra07a7ab59ec8ace774f505f63e3bcb44af71a3c2 --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision e6f1b6dc84961a06eef46dba4ef4d78597699361) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision a07a7ab59ec8ace774f505f63e3bcb44af71a3c2) @@ -119,13 +119,6 @@ ChildNodeObjects = DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContextChildNodeObjects }; - yield return new TreeNodeInfo - { - Text = context => RiskeerPluginHelper.FormatCategoryBoundaryName(context.CategoryBoundaryName), - Image = context => RiskeerCommonFormsResources.GenericInputOutputIcon, - ContextMenuStrip = DuneLocationCalculationsContextMenuStrip - }; - yield return new TreeNodeInfo { Text = context => noProbabilityValueDoubleConverter.ConvertToString(context.WrappedData.TargetProbability), @@ -400,62 +393,6 @@ #endregion - #region DuneLocationCalculationsContext TreeNodeInfo - - private static string ValidateAllDataAvailableAndGetErrorMessage(IAssessmentSection assessmentSection, - double norm) - { - string errorMessage = HydraulicBoundaryDatabaseConnectionValidator.Validate(assessmentSection.HydraulicBoundaryDatabase); - - if (string.IsNullOrEmpty(errorMessage)) - { - TargetProbabilityCalculationServiceHelper.ValidateTargetProbability(norm, logMessage => errorMessage = logMessage); - } - - return errorMessage; - } - - private ContextMenuStrip DuneLocationCalculationsContextMenuStrip(DuneLocationCalculationsContext context, object parent, TreeViewControl treeViewControl) - { - var calculateAllItem = new StrictContextMenuItem( - RiskeerCommonFormsResources.Calculate_All, - RiskeerCommonFormsResources.HydraulicLoads_Calculate_All_ToolTip, - RiskeerCommonFormsResources.CalculateAllIcon, - (sender, args) => - { - if (duneLocationCalculationGuiService == null) - { - return; - } - - duneLocationCalculationGuiService.Calculate(context.WrappedData, - context.AssessmentSection, - context.GetNormFunc(), - context.CategoryBoundaryName); - }); - - string validationText = ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection, - context.GetNormFunc()); - - if (!string.IsNullOrEmpty(validationText)) - { - calculateAllItem.Enabled = false; - calculateAllItem.ToolTipText = validationText; - } - - return Gui.Get(context, treeViewControl) - .AddOpenItem() - .AddSeparator() - .AddExportItem() - .AddSeparator() - .AddCustomItem(calculateAllItem) - .AddSeparator() - .AddPropertiesItem() - .Build(); - } - - #endregion - #region DuneLocationCalculationsForUserDefinedTargetProbabilityContext TreeNodeInfo private ContextMenuStrip DuneLocationCalculationsForUserDefinedTargetProbabilityContextMenuStrip(DuneLocationCalculationsForUserDefinedTargetProbabilityContext context, object parent, TreeViewControl treeViewControl) Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/DuneErosionPluginTest.cs =================================================================== diff -u -rad7de8440b9293c49d8801d4707d8b5c779634cf -ra07a7ab59ec8ace774f505f63e3bcb44af71a3c2 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/DuneErosionPluginTest.cs (.../DuneErosionPluginTest.cs) (revision ad7de8440b9293c49d8801d4707d8b5c779634cf) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/DuneErosionPluginTest.cs (.../DuneErosionPluginTest.cs) (revision a07a7ab59ec8ace774f505f63e3bcb44af71a3c2) @@ -104,13 +104,12 @@ TreeNodeInfo[] treeNodeInfos = plugin.GetTreeNodeInfos().ToArray(); // Assert - Assert.AreEqual(6, treeNodeInfos.Length); + Assert.AreEqual(5, treeNodeInfos.Length); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(DuneErosionHydraulicLoadsContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(DuneErosionFailurePathContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(FailureMechanismSectionResultContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(DuneLocationCalculationsForUserDefinedTargetProbabilitiesGroupContext))); Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(DuneLocationCalculationsForUserDefinedTargetProbabilityContext))); - Assert.IsTrue(treeNodeInfos.Any(tni => tni.TagType == typeof(DuneLocationCalculationsContext))); } } @@ -136,7 +135,7 @@ viewInfos, typeof(DuneErosionHydraulicLoadsContext), typeof(DuneErosionFailureMechanismView)); - + PluginTestHelper.AssertViewInfoDefined( viewInfos, typeof(DuneErosionFailurePathContext),