Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SoilList.cs =================================================================== diff -u -r3893 -r4000 --- DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SoilList.cs (.../SoilList.cs) (revision 3893) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/Geotechnics/SoilList.cs (.../SoilList.cs) (revision 4000) @@ -31,7 +31,6 @@ /// public class SoilList { - private Dictionary aquiferDictionary = new Dictionary(); private List soils; public SoilList() @@ -66,17 +65,7 @@ /// /// The aquifer dictionary. /// - public Dictionary AquiferDictionary - { - get - { - return aquiferDictionary; - } - set - { - aquiferDictionary = value; - } - } + public Dictionary AquiferDictionary { get; set; } = new Dictionary(); /// /// Gets the index of the soil by its name. @@ -85,8 +74,8 @@ /// The index when found else -1 public virtual int GetSoilIndexByName(string soilName) { - var soil = soils.FirstOrDefault(s => s.Name.Equals( - soilName, StringComparison.InvariantCultureIgnoreCase)); + Soil soil = soils.FirstOrDefault(s => s.Name.Equals( + soilName, StringComparison.InvariantCultureIgnoreCase)); return soil == null ? -1 : soils.IndexOf(soil); } @@ -98,8 +87,8 @@ /// Soil when found else null public virtual Soil GetSoilByName(string soilName) { - var soil = soils.FirstOrDefault(s => s.Name.Equals( - soilName, StringComparison.InvariantCultureIgnoreCase)); + Soil soil = soils.FirstOrDefault(s => s.Name.Equals( + soilName, StringComparison.InvariantCultureIgnoreCase)); return soil; } @@ -120,9 +109,9 @@ public void Remove(Soil soil) { Soils.Remove(soil); - if (aquiferDictionary.ContainsKey(soil.Name)) + if (AquiferDictionary.ContainsKey(soil.Name)) { - aquiferDictionary.Remove(soil.Name); + AquiferDictionary.Remove(soil.Name); } } @@ -132,7 +121,7 @@ public void Clear() { Soils.Clear(); - aquiferDictionary.Clear(); - } + AquiferDictionary.Clear(); + } } } \ No newline at end of file