Index: Core/Common/src/Core.Common.Gui/Plugin/PluginBase.cs =================================================================== diff -u -rf05844909ef96f5e6ea721563a33d32e042ef5ce -r1a49563c568eaef8b84743fec1f04ee119bf5c9c --- Core/Common/src/Core.Common.Gui/Plugin/PluginBase.cs (.../PluginBase.cs) (revision f05844909ef96f5e6ea721563a33d32e042ef5ce) +++ Core/Common/src/Core.Common.Gui/Plugin/PluginBase.cs (.../PluginBase.cs) (revision 1a49563c568eaef8b84743fec1f04ee119bf5c9c) @@ -28,7 +28,7 @@ namespace Core.Common.Gui.Plugin { /// - /// Template class for a plugin definitions. + /// Template class for a plug-in definitions. /// public abstract class PluginBase : IDisposable { @@ -38,7 +38,7 @@ public virtual IGui Gui { get; set; } /// - /// Ribbon command handler (adding tabs, groups, buttons, etc.) which can be provided by the plugin. + /// Ribbon command handler (adding tabs, groups, buttons, etc.) which can be provided by the plug-in. /// public virtual IRibbonCommandHandler RibbonCommandHandler { @@ -49,49 +49,49 @@ } /// - /// Activates the plugin. + /// Activates the plug-in. /// public virtual void Activate() {} /// - /// Deactivates the plugin. + /// Deactivates the plug-in. /// public virtual void Deactivate() {} /// - /// Returns all instances provided by this plugin. + /// Returns all instances provided by this plug-in. /// public virtual IEnumerable GetImportInfos() { yield break; } /// - /// Returns all instances provided by this plugin. + /// Returns all instances provided by this plug-in. /// public virtual IEnumerable GetExportInfos() { yield break; } /// - /// Returns all instances by of this plugin. + /// Returns all instances by of this plug-in. /// public virtual IEnumerable GetPropertyInfos() { return Enumerable.Empty(); } /// - /// Returns all instances provided by this plugin. + /// Returns all instances provided by this plug-in. /// public virtual IEnumerable GetViewInfos() { yield break; } /// - /// Returns all instances provided by this plugin. + /// Returns all instances provided by this plug-in. /// public virtual IEnumerable GetTreeNodeInfos() { Index: Core/Plugins/src/Core.Plugins.CommonTools/CommonToolsPlugin.cs =================================================================== diff -u -r2317b0fac1e6995eb9b20917a7be076f1cdc4b6c -r1a49563c568eaef8b84743fec1f04ee119bf5c9c --- Core/Plugins/src/Core.Plugins.CommonTools/CommonToolsPlugin.cs (.../CommonToolsPlugin.cs) (revision 2317b0fac1e6995eb9b20917a7be076f1cdc4b6c) +++ Core/Plugins/src/Core.Plugins.CommonTools/CommonToolsPlugin.cs (.../CommonToolsPlugin.cs) (revision 1a49563c568eaef8b84743fec1f04ee119bf5c9c) @@ -27,7 +27,7 @@ namespace Core.Plugins.CommonTools { /// - /// This class configures general plugin components. + /// This class configures general plug-in components. /// public class CommonToolsPlugin : PluginBase { Index: Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerPlugin.cs =================================================================== diff -u -r1eed3e3f652618c52a462edc502cfd4250772314 -r1a49563c568eaef8b84743fec1f04ee119bf5c9c --- Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerPlugin.cs (.../ProjectExplorerPlugin.cs) (revision 1eed3e3f652618c52a462edc502cfd4250772314) +++ Core/Plugins/src/Core.Plugins.ProjectExplorer/ProjectExplorerPlugin.cs (.../ProjectExplorerPlugin.cs) (revision 1a49563c568eaef8b84743fec1f04ee119bf5c9c) @@ -34,6 +34,9 @@ namespace Core.Plugins.ProjectExplorer { + /// + /// The plug-in for the component. + /// public class ProjectExplorerPlugin : PluginBase { private IViewController viewController; Index: Demo/Ringtoets/src/Demo.Ringtoets/GUIs/DemoProjectPlugin.cs =================================================================== diff -u -rae99d19be5c1bd59e6cc85669c96a3b9895e660d -r1a49563c568eaef8b84743fec1f04ee119bf5c9c --- Demo/Ringtoets/src/Demo.Ringtoets/GUIs/DemoProjectPlugin.cs (.../DemoProjectPlugin.cs) (revision ae99d19be5c1bd59e6cc85669c96a3b9895e660d) +++ Demo/Ringtoets/src/Demo.Ringtoets/GUIs/DemoProjectPlugin.cs (.../DemoProjectPlugin.cs) (revision 1a49563c568eaef8b84743fec1f04ee119bf5c9c) @@ -32,7 +32,7 @@ namespace Demo.Ringtoets.GUIs { /// - /// UI plugin the provides access to the demo projects for Ringtoets. + /// UI plug-in that provides access to the demo projects for Ringtoets. /// public class DemoProjectPlugin : PluginBase { Index: Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs =================================================================== diff -u -rac0f74af45101f8f5c081ed81f4a65c75a2f259e -r1a49563c568eaef8b84743fec1f04ee119bf5c9c --- Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision ac0f74af45101f8f5c081ed81f4a65c75a2f259e) +++ Ringtoets/ClosingStructures/src/Ringtoets.ClosingStructures.Plugin/ClosingStructuresPlugin.cs (.../ClosingStructuresPlugin.cs) (revision 1a49563c568eaef8b84743fec1f04ee119bf5c9c) @@ -207,14 +207,14 @@ private static void CalculateAll(ClosingStructuresFailureMechanism failureMechanism, IEnumerable calculations) { - //Add calculate logic, part of WTI-554 + // Add calculate logic, part of WTI-554 } #region TreeNodeInfo #region ClosingStructuresFailureMechanismContext TreeNodeInfo - private object[] FailureMechanismEnabledChildNodeObjects(ClosingStructuresFailureMechanismContext closingStructuresFailureMechanismContext) + private static object[] FailureMechanismEnabledChildNodeObjects(ClosingStructuresFailureMechanismContext closingStructuresFailureMechanismContext) { ClosingStructuresFailureMechanism wrappedData = closingStructuresFailureMechanismContext.WrappedData; return new object[] @@ -225,7 +225,7 @@ }; } - private object[] FailureMechanismDisabledChildNodeObjects(ClosingStructuresFailureMechanismContext closingStructuresFailureMechanismContext) + private static object[] FailureMechanismDisabledChildNodeObjects(ClosingStructuresFailureMechanismContext closingStructuresFailureMechanismContext) { return new object[] { @@ -289,17 +289,17 @@ .Build(); } - private void ValidateAll() + private static void ValidateAll() { - //Add validation service - currently a place holder + // Add validation service - currently a place holder } private static string ValidateAllDataAvailableAndGetErrorMessageForCalculationsInFailureMechanism(ClosingStructuresFailureMechanismContext context) { return ValidateAllDataAvailableAndGetErrorMessage(context.Parent, context.WrappedData); } - private void CalculateAll(ClosingStructuresFailureMechanismContext context) + private static void CalculateAll(ClosingStructuresFailureMechanismContext context) { CalculateAll(context.WrappedData, context.WrappedData.Calculations.OfType()); } @@ -448,11 +448,11 @@ .Build(); } - private void CalculateAction(ClosingStructuresCalculation closingStructuresCalculation, ClosingStructuresCalculationContext closingStructuresCalculationContext) {} + private static void CalculateAction(ClosingStructuresCalculation closingStructuresCalculation, ClosingStructuresCalculationContext closingStructuresCalculationContext) {} - private void ValidateAction(ClosingStructuresCalculationContext closingStructuresCalculationContext) {} + private static void ValidateAction(ClosingStructuresCalculationContext closingStructuresCalculationContext) {} - private string ValidateAllDataAvailableAndGetErrorMessageForCalculation(ClosingStructuresCalculationContext context) + private static string ValidateAllDataAvailableAndGetErrorMessageForCalculation(ClosingStructuresCalculationContext context) { return ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection, context.FailureMechanism); } Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs =================================================================== diff -u -rb6f4e414fc874653cc6ad84b80f330b28e69b823 -r1a49563c568eaef8b84743fec1f04ee119bf5c9c --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision b6f4e414fc874653cc6ad84b80f330b28e69b823) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Plugin/GrassCoverErosionInwardsPlugin.cs (.../GrassCoverErosionInwardsPlugin.cs) (revision 1a49563c568eaef8b84743fec1f04ee119bf5c9c) @@ -258,7 +258,7 @@ #region GrassCoverErosionInwardsInputView ViewInfo - private bool CloseInputViewForData(GrassCoverErosionInwardsInputView view, object o) + private static bool CloseInputViewForData(GrassCoverErosionInwardsInputView view, object o) { var calculationContext = o as GrassCoverErosionInwardsCalculationContext; if (calculationContext != null) @@ -302,7 +302,7 @@ #endregion - private void ValidateAll(IEnumerable grassCoverErosionInwardsCalculations, IAssessmentSection assessmentSection) + private static void ValidateAll(IEnumerable grassCoverErosionInwardsCalculations, IAssessmentSection assessmentSection) { foreach (var calculation in grassCoverErosionInwardsCalculations) { @@ -312,7 +312,7 @@ #region GrassCoverErosionInwardsFailureMechanismContext TreeNodeInfo - private object[] FailureMechanismEnabledChildNodeObjects(GrassCoverErosionInwardsFailureMechanismContext grassCoverErosionInwardsFailureMechanismContext) + private static object[] FailureMechanismEnabledChildNodeObjects(GrassCoverErosionInwardsFailureMechanismContext grassCoverErosionInwardsFailureMechanismContext) { GrassCoverErosionInwardsFailureMechanism wrappedData = grassCoverErosionInwardsFailureMechanismContext.WrappedData; return new object[] @@ -323,7 +323,7 @@ }; } - private object[] FailureMechanismDisabledChildNodeObjects(GrassCoverErosionInwardsFailureMechanismContext grassCoverErosionInwardsFailureMechanismContext) + private static object[] FailureMechanismDisabledChildNodeObjects(GrassCoverErosionInwardsFailureMechanismContext grassCoverErosionInwardsFailureMechanismContext) { return new object[] { @@ -504,7 +504,7 @@ nodeData.NotifyObservers(); } - private void GenerateCalculations(CalculationGroup target, GrassCoverErosionInwardsFailureMechanism failureMechanism, IEnumerable dikeProfiles) + private static void GenerateCalculations(CalculationGroup target, GrassCoverErosionInwardsFailureMechanism failureMechanism, IEnumerable dikeProfiles) { foreach (var profile in dikeProfiles) { @@ -618,7 +618,7 @@ context.AssessmentSection)); } - private void CalculationContextOnNodeRemoved(GrassCoverErosionInwardsCalculationContext context, object parentData) + private static void CalculationContextOnNodeRemoved(GrassCoverErosionInwardsCalculationContext context, object parentData) { var calculationGroupContext = parentData as GrassCoverErosionInwardsCalculationGroupContext; if (calculationGroupContext != null) Index: Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs =================================================================== diff -u -rb6f4e414fc874653cc6ad84b80f330b28e69b823 -r1a49563c568eaef8b84743fec1f04ee119bf5c9c --- Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision b6f4e414fc874653cc6ad84b80f330b28e69b823) +++ Ringtoets/GrassCoverErosionOutwards/src/Ringtoets.GrassCoverErosionOutwards.Plugin/GrassCoverErosionOutwardsPlugin.cs (.../GrassCoverErosionOutwardsPlugin.cs) (revision 1a49563c568eaef8b84743fec1f04ee119bf5c9c) @@ -364,7 +364,7 @@ #region GrassCoverErosionOutwardsFailureMechanismContext TreeNodeInfo - private object[] FailureMechanismEnabledChildNodeObjects(GrassCoverErosionOutwardsFailureMechanismContext failureMechanismContext) + private static object[] FailureMechanismEnabledChildNodeObjects(GrassCoverErosionOutwardsFailureMechanismContext failureMechanismContext) { GrassCoverErosionOutwardsFailureMechanism failureMechanism = failureMechanismContext.WrappedData; return new object[] @@ -375,7 +375,7 @@ }; } - private object[] FailureMechanismDisabledChildNodeObjects(GrassCoverErosionOutwardsFailureMechanismContext failureMechanismContext) + private static object[] FailureMechanismDisabledChildNodeObjects(GrassCoverErosionOutwardsFailureMechanismContext failureMechanismContext) { return new object[] { @@ -430,7 +430,7 @@ .Build(); } - private object[] GetHydraulicBoundariesGroupContextChildNodeObjects(HydraulicBoundariesGroupContext hydraulicBoundariesGroupContext) + private static object[] GetHydraulicBoundariesGroupContextChildNodeObjects(HydraulicBoundariesGroupContext hydraulicBoundariesGroupContext) { IAssessmentSection assessmentSection = hydraulicBoundariesGroupContext.AssessmentSection; if (assessmentSection.HydraulicBoundaryDatabase == null) @@ -566,7 +566,7 @@ #region GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext TreeNodeInfo - private object[] WaveConditionsCalculationGroupChildrenNodeObjects(GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext nodeData) + private static object[] WaveConditionsCalculationGroupChildrenNodeObjects(GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext nodeData) { var childNodeObjects = new List(); @@ -686,7 +686,7 @@ calculationCollection); } - private void AddWaveConditionsCalculation(GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext nodeData) + private static void AddWaveConditionsCalculation(GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext nodeData) { var calculation = new GrassCoverErosionOutwardsWaveConditionsCalculation { @@ -698,20 +698,20 @@ nodeData.WrappedData.NotifyObservers(); } - private void ValidateAll(IEnumerable calculations, HydraulicBoundaryDatabase database) + private static void ValidateAll(IEnumerable calculations, HydraulicBoundaryDatabase database) { foreach (GrassCoverErosionOutwardsWaveConditionsCalculation calculation in calculations) { new GrassCoverErosionOutwardsWaveConditionsCalculationService().Validate(calculation, database.FilePath); } } - private string ValidateAllDataAvailableAndGetErrorMessageForCalculationGroup(GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext context) + private static string ValidateAllDataAvailableAndGetErrorMessageForCalculationGroup(GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext context) { return ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection); } - private string ValidateAllDataAvailableAndGetErrorMessage(IAssessmentSection assessmentSection) + private static string ValidateAllDataAvailableAndGetErrorMessage(IAssessmentSection assessmentSection) { if (assessmentSection.HydraulicBoundaryDatabase == null) { @@ -754,8 +754,8 @@ } } - private void WaveConditionsCalculationGroupContextOnNodeRemoved(GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext nodeData, - object parentNodeData) + private static void WaveConditionsCalculationGroupContextOnNodeRemoved(GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext nodeData, + object parentNodeData) { var parentGroupContext = (GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext) parentNodeData; @@ -768,7 +768,7 @@ #region GrassCoverErosionOutwardsWaveConditionsCalculationContext TreeNodeInfo - private object[] WaveConditionsCalculationContextChildNodeObjects(GrassCoverErosionOutwardsWaveConditionsCalculationContext context) + private static object[] WaveConditionsCalculationContextChildNodeObjects(GrassCoverErosionOutwardsWaveConditionsCalculationContext context) { var childNodes = new List { @@ -821,7 +821,7 @@ .Build(); } - private string ValidateAllDataAvailableAndGetErrorMessageForCalculation(GrassCoverErosionOutwardsWaveConditionsCalculationContext context) + private static string ValidateAllDataAvailableAndGetErrorMessageForCalculation(GrassCoverErosionOutwardsWaveConditionsCalculationContext context) { return ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection); } @@ -837,8 +837,8 @@ calculation.NotifyObservers(); } - private void WaveConditionsCalculationContextOnNodeRemoved(GrassCoverErosionOutwardsWaveConditionsCalculationContext nodeData, - object parentNodeData) + private static void WaveConditionsCalculationContextOnNodeRemoved(GrassCoverErosionOutwardsWaveConditionsCalculationContext nodeData, + object parentNodeData) { var calculationGroupContext = parentNodeData as GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext; if (calculationGroupContext != null) Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs =================================================================== diff -u -r3dc04fc5fb21350c7b4da44fdba336aead86560e -r1a49563c568eaef8b84743fec1f04ee119bf5c9c --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision 3dc04fc5fb21350c7b4da44fdba336aead86560e) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.Plugin/HeightStructuresPlugin.cs (.../HeightStructuresPlugin.cs) (revision 1a49563c568eaef8b84743fec1f04ee119bf5c9c) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Collections; using System.Collections.Generic; using System.Drawing; @@ -28,7 +27,6 @@ using System.Windows.Forms; using Core.Common.Base; using Core.Common.Controls.TreeView; -using Core.Common.Gui.Commands; using Core.Common.Gui.ContextMenu; using Core.Common.Gui.Forms.ProgressDialog; using Core.Common.Gui.Plugin; @@ -194,7 +192,7 @@ assessmentSection)).ToArray()); } - private void ValidateAll(IEnumerable heightStructuresCalculations, IAssessmentSection assessmentSection) + private static void ValidateAll(IEnumerable heightStructuresCalculations, IAssessmentSection assessmentSection) { foreach (var calculation in heightStructuresCalculations) { @@ -280,7 +278,7 @@ #region HeightStructuresFailureMechanismContext TreeNodeInfo - private object[] FailureMechanismEnabledChildNodeObjects(HeightStructuresFailureMechanismContext context) + private static object[] FailureMechanismEnabledChildNodeObjects(HeightStructuresFailureMechanismContext context) { HeightStructuresFailureMechanism wrappedData = context.WrappedData; return new object[] @@ -311,7 +309,7 @@ }; } - private object[] FailureMechanismDisabledChildNodeObjects(HeightStructuresFailureMechanismContext context) + private static object[] FailureMechanismDisabledChildNodeObjects(HeightStructuresFailureMechanismContext context) { return new object[] { @@ -589,7 +587,7 @@ context.AssessmentSection)); } - private void CalculationContextOnNodeRemoved(HeightStructuresCalculationContext context, object parentData) + private static void CalculationContextOnNodeRemoved(HeightStructuresCalculationContext context, object parentData) { var calculationGroupContext = parentData as HeightStructuresCalculationGroupContext; if (calculationGroupContext != null) Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r6b6f344a9cf3e6c44b63320dfa3f5c828c4221d8 -r1a49563c568eaef8b84743fec1f04ee119bf5c9c --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 6b6f344a9cf3e6c44b63320dfa3f5c828c4221d8) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 1a49563c568eaef8b84743fec1f04ee119bf5c9c) @@ -700,15 +700,15 @@ }; } - private void RemoveOnOpenProjectListener(IProjectOwner projectOwner) + private static void RemoveOnOpenProjectListener(IProjectOwner projectOwner) { if (projectOwner != null) { projectOwner.ProjectOpened -= VerifyHydraulicBoundaryDatabasePath; } } - private void AddOnOpenProjectListener(IProjectOwner projectOwner) + private static void AddOnOpenProjectListener(IProjectOwner projectOwner) { if (projectOwner != null) { @@ -779,7 +779,7 @@ #region DesignWaterLevelLocationsView ViewInfo - private bool CloseDesignWaterLevelLocationsViewForData(DesignWaterLevelLocationsView view, object dataToCloseFor) + private static bool CloseDesignWaterLevelLocationsViewForData(DesignWaterLevelLocationsView view, object dataToCloseFor) { var viewData = view.AssessmentSection; var assessmentSection = dataToCloseFor as IAssessmentSection; @@ -791,7 +791,7 @@ #region WaveHeightLocationsView ViewInfo - private bool CloseWaveHeightLocationsViewForData(WaveHeightLocationsView view, object dataToCloseFor) + private static bool CloseWaveHeightLocationsViewForData(WaveHeightLocationsView view, object dataToCloseFor) { var viewData = view.AssessmentSection; var assessmentSection = dataToCloseFor as IAssessmentSection; @@ -801,6 +801,39 @@ #endregion + #region FailureMechanismSectionsContext TreeNodeInfo + + private ContextMenuStrip FailureMechanismSectionsContextMenuStrip(FailureMechanismSectionsContext nodeData, object parentData, TreeViewControl treeViewControl) + { + return Gui.Get(nodeData, treeViewControl) + .AddImportItem() + .Build(); + } + + #endregion + + private class FailureMechanismContextAssociation + { + private readonly Func createFailureMechanismContext; + private readonly Type failureMechanismType; + + public FailureMechanismContextAssociation(Type failureMechanismType, Func createFailureMechanismContext) + { + this.createFailureMechanismContext = createFailureMechanismContext; + this.failureMechanismType = failureMechanismType; + } + + public bool Match(IFailureMechanism failureMechanism) + { + return failureMechanism.GetType() == failureMechanismType; + } + + public object Create(IFailureMechanism failureMechanism, IAssessmentSection assessmentSection) + { + return createFailureMechanismContext(failureMechanism, assessmentSection); + } + } + #region Comment ViewInfo private static bool CloseCommentViewForData(CommentView commentView, object o) @@ -867,31 +900,9 @@ #endregion - private class FailureMechanismContextAssociation - { - private readonly Func createFailureMechanismContext; - private readonly Type failureMechanismType; - - public FailureMechanismContextAssociation(Type failureMechanismType, Func createFailureMechanismContext) - { - this.createFailureMechanismContext = createFailureMechanismContext; - this.failureMechanismType = failureMechanismType; - } - - public bool Match(IFailureMechanism failureMechanism) - { - return failureMechanism.GetType() == failureMechanismType; - } - - public object Create(IFailureMechanism failureMechanism, IAssessmentSection assessmentSection) - { - return createFailureMechanismContext(failureMechanism, assessmentSection); - } - } - #region AssessmentSection TreeNodeInfo - private object[] AssessmentSectionChildNodeObjects(AssessmentSection nodeData) + private static object[] AssessmentSectionChildNodeObjects(AssessmentSection nodeData) { var childNodes = new List { @@ -917,13 +928,13 @@ ); } - private void AssessmentSectionOnNodeRenamed(IAssessmentSection nodeData, string newName) + private static void AssessmentSectionOnNodeRenamed(IAssessmentSection nodeData, string newName) { nodeData.Name = newName; nodeData.NotifyObservers(); } - private void AssessmentSectionOnNodeRemoved(IAssessmentSection nodeData, object parentNodeData) + private static void AssessmentSectionOnNodeRemoved(IAssessmentSection nodeData, object parentNodeData) { var parentProject = (RingtoetsProject) parentNodeData; var assessmentSection = (AssessmentSection) nodeData; @@ -948,20 +959,9 @@ #endregion - #region FailureMechanismSectionsContext TreeNodeInfo - - private ContextMenuStrip FailureMechanismSectionsContextMenuStrip(FailureMechanismSectionsContext nodeData, object parentData, TreeViewControl treeViewControl) - { - return Gui.Get(nodeData, treeViewControl) - .AddImportItem() - .Build(); - } - - #endregion - #region StandAloneFailureMechanismContext TreeNodeInfo - private object[] StandAloneFailureMechanismEnabledChildNodeObjects(FailureMechanismContext nodeData) + private static object[] StandAloneFailureMechanismEnabledChildNodeObjects(FailureMechanismContext nodeData) { return new object[] { @@ -974,15 +974,15 @@ }; } - private object[] StandAloneFailureMechanismDisabledChildNodeObjects(FailureMechanismContext nodeData) + private static object[] StandAloneFailureMechanismDisabledChildNodeObjects(FailureMechanismContext nodeData) { return new object[] { new CommentContext(nodeData.WrappedData) }; } - private IList GetInputs(IFailureMechanism nodeData, IAssessmentSection assessmentSection) + private static IList GetInputs(IFailureMechanism nodeData, IAssessmentSection assessmentSection) { return new ArrayList { @@ -991,7 +991,7 @@ }; } - private IList GetOutputs(IFailureMechanism nodeData) + private static IList GetOutputs(IFailureMechanism nodeData) { var duneErosion = nodeData as IHasSectionResults; var grassCoverSlipOffInwards = nodeData as IHasSectionResults; @@ -1115,7 +1115,7 @@ #region CategoryTreeFolder TreeNodeInfo - private Image GetFolderIcon(TreeFolderCategory category) + private static Image GetFolderIcon(TreeFolderCategory category) { switch (category) { Index: Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs =================================================================== diff -u -rb6f4e414fc874653cc6ad84b80f330b28e69b823 -r1a49563c568eaef8b84743fec1f04ee119bf5c9c --- Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision b6f4e414fc874653cc6ad84b80f330b28e69b823) +++ Ringtoets/Piping/src/Ringtoets.Piping.Plugin/PipingPlugin.cs (.../PipingPlugin.cs) (revision 1a49563c568eaef8b84743fec1f04ee119bf5c9c) @@ -53,7 +53,7 @@ namespace Ringtoets.Piping.Plugin { /// - /// The plugin for the . + /// The plug-in for the . /// public class PipingPlugin : PluginBase { @@ -84,7 +84,7 @@ Image = PipingFormsResources.PipingSurfaceLineIcon, FileFilter = string.Format("{0} {1}", PipingFormsResources.PipingSurfaceLinesCollection_DisplayName, - RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter), + RingtoetsCommonFormsResources.DataTypeDisplayName_csv_file_filter), IsEnabled = context => context.AssessmentSection.ReferenceLine != null, CreateFileImporter = (context, filePath) => new PipingSurfaceLinesCsvImporter(context.WrappedData, context.AssessmentSection.ReferenceLine, @@ -288,7 +288,7 @@ # region PipingFailureMechanismView ViewInfo - private bool ClosePipingFailureMechanismViewForData(PipingFailureMechanismView view, object o) + private static bool ClosePipingFailureMechanismViewForData(PipingFailureMechanismView view, object o) { var assessmentSection = o as IAssessmentSection; var pipingFailureMechanism = o as PipingFailureMechanism; @@ -376,7 +376,7 @@ #region PipingInputView ViewInfo - private bool ClosePipingInputViewForData(PipingInputView view, object o) + private static bool ClosePipingInputViewForData(PipingInputView view, object o) { var pipingCalculationScenarioContext = o as PipingCalculationScenarioContext; if (pipingCalculationScenarioContext != null) @@ -504,7 +504,7 @@ return failureMechanism.Calculations.OfType(); } - private object[] FailureMechanismEnabledChildNodeObjects(PipingFailureMechanismContext pipingFailureMechanismContext) + private static object[] FailureMechanismEnabledChildNodeObjects(PipingFailureMechanismContext pipingFailureMechanismContext) { PipingFailureMechanism wrappedData = pipingFailureMechanismContext.WrappedData; return new object[] @@ -515,7 +515,7 @@ }; } - private object[] FailureMechanismDisabledChildNodeObjects(PipingFailureMechanismContext pipingFailureMechanismContext) + private static object[] FailureMechanismDisabledChildNodeObjects(PipingFailureMechanismContext pipingFailureMechanismContext) { return new object[] { @@ -534,7 +534,7 @@ }; } - private IList GetOutputs(PipingFailureMechanism failureMechanism) + private static IList GetOutputs(PipingFailureMechanism failureMechanism) { return new ArrayList { @@ -592,7 +592,7 @@ return childNodes.ToArray(); } - private void PipingCalculationContextOnNodeRemoved(PipingCalculationScenarioContext pipingCalculationScenarioContext, object parentNodeData) + private static void PipingCalculationContextOnNodeRemoved(PipingCalculationScenarioContext pipingCalculationScenarioContext, object parentNodeData) { var calculationGroupContext = parentNodeData as PipingCalculationGroupContext; if (calculationGroupContext != null) @@ -618,7 +618,7 @@ # region PipingCalculationGroupContext TreeNodeInfo - private object[] PipingCalculationGroupContextChildNodeObjects(PipingCalculationGroupContext nodeData) + private static object[] PipingCalculationGroupContextChildNodeObjects(PipingCalculationGroupContext nodeData) { var childNodeObjects = new List(); @@ -736,15 +736,15 @@ nodeData.NotifyObservers(); } - private void GeneratePipingCalculations(CalculationGroup target, IEnumerable surfaceLines, IEnumerable soilModels, GeneralPipingInput generalInput) + private static void GeneratePipingCalculations(CalculationGroup target, IEnumerable surfaceLines, IEnumerable soilModels, GeneralPipingInput generalInput) { foreach (var group in PipingCalculationConfigurationHelper.GenerateCalculationItemsStructure(surfaceLines, soilModels, generalInput)) { target.Children.Add(group); } } - private void PipingCalculationGroupContextOnNodeRemoved(PipingCalculationGroupContext nodeData, object parentNodeData) + private static void PipingCalculationGroupContextOnNodeRemoved(PipingCalculationGroupContext nodeData, object parentNodeData) { var parentGroupContext = (PipingCalculationGroupContext) parentNodeData; Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs =================================================================== diff -u -rb6f4e414fc874653cc6ad84b80f330b28e69b823 -r1a49563c568eaef8b84743fec1f04ee119bf5c9c --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision b6f4e414fc874653cc6ad84b80f330b28e69b823) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Plugin/StabilityPointStructuresPlugin.cs (.../StabilityPointStructuresPlugin.cs) (revision 1a49563c568eaef8b84743fec1f04ee119bf5c9c) @@ -204,7 +204,9 @@ } private static void ValidateAll(IEnumerable calculations, IAssessmentSection assessmentSection) {} + private static void CalculateAll(StabilityPointStructuresFailureMechanismContext context) {} + private static void CalculateAll(CalculationGroup group, StabilityPointStructuresCalculationGroupContext context) {} #endregion @@ -213,7 +215,7 @@ #region StabilityPointStructuresFailureMechanismContext TreeNodeInfo - private object[] FailureMechanismEnabledChildNodeObjects(StabilityPointStructuresFailureMechanismContext stabilityPointStructuresFailureMechanismContext) + private static object[] FailureMechanismEnabledChildNodeObjects(StabilityPointStructuresFailureMechanismContext stabilityPointStructuresFailureMechanismContext) { StabilityPointStructuresFailureMechanism wrappedData = stabilityPointStructuresFailureMechanismContext.WrappedData; return new object[] @@ -230,7 +232,7 @@ }; } - private object[] FailureMechanismDisabledChildNodeObjects(StabilityPointStructuresFailureMechanismContext stabilityPointStructuresFailureMechanismContext) + private static object[] FailureMechanismDisabledChildNodeObjects(StabilityPointStructuresFailureMechanismContext stabilityPointStructuresFailureMechanismContext) { return new object[] { @@ -382,7 +384,7 @@ .Build(); } - private StrictContextMenuItem CreateGenerateCalculationsItem(StabilityPointStructuresCalculationGroupContext nodeData) + private static StrictContextMenuItem CreateGenerateCalculationsItem(StabilityPointStructuresCalculationGroupContext nodeData) { var generateCalculationsItem = new StrictContextMenuItem( RingtoetsCommonFormsResources.CalculationGroup_Generate_Scenarios, @@ -469,9 +471,9 @@ return ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection, context.FailureMechanism); } - private void Calculate(StabilityPointStructuresCalculation calculation, StabilityPointStructuresCalculationContext context) {} + private static void Calculate(StabilityPointStructuresCalculation calculation, StabilityPointStructuresCalculationContext context) {} - private void CalculationContextOnNodeRemoved(StabilityPointStructuresCalculationContext context, object parentData) + private static void CalculationContextOnNodeRemoved(StabilityPointStructuresCalculationContext context, object parentData) { var calculationGroupContext = parentData as StabilityPointStructuresCalculationGroupContext; if (calculationGroupContext != null) Index: Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs =================================================================== diff -u -rb6f4e414fc874653cc6ad84b80f330b28e69b823 -r1a49563c568eaef8b84743fec1f04ee119bf5c9c --- Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision b6f4e414fc874653cc6ad84b80f330b28e69b823) +++ Ringtoets/StabilityStoneCover/src/Ringtoets.StabilityStoneCover.Plugin/StabilityStoneCoverPlugin.cs (.../StabilityStoneCoverPlugin.cs) (revision 1a49563c568eaef8b84743fec1f04ee119bf5c9c) @@ -53,7 +53,7 @@ namespace Ringtoets.StabilityStoneCover.Plugin { /// - /// The plugin for the . + /// The plug-in for the . /// public class StabilityStoneCoverPlugin : PluginBase { @@ -190,7 +190,7 @@ #region StabilityStoneCoverFailureMechanismContext - private object[] FailureMechanismEnabledChildNodeObjects(StabilityStoneCoverFailureMechanismContext failureMechanismContext) + private static object[] FailureMechanismEnabledChildNodeObjects(StabilityStoneCoverFailureMechanismContext failureMechanismContext) { StabilityStoneCoverFailureMechanism wrappedData = failureMechanismContext.WrappedData; return new object[] @@ -201,7 +201,7 @@ }; } - private object[] FailureMechanismDisabledChildNodeObjects(StabilityStoneCoverFailureMechanismContext failureMechanismContext) + private static object[] FailureMechanismDisabledChildNodeObjects(StabilityStoneCoverFailureMechanismContext failureMechanismContext) { return new object[] { @@ -219,7 +219,7 @@ }; } - private IList GetOutputs(StabilityStoneCoverFailureMechanism failureMechanism) + private static IList GetOutputs(StabilityStoneCoverFailureMechanism failureMechanism) { return new ArrayList { @@ -260,7 +260,7 @@ #region StabilityStoneCoverWaveConditionsCalculationGroupContext - private object[] WaveConditionsCalculationGroupContextChildNodeObjects(StabilityStoneCoverWaveConditionsCalculationGroupContext nodeData) + private static object[] WaveConditionsCalculationGroupContextChildNodeObjects(StabilityStoneCoverWaveConditionsCalculationGroupContext nodeData) { var childNodeObjects = new List(); @@ -338,17 +338,17 @@ .Build(); } - private string ValidateAllDataAvailableAndGetErrorMessageForCalculationGroup(StabilityStoneCoverWaveConditionsCalculationGroupContext context) + private static string ValidateAllDataAvailableAndGetErrorMessageForCalculationGroup(StabilityStoneCoverWaveConditionsCalculationGroupContext context) { return ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection); } - private string ValidateAllDataAvailableAndGetErrorMessageForCalculation(StabilityStoneCoverWaveConditionsCalculationContext context) + private static string ValidateAllDataAvailableAndGetErrorMessageForCalculation(StabilityStoneCoverWaveConditionsCalculationContext context) { return ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection); } - private string ValidateAllDataAvailableAndGetErrorMessage(IAssessmentSection assessmentSection) + private static string ValidateAllDataAvailableAndGetErrorMessage(IAssessmentSection assessmentSection) { if (assessmentSection.HydraulicBoundaryDatabase == null) { @@ -405,7 +405,7 @@ calculationCollection); } - private void AddWaveConditionsCalculation(StabilityStoneCoverWaveConditionsCalculationGroupContext nodeData) + private static void AddWaveConditionsCalculation(StabilityStoneCoverWaveConditionsCalculationGroupContext nodeData) { var calculation = new StabilityStoneCoverWaveConditionsCalculation { @@ -417,7 +417,7 @@ nodeData.WrappedData.NotifyObservers(); } - private void ValidateAll(IEnumerable calculations, HydraulicBoundaryDatabase database) + private static void ValidateAll(IEnumerable calculations, HydraulicBoundaryDatabase database) { foreach (StabilityStoneCoverWaveConditionsCalculation calculation in calculations) { @@ -451,7 +451,7 @@ } } - private void WaveConditionsCalculationGroupContextOnNodeRemoved(StabilityStoneCoverWaveConditionsCalculationGroupContext nodeData, object parentNodeData) + private static void WaveConditionsCalculationGroupContextOnNodeRemoved(StabilityStoneCoverWaveConditionsCalculationGroupContext nodeData, object parentNodeData) { var parentGroupContext = (StabilityStoneCoverWaveConditionsCalculationGroupContext) parentNodeData; @@ -464,7 +464,7 @@ #region StabilityStoneCoverWaveConditionsCalculationContext - private object[] WaveConditionsCalculationContextChildNodeObjects(StabilityStoneCoverWaveConditionsCalculationContext context) + private static object[] WaveConditionsCalculationContextChildNodeObjects(StabilityStoneCoverWaveConditionsCalculationContext context) { var childNodes = new List { @@ -527,7 +527,7 @@ calculation.NotifyObservers(); } - private void WaveConditionsCalculationContextOnNodeRemoved(StabilityStoneCoverWaveConditionsCalculationContext nodeData, object parentNodeData) + private static void WaveConditionsCalculationContextOnNodeRemoved(StabilityStoneCoverWaveConditionsCalculationContext nodeData, object parentNodeData) { var calculationGroupContext = parentNodeData as StabilityStoneCoverWaveConditionsCalculationGroupContext; if (calculationGroupContext != null) Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs =================================================================== diff -u -rb6f4e414fc874653cc6ad84b80f330b28e69b823 -r1a49563c568eaef8b84743fec1f04ee119bf5c9c --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision b6f4e414fc874653cc6ad84b80f330b28e69b823) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Plugin/WaveImpactAsphaltCoverPlugin.cs (.../WaveImpactAsphaltCoverPlugin.cs) (revision 1a49563c568eaef8b84743fec1f04ee119bf5c9c) @@ -193,7 +193,7 @@ #region WaveImpactAsphaltCoverFailureMechanismContext - private object[] FailureMechanismEnabledChildNodeObjects(WaveImpactAsphaltCoverFailureMechanismContext failureMechanismContext) + private static object[] FailureMechanismEnabledChildNodeObjects(WaveImpactAsphaltCoverFailureMechanismContext failureMechanismContext) { WaveImpactAsphaltCoverFailureMechanism wrappedData = failureMechanismContext.WrappedData; return new object[] @@ -204,7 +204,7 @@ }; } - private object[] FailureMechanismDisabledChildNodeObjects(WaveImpactAsphaltCoverFailureMechanismContext failureMechanismContext) + private static object[] FailureMechanismDisabledChildNodeObjects(WaveImpactAsphaltCoverFailureMechanismContext failureMechanismContext) { return new object[] { @@ -222,7 +222,7 @@ }; } - private IList GetOutputs(WaveImpactAsphaltCoverFailureMechanism failureMechanism) + private static IList GetOutputs(WaveImpactAsphaltCoverFailureMechanism failureMechanism) { return new ArrayList { @@ -265,7 +265,7 @@ #region WaveImpactAsphaltCover TreeNodeOnfo - private object[] WaveConditionsCalculationGroupContextChildNodeObjects(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext nodeData) + private static object[] WaveConditionsCalculationGroupContextChildNodeObjects(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext nodeData) { var childNodeObjects = new List(); @@ -344,17 +344,17 @@ .Build(); } - private string ValidateAllDataAvailableAndGetErrorMessageForCalculationGroup(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext context) + private static string ValidateAllDataAvailableAndGetErrorMessageForCalculationGroup(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext context) { return ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection); } - private string ValidateAllDataAvailableAndGetErrorMessageForCalculation(WaveImpactAsphaltCoverWaveConditionsCalculationContext context) + private static string ValidateAllDataAvailableAndGetErrorMessageForCalculation(WaveImpactAsphaltCoverWaveConditionsCalculationContext context) { return ValidateAllDataAvailableAndGetErrorMessage(context.AssessmentSection); } - private string ValidateAllDataAvailableAndGetErrorMessage(IAssessmentSection assessmentSection) + private static string ValidateAllDataAvailableAndGetErrorMessage(IAssessmentSection assessmentSection) { if (assessmentSection.HydraulicBoundaryDatabase == null) { @@ -411,7 +411,7 @@ calculationCollection); } - private void AddWaveConditionsCalculation(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext nodeData) + private static void AddWaveConditionsCalculation(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext nodeData) { var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation { @@ -423,7 +423,7 @@ nodeData.WrappedData.NotifyObservers(); } - private void ValidateAll(IEnumerable calculations, HydraulicBoundaryDatabase database) + private static void ValidateAll(IEnumerable calculations, HydraulicBoundaryDatabase database) { foreach (WaveImpactAsphaltCoverWaveConditionsCalculation calculation in calculations) { @@ -457,7 +457,7 @@ } } - private void WaveConditionsCalculationGroupContextOnNodeRemoved(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext nodeData, object parentNodeData) + private static void WaveConditionsCalculationGroupContextOnNodeRemoved(WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext nodeData, object parentNodeData) { var parentGroupContext = (WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext) parentNodeData; @@ -470,7 +470,7 @@ #region WaveImpactAsphaltCoverWaveConditionsCalculationContext - private object[] WaveConditionsCalculationContextChildNodeObjects(WaveImpactAsphaltCoverWaveConditionsCalculationContext context) + private static object[] WaveConditionsCalculationContextChildNodeObjects(WaveImpactAsphaltCoverWaveConditionsCalculationContext context) { var childNodes = new List { @@ -533,7 +533,7 @@ calculation.NotifyObservers(); } - private void WaveConditionsCalculationContextOnNodeRemoved(WaveImpactAsphaltCoverWaveConditionsCalculationContext nodeData, object parentNodeData) + private static void WaveConditionsCalculationContextOnNodeRemoved(WaveImpactAsphaltCoverWaveConditionsCalculationContext nodeData, object parentNodeData) { var calculationGroupContext = parentNodeData as WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext; if (calculationGroupContext != null)