Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/SoilGeometry.cs =================================================================== diff -u -r3893 -r4000 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/SoilGeometry.cs (.../SoilGeometry.cs) (revision 3893) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/SoilGeometry.cs (.../SoilGeometry.cs) (revision 4000) @@ -29,9 +29,7 @@ /// public class SoilGeometryException : ApplicationException { - public SoilGeometryException(string message) : base(message) - { - } + public SoilGeometryException(string message) : base(message) {} } public class SoilGeometryBase @@ -45,47 +43,40 @@ /// public class SoilGeometry : SoilGeometryBase { - private SoilProfile1D soilProfile; - private string soilGeometry2DName; - /// /// Constructor /// public SoilGeometry(SoilProfile1D soilProfile, string soilGeometry2DName) { - this.SoilProfile = soilProfile; - this.SoilGeometry2DName = soilGeometry2DName; + SoilProfile = soilProfile; + SoilGeometry2DName = soilGeometry2DName; } #region PublicPropteries + public override SoilProfileType SoilProfileType { get { - SoilProfileType soilProfileType = SoilProfileType.ProfileTypeStiFile; - if (soilProfile != null) + var soilProfileType = SoilProfileType.ProfileTypeStiFile; + if (SoilProfile != null) { soilProfileType = SoilProfileType.ProfileType1D; } + if ((SoilProfile == null) && ((SoilGeometry2DName == null) || SoilGeometry2DName == "")) { throw new SoilGeometryException("No geometry assigned"); } + return soilProfileType; } } - public SoilProfile1D SoilProfile - { - get { return soilProfile; } - set { soilProfile = value; } - } + public SoilProfile1D SoilProfile { get; set; } - public string SoilGeometry2DName - { - get { return soilGeometry2DName; } - set { soilGeometry2DName = value; } - } + public string SoilGeometry2DName { get; set; } + #endregion PublicPropteries } -} +} \ No newline at end of file