Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs =================================================================== diff -u -r3783 -r3847 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 3783) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamFailureMechanismeCalculationSpecification.cs (.../DamFailureMechanismeCalculationSpecification.cs) (revision 3847) @@ -219,7 +219,7 @@ if (Equals(nameof(CalculationModel), property) && FailureMechanismSystemType == FailureMechanismSystemType.StabilityOutside) { - return false; // Disable model selection when stability outside is active, as only UpliftVan is currently supported. + return false; // Disable model selection when stability outside is active, as only Bishop is currently supported. } return true; Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs =================================================================== diff -u -r3844 -r3847 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs (.../DamProject.cs) (revision 3844) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs (.../DamProject.cs) (revision 3847) @@ -90,7 +90,7 @@ public string ProjectFileName { - get { return this.projectFileName; } + get => this.projectFileName; set { DataEventPublisher.BeforeChange(this, "ProjectFileName"); @@ -277,36 +277,40 @@ if (damProjectData != null) { damProjectData.VersionInfo.InitVersionInfoAfterRead(); - } - if (damProjectData.DamProjectType == DamProjectType.AssessOld) - { - ClearProject(); - damProjectData.DamProjectType = DamProjectType.AssessOld; - } - else - { - var damProjectVersion = damProjectVersionXmlHandler.GetDamProjectVersion(); - UpdateVersionInfoForNonVersionedFiles(damProjectVersion); - damProjectVersion = GetMainVersion(damProjectVersion); - if (damProjectVersion != null) + + if (damProjectData.DamProjectType == DamProjectType.AssessOld) { - var currentProgramVersion = About.Version; - if (currentProgramVersion == null) + ClearProject(); + damProjectData.DamProjectType = DamProjectType.AssessOld; + } + else + { + var damProjectVersion = damProjectVersionXmlHandler.GetDamProjectVersion(); + UpdateVersionInfoForNonVersionedFiles(damProjectVersion); + damProjectVersion = GetMainVersion(damProjectVersion); + if (damProjectVersion != null) { - currentProgramVersion = testProgramVersion; - } - currentProgramVersion = GetMainVersion(currentProgramVersion); - if (!currentProgramVersion.Equals(damProjectVersion)) - { - if (IsOutDatedFileSupported(damProjectData)) + var currentProgramVersion = About.Version; + if (currentProgramVersion == null) { - damProjectData.ClearResults(); + currentProgramVersion = testProgramVersion; } - else + + currentProgramVersion = GetMainVersion(currentProgramVersion); + if (!currentProgramVersion.Equals(damProjectVersion)) { - ClearProject(); - string message = LocalizationManager.GetTranslatedText(this, "UnsupportedDamProjectFile"); - LogManager.Messages.Add(new LogMessage(LogMessageType.Error, DamProjectData, message)); + if (IsOutDatedFileSupported(damProjectData)) + { + damProjectData.ClearResults(); + } + else + { + ClearProject(); + string message = + LocalizationManager.GetTranslatedText(this, "UnsupportedDamProjectFile"); + LogManager.Messages.Add(new LogMessage(LogMessageType.Error, DamProjectData, + message)); + } } } }