Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs =================================================================== diff -u -r6980 -r6981 --- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 6980) +++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/Location.cs (.../Location.cs) (revision 6981) @@ -1622,16 +1622,13 @@ [Validate] public ValidationResult[] ValidateLocationNewDikeTopWidth() { - if (DamProjectType == DamProjectType.Design) + if (DamProjectType == DamProjectType.Design && UseNewDikeTopWidth && (NewDikeTopWidth < newDikeTopWidthMinValue)) { - if (UseNewDikeTopWidth && (NewDikeTopWidth < newDikeTopWidthMinValue)) + return new[] { - return new[] - { - new ValidationResult(ValidationResultType.Error, - String.Format(LocalizationManager.GetTranslatedText(this, "NewDikeTopWidthRangeError"), newDikeTopWidthMinValue), this, "NewDikeTopWidth", "AssignMinValue", this) - }; - } + new ValidationResult(ValidationResultType.Error, + String.Format(LocalizationManager.GetTranslatedText(this, "NewDikeTopWidthRangeError"), newDikeTopWidthMinValue), this, "NewDikeTopWidth", "AssignMinValue", this) + }; } return new ValidationResult[0]; @@ -1640,16 +1637,13 @@ [Validate] public ValidationResult[] ValidateLocationNewDikeSlopeInside() { - if (DamProjectType == DamProjectType.Design) + if (DamProjectType == DamProjectType.Design && UseNewDikeSlopeInside && (NewDikeSlopeInside < newDikeSlopeInsideMinValue)) { - if (UseNewDikeSlopeInside && (NewDikeSlopeInside < newDikeSlopeInsideMinValue)) + return new[] { - return new[] - { - new ValidationResult(ValidationResultType.Error, - String.Format(LocalizationManager.GetTranslatedText(this, "NewDikeSlopeInsideRangeError"), newDikeSlopeInsideMinValue), this, "NewDikeSlopeInside", "AssignMinValue", this) - }; - } + new ValidationResult(ValidationResultType.Error, + String.Format(LocalizationManager.GetTranslatedText(this, "NewDikeSlopeInsideRangeError"), newDikeSlopeInsideMinValue), this, "NewDikeSlopeInside", "AssignMinValue", this) + }; } return new ValidationResult[0]; @@ -1658,16 +1652,13 @@ [Validate] public ValidationResult[] ValidateLocationNewDikeSlopeOutside() { - if (DamProjectType == DamProjectType.Design) + if (DamProjectType == DamProjectType.Design && UseNewDikeSlopeOutside && (NewDikeSlopeOutside < newDikeSlopeOutsideMinValue)) { - if (UseNewDikeSlopeOutside && (NewDikeSlopeOutside < newDikeSlopeOutsideMinValue)) + return new[] { - return new[] - { - new ValidationResult(ValidationResultType.Error, - String.Format(LocalizationManager.GetTranslatedText(this, "NewDikeSlopeOutsideRangeError"), newDikeSlopeOutsideMinValue), this, "NewDikeSlopeOutside", "AssignMinValue", this) - }; - } + new ValidationResult(ValidationResultType.Error, + String.Format(LocalizationManager.GetTranslatedText(this, "NewDikeSlopeOutsideRangeError"), newDikeSlopeOutsideMinValue), this, "NewDikeSlopeOutside", "AssignMinValue", this) + }; } return new ValidationResult[0];