Index: DamClients/DamUI/branches/nwo/src/Dam/Data/Dike.cs =================================================================== diff -u -r875 -r1533 --- DamClients/DamUI/branches/nwo/src/Dam/Data/Dike.cs (.../CalcualtionIncluded/src/Dam/Data/Dike.cs) (revision 875) +++ DamClients/DamUI/branches/nwo/src/Dam/Data/Dike.cs (.../nwo/src/Dam/Data/Dike.cs) (revision 1533) @@ -1,12 +1,23 @@ -//----------------------------------------------------------------------- -// -// Copyright (c) 2009 Deltares. All rights reserved. -// -// R.C. blankenburgh -// remko.blankenburgh@deltares.nl -// 26-08-2009 -// n.a. -//----------------------------------------------------------------------- +// Copyright (C) Stichting Deltares 2018. All rights reserved. +// +// This file is part of the application DAM - UI. +// +// DAM - UI is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. using Deltares.Geotechnics.Converter; using Deltares.Geotechnics.Soils; @@ -57,7 +68,6 @@ private SoilList soilList; private IList gauges = new List(); private IList gaugePLLines = new List(); - private IList nonWaterRetainingObjects; private IList soilProfiles; private string soilDatabaseName = ""; private List databaseSoils = new List(); @@ -74,7 +84,6 @@ SurfaceLines2 = new List(); this.pl1Lines = new List(); this.soilList = new SoilList(); - this.nonWaterRetainingObjects = new List(); removeStiFiles = true; } @@ -176,12 +185,6 @@ set { this.gaugePLLines = value; } } - public virtual IList NonWaterRetainingObjects - { - get { return this.nonWaterRetainingObjects; } - set { this.nonWaterRetainingObjects = value; } - } - public bool UsesGauges { get { return this.GaugePLLines != null && this.GaugePLLines.Count > 0 && this.Gauges != null; } } public virtual List Scenarios @@ -352,7 +355,7 @@ isInValid = DoesLocationHaveInvalidSoils(invalidSoils, location, out soilProf, out invSoil); if (isInValid) { - message = String.Format(LocalizationManager.GetTranslatedText(this.GetType(), "locationHasProfileWithInvalidSoils"), location.Name, soilProf, invSoil); + message = String.Format(LocalizationManager.GetTranslatedText(this.GetType(), "LocationHasProfileWithInvalidSoils"), location.Name, soilProf, invSoil); } } if (isInValid)