Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectCalculationSpecification.cs
===================================================================
diff -u -r3893 -r4000
--- DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectCalculationSpecification.cs	(.../DamProjectCalculationSpecification.cs)	(revision 3893)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/DamProjectCalculationSpecification.cs	(.../DamProjectCalculationSpecification.cs)	(revision 4000)
@@ -31,17 +31,14 @@
     /// </summary>
     public class DamProjectCalculationSpecification
     {
-        private readonly List<DamFailureMechanismeCalculationSpecification> damCalculationSpecifications;
-
-        private static AnalysisType selectedAnalysisType = AnalysisType.AdaptGeometry;
         private DamFailureMechanismeCalculationSpecification currentSpecification;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="DamProjectCalculationSpecification"/> class.
         /// </summary>
         public DamProjectCalculationSpecification()
         {
-            damCalculationSpecifications = new List<DamFailureMechanismeCalculationSpecification>();
+            DamCalculationSpecifications = new List<DamFailureMechanismeCalculationSpecification>();
             //waterLevelTimeSeriesFileName = @"d:\src\delftgeosystems\trunk\data\Dam\RRD\Groot Salland\DAM UI Testdata\inputshortstart_dam.xml";            
         }
 
@@ -52,13 +49,7 @@
         /// The dam calculation specifications.
         /// </value>
         [Validate]
-        public List<DamFailureMechanismeCalculationSpecification> DamCalculationSpecifications
-        {
-            get
-            {
-                return damCalculationSpecifications;
-            }
-        }
+        public List<DamFailureMechanismeCalculationSpecification> DamCalculationSpecifications { get; }
 
         /// <summary>
         /// Gets or sets the analysis type for serialization purpose only.
@@ -72,13 +63,12 @@
         {
             get
             {
-                return selectedAnalysisType;
+                return SelectedAnalysisType;
             }
             set
             {
-                selectedAnalysisType = value;
+                SelectedAnalysisType = value;
             }
-
         }
 
         /// <summary>
@@ -87,14 +77,7 @@
         /// <value>
         /// The type of the selected analysis.
         /// </value>
-        public static AnalysisType SelectedAnalysisType
-        {
-            get { return selectedAnalysisType; }
-            set
-            {
-                selectedAnalysisType = value;                
-            }
-        }
+        public static AnalysisType SelectedAnalysisType { get; set; } = AnalysisType.AdaptGeometry;
 
         /// <summary>
         /// Gets or sets the current specification.
@@ -106,36 +89,36 @@
         {
             get
             {
-                if (currentSpecification == null && damCalculationSpecifications.Count > 0)
+                if (currentSpecification == null && DamCalculationSpecifications.Count > 0)
                 {
-                    currentSpecification = damCalculationSpecifications[0];
+                    currentSpecification = DamCalculationSpecifications[0];
                 }
-                
+
                 return currentSpecification;
             }
             set
             {
-                currentSpecification = value;                                
+                currentSpecification = value;
             }
         }
 
-
         /// <summary>
         /// Validates this instance.
         /// </summary>
         /// <returns></returns>
         [Validate]
         public ValidationResult[] Validate()
         {
-            if (damCalculationSpecifications.Count > 1)
+            if (DamCalculationSpecifications.Count > 1)
             {
-                return new[]{ new ValidationResult(ValidationResultType.Error, LocalizationManager.GetTranslatedText(this, "MaxOneCalculationSpecification"),
-                    this)};
+                return new[]
+                {
+                    new ValidationResult(ValidationResultType.Error, LocalizationManager.GetTranslatedText(this, "MaxOneCalculationSpecification"),
+                                         this)
+                };
             }
-            else
-            {
-                return new ValidationResult[0];    
-            }            
-        }    
+
+            return new ValidationResult[0];
+        }
     }
-}
+}
\ No newline at end of file