Index: dam engine/trunk/src/Deltares.DamEngine.Data/General/Location.cs
===================================================================
diff -u -r334 -r337
--- dam engine/trunk/src/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 334)
+++ dam engine/trunk/src/Deltares.DamEngine.Data/General/Location.cs	(.../Location.cs)	(revision 337)
@@ -20,11 +20,9 @@
 // All rights reserved.
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
-using System.IO;
 using System.Linq;
 using System.Xml.Serialization;
 using Deltares.DamEngine.Data.Design;
@@ -34,7 +32,6 @@
 using Deltares.DamEngine.Data.Geometry;
 using Deltares.DamEngine.Data.Geotechnics;
 using Deltares.DamEngine.Data.Probabilistic;
-using Deltares.DamEngine.Data.Standard;
 using Deltares.DamEngine.Data.Standard.Language;
 using Deltares.DamEngine.Data.Standard.Validation;
 
@@ -153,7 +150,7 @@
         private const double newDikeSlopeOutsideMinValue = 0.01;
         private const double penetrationLenghtMinValue = 0.00;
         private static DamProjectType damProjectType = DamProjectType.Calamity;
-        private readonly List<Scenario> scenarios = new List<Scenario>();
+        private readonly List<DesignScenario> scenarios = new List<DesignScenario>();
         private bool areLocalXZObjectsCreated = false;
         private double boezemLevelHbp = BoezemLevelNotSetValue;
         private double boezemLevelLbp = BoezemLevelNotSetValue;
@@ -1152,7 +1149,7 @@
         }
 
         [Validate]
-        public List<Scenario> Scenarios
+        public List<DesignScenario> Scenarios
         {
             get
             {
@@ -2907,94 +2904,6 @@
                 sb.Append(String.Format(" with {0})", this.SurfaceLine.Name));
             sb.Append(String.Format(" | X={0}, Y={1}, PolderLevel={2:F2}, HeadPL2={3:F2}, HeadPl3={4:F2}", this.XRd, this.YRd, this.PolderLevel, this.HeadPL2, this.HeadPl3));
             return sb.ToString();*/
-        }
-
-        public ICollection GetDomain(string property)
-        {
-            switch (property)
-            {
-                case "PLLineCreationMethod": // ToDo Moet dit nog afhankelijk van damProjectType (design/calamity etc) o.i.d. ? --->> Erik
-                    if (DamProjectType == DamProjectType.DamLiveConfiguration)
-                    {
-                        return new[]
-                        {
-                            PLLineCreationMethod.ExpertKnowledgeRRD,
-                            PLLineCreationMethod.ExpertKnowledgeLinearInDike,
-                            PLLineCreationMethod.DupuitStatic
-                        };
-                    }
-                    else
-                    {
-                        return new[]
-                        {
-                            PLLineCreationMethod.ExpertKnowledgeRRD,
-                            PLLineCreationMethod.ExpertKnowledgeLinearInDike,
-                        };
-                    }
-                case "IntrusionVerticalWaterPressure":
-                    return new[]
-                    {
-                        this.Translate("Standard"),
-                        this.Translate("Linear"),
-                        this.Translate("FullHydroStatic"),
-                        this.Translate("HydroStatic"),
-                        this.Translate("SemiTimeDependent")
-                    };
-                default:
-                    return null;
-            }
-        }
-
-        public void Repair(object subject, string property, string id)
-        {
-            if (subject is Location)
-            {
-                if (id == "ZoneTypeSafety" && property == "StabilityZoneType")
-                {
-                    modelFactors.RequiredSafetyFactorStabilityInnerSlope = detrimentFactor;
-                }
-                if (id == "AssignMinValue" && property == "NewDikeTopWidth")
-                {
-                    NewDikeTopWidth = newDikeTopWidthMinValue;
-                }
-                if (id == "AssignMinValue" && property == "NewDikeSlopeInside")
-                {
-                    NewDikeSlopeInside = newDikeSlopeInsideMinValue;
-                }
-                if (id == "AssignMinValue" && property == "NewDikeSlopeOutside")
-                {
-                    NewDikeSlopeOutside = newDikeSlopeOutsideMinValue;
-                }
-                if (id == "AssignMinValue" && property == "PlLineOffsetFactorBelowShoulderCrest")
-                {
-                    PlLineOffsetFactorBelowShoulderCrest = DamGlobalConstants.PlLineOffsetFactorBelowShoulderCrestMinValue;
-                }
-                if (id == "AssignMaxValue" && property == "PlLineOffsetFactorBelowShoulderCrest")
-                {
-                    PlLineOffsetFactorBelowShoulderCrest = DamGlobalConstants.PlLineOffsetFactorBelowShoulderCrestMaxValue;
-                }
-                if (id == "AssignMinValue" && property == "PenetrationLength")
-                {
-                    PenetrationLength = penetrationLenghtMinValue;
-                }
-            }
-        }
-
-        public string GetRepairDescription(object subject, string property, string id)
-        {
-            if (id == "ZoneTypeSafety" && property == "StabilityZoneType")
-            {
-                return LocalizationManager.GetTranslatedText(this, "NoRequiredSafetyForZonesRepair");
-            }
-            if (id == "AssignMinValue")
-            {
-                return LocalizationManager.GetTranslatedText(this, "AssignMinValue");
-            }
-            if (id == "AssignMaxValue")
-            {
-                return LocalizationManager.GetTranslatedText(this, "AssignMaxValue");
-            }
-            return "";
-        }        
+        }                
     }
 }
\ No newline at end of file