Index: Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PropertyClasses/ClosingStructuresFailurePathProperties.cs =================================================================== diff -u -r3c1b3532f198675db6439fd52207f1d0f3d1fe1b -r2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9 --- Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PropertyClasses/ClosingStructuresFailurePathProperties.cs (.../ClosingStructuresFailurePathProperties.cs) (revision 3c1b3532f198675db6439fd52207f1d0f3d1fe1b) +++ Riskeer/ClosingStructures/src/Riskeer.ClosingStructures.Forms/PropertyClasses/ClosingStructuresFailurePathProperties.cs (.../ClosingStructuresFailurePathProperties.cs) (revision 2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9) @@ -59,15 +59,10 @@ [DynamicVisibleValidationMethod] public bool DynamicVisibleValidationMethod(string propertyName) { - if (!data.InAssembly && ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName)) - { - return false; - } - - return true; + return data.InAssembly || !ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName); } - private bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) + private static bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) { return nameof(Contribution).Equals(propertyName) || nameof(C).Equals(propertyName) Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionStub.cs =================================================================== diff -u -r07b3862293afdc4c605cfc444938462a668fad2d -r2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9 --- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionStub.cs (.../AssessmentSectionStub.cs) (revision 07b3862293afdc4c605cfc444938462a668fad2d) +++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/AssessmentSectionStub.cs (.../AssessmentSectionStub.cs) (revision 2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9) @@ -151,7 +151,7 @@ public void ChangeComposition(AssessmentSectionComposition newComposition) { - throw new NotImplementedException("Stub only verifies Observable and basic behaviour, use a proper stub when this function is necessary."); + throw new NotImplementedException("Stub only verifies Observable and basic behavior, use a proper stub when this function is necessary."); } private void AddHydraulicBoundaryLocation(HydraulicBoundaryLocation hydraulicBoundaryLocation, bool setCalculationOutput) Index: Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/FailurePathInAssemblyTreeNodeInfoTestFixtureBase.cs =================================================================== diff -u -re9e1bd0d1ae282ba78235a7ccd25bc30dac0e727 -r2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9 --- Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/FailurePathInAssemblyTreeNodeInfoTestFixtureBase.cs (.../FailurePathInAssemblyTreeNodeInfoTestFixtureBase.cs) (revision e9e1bd0d1ae282ba78235a7ccd25bc30dac0e727) +++ Riskeer/Common/test/Riskeer.Common.Plugin.TestUtil/FailurePathInAssemblyTreeNodeInfoTestFixtureBase.cs (.../FailurePathInAssemblyTreeNodeInfoTestFixtureBase.cs) (revision 2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9) @@ -232,7 +232,7 @@ /// Creates a new instance of . /// /// The index of the InAssembly context menu item when the - /// is in the assembly. + /// is part of the assembly. /// The index of the InAssembly context menu item when the /// is not part of the assembly. protected FailurePathInAssemblyTreeNodeInfoTestFixtureBase(int contextMenuIndexWhenInAssemblyTrue, Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionFailurePathProperties.cs =================================================================== diff -u -r3c1b3532f198675db6439fd52207f1d0f3d1fe1b -r2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9 --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionFailurePathProperties.cs (.../DuneErosionFailurePathProperties.cs) (revision 3c1b3532f198675db6439fd52207f1d0f3d1fe1b) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/PropertyClasses/DuneErosionFailurePathProperties.cs (.../DuneErosionFailurePathProperties.cs) (revision 2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9) @@ -107,15 +107,10 @@ [DynamicVisibleValidationMethod] public bool DynamicVisibleValidationMethod(string propertyName) { - if (!data.InAssembly && ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName)) - { - return false; - } - - return true; + return data.InAssembly || !ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName); } - private bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) + private static bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) { return nameof(Contribution).Equals(propertyName) || nameof(N).Equals(propertyName); Index: Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailurePathProperties.cs =================================================================== diff -u -r3c1b3532f198675db6439fd52207f1d0f3d1fe1b -r2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9 --- Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailurePathProperties.cs (.../GrassCoverErosionInwardsFailurePathProperties.cs) (revision 3c1b3532f198675db6439fd52207f1d0f3d1fe1b) +++ Riskeer/GrassCoverErosionInwards/src/Riskeer.GrassCoverErosionInwards.Forms/PropertyClasses/GrassCoverErosionInwardsFailurePathProperties.cs (.../GrassCoverErosionInwardsFailurePathProperties.cs) (revision 2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9) @@ -72,12 +72,7 @@ [DynamicVisibleValidationMethod] public bool DynamicVisibleValidationMethod(string propertyName) { - if (!data.InAssembly && ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName)) - { - return false; - } - - return true; + return data.InAssembly || !ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName); } private static void NotifyAffectedObjects(IEnumerable affectedObjects) @@ -88,7 +83,7 @@ } } - private bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) + private static bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) { return nameof(Contribution).Equals(propertyName) || nameof(N).Equals(propertyName); Index: Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/PropertyClasses/HeightStructuresFailurePathProperties.cs =================================================================== diff -u -r3c1b3532f198675db6439fd52207f1d0f3d1fe1b -r2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9 --- Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/PropertyClasses/HeightStructuresFailurePathProperties.cs (.../HeightStructuresFailurePathProperties.cs) (revision 3c1b3532f198675db6439fd52207f1d0f3d1fe1b) +++ Riskeer/HeightStructures/src/Riskeer.HeightStructures.Forms/PropertyClasses/HeightStructuresFailurePathProperties.cs (.../HeightStructuresFailurePathProperties.cs) (revision 2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9) @@ -55,15 +55,10 @@ [DynamicVisibleValidationMethod] public bool DynamicVisibleValidationMethod(string propertyName) { - if (!data.InAssembly && ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName)) - { - return false; - } - - return true; + return data.InAssembly || !ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName); } - private bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) + private static bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) { return nameof(Contribution).Equals(propertyName) || nameof(N).Equals(propertyName); Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/SpecificFailurePathProperties.cs =================================================================== diff -u -r3c1b3532f198675db6439fd52207f1d0f3d1fe1b -r2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9 --- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/SpecificFailurePathProperties.cs (.../SpecificFailurePathProperties.cs) (revision 3c1b3532f198675db6439fd52207f1d0f3d1fe1b) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/SpecificFailurePathProperties.cs (.../SpecificFailurePathProperties.cs) (revision 2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9) @@ -104,15 +104,10 @@ [DynamicVisibleValidationMethod] public bool DynamicVisibleValidationMethod(string propertyName) { - if (!data.InAssembly && ShouldHidePropertyWhenFailurePathNotPartOfAssembly(propertyName)) - { - return false; - } - - return true; + return data.InAssembly || !ShouldHidePropertyWhenFailurePathNotPartOfAssembly(propertyName); } - private bool ShouldHidePropertyWhenFailurePathNotPartOfAssembly(string propertyName) + private static bool ShouldHidePropertyWhenFailurePathNotPartOfAssembly(string propertyName) { return nameof(N).Equals(propertyName); } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/MacroStabilityOutwardsFailurePathProperties.cs =================================================================== diff -u -r3c1b3532f198675db6439fd52207f1d0f3d1fe1b -r2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9 --- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/MacroStabilityOutwardsFailurePathProperties.cs (.../MacroStabilityOutwardsFailurePathProperties.cs) (revision 3c1b3532f198675db6439fd52207f1d0f3d1fe1b) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/MacroStabilityOutwardsFailurePathProperties.cs (.../MacroStabilityOutwardsFailurePathProperties.cs) (revision 2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9) @@ -73,15 +73,10 @@ [DynamicVisibleValidationMethod] public bool DynamicVisibleValidationMethod(string propertyName) { - if (!data.InAssembly && ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName)) - { - return false; - } - - return true; + return data.InAssembly || !ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName); } - private bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) + private static bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) { return nameof(Contribution).Equals(propertyName) || nameof(A).Equals(propertyName) Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/PipingStructureFailurePathProperties.cs =================================================================== diff -u -r3c1b3532f198675db6439fd52207f1d0f3d1fe1b -r2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9 --- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/PipingStructureFailurePathProperties.cs (.../PipingStructureFailurePathProperties.cs) (revision 3c1b3532f198675db6439fd52207f1d0f3d1fe1b) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/PipingStructureFailurePathProperties.cs (.../PipingStructureFailurePathProperties.cs) (revision 2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9) @@ -81,15 +81,10 @@ [DynamicVisibleValidationMethod] public bool DynamicVisibleValidationMethod(string propertyName) { - if (!data.InAssembly && ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName)) - { - return false; - } - - return true; + return data.InAssembly || !ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName); } - private bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) + private static bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) { return nameof(Contribution).Equals(propertyName) || nameof(N).Equals(propertyName); } Index: Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/StandAloneFailurePathProperties.cs =================================================================== diff -u -r3c1b3532f198675db6439fd52207f1d0f3d1fe1b -r2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9 --- Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/StandAloneFailurePathProperties.cs (.../StandAloneFailurePathProperties.cs) (revision 3c1b3532f198675db6439fd52207f1d0f3d1fe1b) +++ Riskeer/Integration/src/Riskeer.Integration.Forms/PropertyClasses/StandAlone/StandAloneFailurePathProperties.cs (.../StandAloneFailurePathProperties.cs) (revision 2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9) @@ -71,15 +71,10 @@ [DynamicVisibleValidationMethod] public bool DynamicVisibleValidationMethod(string propertyName) { - if (!data.InAssembly && ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName)) - { - return false; - } - - return true; + return data.InAssembly || !ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName); } - private bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) + private static bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) { return nameof(Contribution).Equals(propertyName); } Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/AssessmentSectionCompositionChangeHandler.cs =================================================================== diff -u -re9e1bd0d1ae282ba78235a7ccd25bc30dac0e727 -r2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/AssessmentSectionCompositionChangeHandler.cs (.../AssessmentSectionCompositionChangeHandler.cs) (revision e9e1bd0d1ae282ba78235a7ccd25bc30dac0e727) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/AssessmentSectionCompositionChangeHandler.cs (.../AssessmentSectionCompositionChangeHandler.cs) (revision 2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9) @@ -42,7 +42,8 @@ /// /// Creates a new instance of . /// - /// The view commands used to close views for failure mechanisms that are not in the assembly. + /// The view commands used to close views for failure mechanisms + /// that are not part of the assembly. /// Thrown when /// is null. public AssessmentSectionCompositionChangeHandler(IViewCommands viewCommands) Index: Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailurePathProperties.cs =================================================================== diff -u -r3c1b3532f198675db6439fd52207f1d0f3d1fe1b -r2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9 --- Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailurePathProperties.cs (.../MacroStabilityInwardsFailurePathProperties.cs) (revision 3c1b3532f198675db6439fd52207f1d0f3d1fe1b) +++ Riskeer/MacroStabilityInwards/src/Riskeer.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsFailurePathProperties.cs (.../MacroStabilityInwardsFailurePathProperties.cs) (revision 2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9) @@ -76,7 +76,7 @@ return data.InAssembly || !ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName); } - private bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) + private static bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) { return nameof(Contribution).Equals(propertyName) || nameof(A).Equals(propertyName) Index: Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailurePathProperties.cs =================================================================== diff -u -r3c1b3532f198675db6439fd52207f1d0f3d1fe1b -r2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9 --- Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailurePathProperties.cs (.../PipingFailurePathProperties.cs) (revision 3c1b3532f198675db6439fd52207f1d0f3d1fe1b) +++ Riskeer/Piping/src/Riskeer.Piping.Forms/PropertyClasses/PipingFailurePathProperties.cs (.../PipingFailurePathProperties.cs) (revision 2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9) @@ -73,15 +73,10 @@ [DynamicVisibleValidationMethod] public bool DynamicVisibleValidationMethod(string propertyName) { - if (!data.InAssembly && ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName)) - { - return false; - } - - return true; + return data.InAssembly || !ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName); } - private bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) + private static bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) { return nameof(Contribution).Equals(propertyName) || nameof(A).Equals(propertyName) Index: Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailurePathProperties.cs =================================================================== diff -u -r3c1b3532f198675db6439fd52207f1d0f3d1fe1b -r2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9 --- Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailurePathProperties.cs (.../StabilityPointStructuresFailurePathProperties.cs) (revision 3c1b3532f198675db6439fd52207f1d0f3d1fe1b) +++ Riskeer/StabilityPointStructures/src/Riskeer.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailurePathProperties.cs (.../StabilityPointStructuresFailurePathProperties.cs) (revision 2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9) @@ -55,15 +55,10 @@ [DynamicVisibleValidationMethod] public bool DynamicVisibleValidationMethod(string propertyName) { - if (!data.InAssembly && ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName)) - { - return false; - } - - return true; + return data.InAssembly || !ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName); } - private bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) + private static bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) { return nameof(Contribution).Equals(propertyName) || nameof(N).Equals(propertyName); Index: Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverFailurePathProperties.cs =================================================================== diff -u -r3c1b3532f198675db6439fd52207f1d0f3d1fe1b -r2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9 --- Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverFailurePathProperties.cs (.../StabilityStoneCoverFailurePathProperties.cs) (revision 3c1b3532f198675db6439fd52207f1d0f3d1fe1b) +++ Riskeer/StabilityStoneCover/src/Riskeer.StabilityStoneCover.Forms/PropertyClasses/StabilityStoneCoverFailurePathProperties.cs (.../StabilityStoneCoverFailurePathProperties.cs) (revision 2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9) @@ -55,15 +55,10 @@ [DynamicVisibleValidationMethod] public bool DynamicVisibleValidationMethod(string propertyName) { - if (!data.InAssembly && ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName)) - { - return false; - } - - return true; + return data.InAssembly || !ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName); } - private bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) + private static bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) { return nameof(Contribution).Equals(propertyName) || nameof(N).Equals(propertyName); Index: Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverFailurePathProperties.cs =================================================================== diff -u -r3c1b3532f198675db6439fd52207f1d0f3d1fe1b -r2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9 --- Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverFailurePathProperties.cs (.../WaveImpactAsphaltCoverFailurePathProperties.cs) (revision 3c1b3532f198675db6439fd52207f1d0f3d1fe1b) +++ Riskeer/WaveImpactAsphaltCover/src/Riskeer.WaveImpactAsphaltCover.Forms/PropertyClasses/WaveImpactAsphaltCoverFailurePathProperties.cs (.../WaveImpactAsphaltCoverFailurePathProperties.cs) (revision 2232ff8b2af8d6a7a9005b2f2e0566ebcba2b1e9) @@ -71,15 +71,10 @@ [DynamicVisibleValidationMethod] public bool DynamicVisibleValidationMethod(string propertyName) { - if (!data.InAssembly && ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName)) - { - return false; - } - - return true; + return data.InAssembly || !ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(propertyName); } - private bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) + private static bool ShouldHidePropertyWhenFailureMechanismNotPartOfAssembly(string propertyName) { return nameof(Contribution).Equals(propertyName) || nameof(DeltaL).Equals(propertyName)