Fisheye: Tag 0234018828203749764517157abd35c6d6e97bf0 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Plugin/FileImporters/GrassCoverSlipOffInwardsFailureMechanismSectionResultUpdateStrategy.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0234018828203749764517157abd35c6d6e97bf0 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Plugin/FileImporters/GrassCoverSlipOffOutwardsFailureMechanismSectionResultUpdateStrategy.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0234018828203749764517157abd35c6d6e97bf0 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Plugin/FileImporters/MacroStabilityOutwardsFailureMechanismSectionResultUpdateStrategy.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0234018828203749764517157abd35c6d6e97bf0 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Plugin/FileImporters/MicrostabilityFailureMechanismSectionResultUpdateStrategy.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0234018828203749764517157abd35c6d6e97bf0 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Plugin/FileImporters/PipingStructureFailureMechanismSectionResultUpdateStrategy.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0234018828203749764517157abd35c6d6e97bf0 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Plugin/FileImporters/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultUpdateStrategy.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0234018828203749764517157abd35c6d6e97bf0 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Plugin/FileImporters/TechnicalInnovationFailureMechanismSectionResultUpdateStrategy.cs'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0234018828203749764517157abd35c6d6e97bf0 refers to a dead (removed) revision in file `Riskeer/Integration/src/Riskeer.Integration.Plugin/FileImporters/WaterPressureAsphaltCoverFailureMechanismSectionResultUpdateStrategy.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs =================================================================== diff -u -rc36b47c2e1e8cf948767cca33f80ad735f370ad0 -r0234018828203749764517157abd35c6d6e97bf0 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision c36b47c2e1e8cf948767cca33f80ad735f370ad0) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Merge/AssessmentSectionMergeHandler.cs (.../AssessmentSectionMergeHandler.cs) (revision 0234018828203749764517157abd35c6d6e97bf0) @@ -103,21 +103,13 @@ CloseViewsForFailureMechanism(mergeData.MergePiping, assessmentSection.Piping); CloseViewsForFailureMechanism(mergeData.MergeGrassCoverErosionInwards, assessmentSection.GrassCoverErosionInwards); CloseViewsForFailureMechanism(mergeData.MergeMacroStabilityInwards, assessmentSection.MacroStabilityInwards); - CloseViewsForFailureMechanism(mergeData.MergeMacroStabilityOutwards, assessmentSection.MacroStabilityOutwards); - CloseViewsForFailureMechanism(mergeData.MergeMicrostability, assessmentSection.Microstability); CloseViewsForFailureMechanism(mergeData.MergeStabilityStoneCover, assessmentSection.StabilityStoneCover); CloseViewsForFailureMechanism(mergeData.MergeWaveImpactAsphaltCover, assessmentSection.WaveImpactAsphaltCover); - CloseViewsForFailureMechanism(mergeData.MergeWaterPressureAsphaltCover, assessmentSection.WaterPressureAsphaltCover); CloseViewsForFailureMechanism(mergeData.MergeGrassCoverErosionOutwards, assessmentSection.GrassCoverErosionOutwards); - CloseViewsForFailureMechanism(mergeData.MergeGrassCoverSlipOffOutwards, assessmentSection.GrassCoverSlipOffOutwards); - CloseViewsForFailureMechanism(mergeData.MergeGrassCoverSlipOffInwards, assessmentSection.GrassCoverSlipOffInwards); CloseViewsForFailureMechanism(mergeData.MergeHeightStructures, assessmentSection.HeightStructures); CloseViewsForFailureMechanism(mergeData.MergeClosingStructures, assessmentSection.ClosingStructures); - CloseViewsForFailureMechanism(mergeData.MergePipingStructure, assessmentSection.PipingStructure); CloseViewsForFailureMechanism(mergeData.MergeStabilityPointStructures, assessmentSection.StabilityPointStructures); - CloseViewsForFailureMechanism(mergeData.MergeStrengthStabilityLengthwiseConstruction, assessmentSection.StrengthStabilityLengthwiseConstruction); CloseViewsForFailureMechanism(mergeData.MergeDuneErosion, assessmentSection.DuneErosion); - CloseViewsForFailureMechanism(mergeData.MergeTechnicalInnovation, assessmentSection.TechnicalInnovation); } private void CloseViewsForFailureMechanism(bool shouldClose, IFailureMechanism failureMechanism) @@ -232,18 +224,6 @@ LogMergeMessage(targetAssessmentSection.MacroStabilityInwards); } - if (mergeData.MergeMacroStabilityOutwards) - { - targetAssessmentSection.MacroStabilityOutwards = sourceAssessmentSection.MacroStabilityOutwards; - LogMergeMessage(targetAssessmentSection.MacroStabilityOutwards); - } - - if (mergeData.MergeMicrostability) - { - targetAssessmentSection.Microstability = sourceAssessmentSection.Microstability; - LogMergeMessage(targetAssessmentSection.Microstability); - } - if (mergeData.MergeStabilityStoneCover) { targetAssessmentSection.StabilityStoneCover = sourceAssessmentSection.StabilityStoneCover; @@ -260,12 +240,6 @@ LogMergeMessage(targetAssessmentSection.WaveImpactAsphaltCover); } - if (mergeData.MergeWaterPressureAsphaltCover) - { - targetAssessmentSection.WaterPressureAsphaltCover = sourceAssessmentSection.WaterPressureAsphaltCover; - LogMergeMessage(targetAssessmentSection.WaterPressureAsphaltCover); - } - if (mergeData.MergeGrassCoverErosionOutwards) { targetAssessmentSection.GrassCoverErosionOutwards = sourceAssessmentSection.GrassCoverErosionOutwards; @@ -275,18 +249,6 @@ LogMergeMessage(targetAssessmentSection.GrassCoverErosionOutwards); } - if (mergeData.MergeGrassCoverSlipOffOutwards) - { - targetAssessmentSection.GrassCoverSlipOffOutwards = sourceAssessmentSection.GrassCoverSlipOffOutwards; - LogMergeMessage(targetAssessmentSection.GrassCoverSlipOffOutwards); - } - - if (mergeData.MergeGrassCoverSlipOffInwards) - { - targetAssessmentSection.GrassCoverSlipOffInwards = sourceAssessmentSection.GrassCoverSlipOffInwards; - LogMergeMessage(targetAssessmentSection.GrassCoverSlipOffInwards); - } - if (mergeData.MergeHeightStructures) { targetAssessmentSection.HeightStructures = sourceAssessmentSection.HeightStructures; @@ -303,12 +265,6 @@ LogMergeMessage(targetAssessmentSection.ClosingStructures); } - if (mergeData.MergePipingStructure) - { - targetAssessmentSection.PipingStructure = sourceAssessmentSection.PipingStructure; - LogMergeMessage(targetAssessmentSection.PipingStructure); - } - if (mergeData.MergeStabilityPointStructures) { targetAssessmentSection.StabilityPointStructures = sourceAssessmentSection.StabilityPointStructures; @@ -317,23 +273,11 @@ LogMergeMessage(targetAssessmentSection.StabilityPointStructures); } - if (mergeData.MergeStrengthStabilityLengthwiseConstruction) - { - targetAssessmentSection.StrengthStabilityLengthwiseConstruction = sourceAssessmentSection.StrengthStabilityLengthwiseConstruction; - LogMergeMessage(targetAssessmentSection.StrengthStabilityLengthwiseConstruction); - } - if (mergeData.MergeDuneErosion) { targetAssessmentSection.DuneErosion = sourceAssessmentSection.DuneErosion; LogMergeMessage(targetAssessmentSection.DuneErosion); } - - if (mergeData.MergeTechnicalInnovation) - { - targetAssessmentSection.TechnicalInnovation = sourceAssessmentSection.TechnicalInnovation; - LogMergeMessage(targetAssessmentSection.TechnicalInnovation); - } } private static void LogMergeMessage(IFailureMechanism failureMechanism)