Index: dam engine/branches/Initial Source/Deltares.DamEngine.Data/Design/Scenario.cs
===================================================================
diff -u -r276 -r303
--- dam engine/branches/Initial Source/Deltares.DamEngine.Data/Design/Scenario.cs	(.../Scenario.cs)	(revision 276)
+++ dam engine/branches/Initial Source/Deltares.DamEngine.Data/Design/Scenario.cs	(.../Scenario.cs)	(revision 303)
@@ -1,12 +1,23 @@
-//-----------------------------------------------------------------------
-// <copyright file="Scenario.cs" company="Deltares">
-//  Copyright (c) 2010 Deltares. All rights reserved.
-// </copyright>
-// <author>B.S.T. The</author>
-// <email>tom.the@deltares.nl</email>
-// <date>04-11-2010</date>
-// <summary>Calculation scenario class</summary>
-//-----------------------------------------------------------------------
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of the DAM Engine.
+//
+// The DAM Engine is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero 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 Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// 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 System;
 using System.Collections.Generic;
@@ -15,8 +26,12 @@
 using System.Globalization;
 using System.Linq.Expressions;
 using System.Xml.Serialization;
-using Deltares.Dam.Data;
 using Deltares.DamEngine.Data.General;
+using Deltares.DamEngine.Data.General.Results;
+using Deltares.DamEngine.Data.Geotechnics;
+using Deltares.DamEngine.Data.Standard.Calculation;
+using Deltares.DamEngine.Data.Standard.Language;
+using Deltares.DamEngine.Data.Standard.Validation;
 
 namespace Deltares.DamEngine.Data.Design
 {
@@ -567,7 +582,7 @@
         {
             if ((defaultUpliftCriterionStability == null) && (ModelFactors.UpliftCriterionStability == null))
             {
-                throw new ScenarioException(String.Format(LocalizationManager.GetTranslatedText(typeof(SurfaceLineAdapter), "NoUpliftCriterionForStability"), Location.Name, ToString()));
+                throw new ScenarioException(String.Format(LocalizationManager.GetTranslatedText(this, "NoUpliftCriterionForStability"), Location.Name, ToString()));
                 
             }
             return (ModelFactors.UpliftCriterionStability == null ? defaultUpliftCriterionStability.Value
@@ -583,7 +598,7 @@
         {
             if ((defaultUpliftCriterionPiping == null) && (ModelFactors.UpliftCriterionPiping == null))
             {
-                throw new ScenarioException(String.Format(LocalizationManager.GetTranslatedText(typeof(SurfaceLineAdapter), "NoUpliftCriterionForPiping"), Location.Name, ToString()));
+                throw new ScenarioException(String.Format(LocalizationManager.GetTranslatedText(this, "NoUpliftCriterionForPiping"), Location.Name, ToString()));
             }
             return (ModelFactors.UpliftCriterionPiping == null ? defaultUpliftCriterionPiping.Value : ModelFactors.UpliftCriterionPiping.Value);
         }
@@ -597,7 +612,7 @@
         {
             if ((defaultRequiredSafetyFactorPiping == null) && (ModelFactors.RequiredSafetyFactorPiping == null))
             {
-                throw new ScenarioException(String.Format(LocalizationManager.GetTranslatedText(typeof(SurfaceLineAdapter), "NoRequiredSafetyFactorPiping"), Location.Name, ToString()));
+                throw new ScenarioException(String.Format(LocalizationManager.GetTranslatedText(this, "NoRequiredSafetyFactorPiping"), Location.Name, ToString()));
             }
             return (ModelFactors.RequiredSafetyFactorPiping == null ? defaultRequiredSafetyFactorPiping.Value : ModelFactors.RequiredSafetyFactorPiping.Value);
         }
@@ -618,7 +633,7 @@
                         {
                             new ValidationResult(ValidationResultType.Error,
                                                  LocalizationManager.GetTranslatedText(this, "PlLineOffsetFactorBelowShoulderCrestTooSmall"),
-                                                 this, "PlLineOffsetFactorBelowShoulderCrest", "AssignMinValue", (IRepairer) this)
+                                                 this)
                         };
                 }
                 if (PlLineOffsetFactorBelowShoulderCrest.Value > DamGlobalConstants.PlLineOffsetFactorBelowShoulderCrestMaxValue)
@@ -627,7 +642,7 @@
                         {
                             new ValidationResult(ValidationResultType.Error,
                                                  LocalizationManager.GetTranslatedText(this, "PlLineOffsetFactorBelowShoulderCrestTooLarge"),
-                                                 this, "PlLineOffsetFactorBelowShoulderCrest", "AssignMaxValue", (IRepairer) this)
+                                                 this)
                         };
                 }
             }