Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/BackwardCompatibility.cs
===================================================================
diff -u -r2903 -r2909
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/BackwardCompatibility.cs (.../BackwardCompatibility.cs) (revision 2903)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/IO/BackwardCompatibility.cs (.../BackwardCompatibility.cs) (revision 2909)
@@ -27,7 +27,7 @@
namespace Deltares.Dam.Data.IO
{
///
- public class BackwardCompatibility
+ public static class BackwardCompatibility
{
/// Updates the specified dam project data for backward compatibility.
/// The dam project data.
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs
===================================================================
diff -u -r2903 -r2909
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs (.../DamProject.cs) (revision 2903)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProject.cs (.../DamProject.cs) (revision 2909)
@@ -331,7 +331,7 @@
if (this.GetMainVersion(fileVersion) == "19.1")
{
this.DamProjectData.VersionInfo.FileVersionAsRead = 1;
- };
+ }
}
}
@@ -428,7 +428,7 @@
soil.Assign(newSoil);
}
// update aquifer dictionary too
- if (soilList.AquiferDictionary.ContainsKey(newSoil))
+ if (newSoil != null && soilList.AquiferDictionary.ContainsKey(newSoil))
{
if (dike.SoilList.AquiferDictionary.ContainsKey(soil))
{
Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs
===================================================================
diff -u -r2864 -r2909
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs (.../DamProjectData.cs) (revision 2864)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/DamProjectData.cs (.../DamProjectData.cs) (revision 2909)
@@ -41,7 +41,6 @@
public class DamProjectData : Project, IDomain, IDisposable
{
public readonly double MissValStabilitySafetyFactor = -1.0;
- private VersionInfo versionInfo;
private WaterBoard waterBoard;
private DamProjectCalculationSpecification damProjectCalculationSpecification;
private WaterBoardJob waterBoardJob = null;
@@ -61,19 +60,15 @@
///
public DamProjectData()
{
- this.versionInfo = new VersionInfo();
+ this.VersionInfo = new VersionInfo();
this.waterBoard = new WaterBoard();
this.waterBoardJob = null;
this.damProjectCalculationSpecification = new DamProjectCalculationSpecification();
}
/// Gets the version information.
/// The version information.
- public VersionInfo VersionInfo
- {
- get { return versionInfo; }
- set { versionInfo = value; }
- }
+ public VersionInfo VersionInfo { get; set; }
///
/// Gets or sets the project working path.