Index: DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs
===================================================================
diff -u -r5777 -r5779
--- DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs	(.../MStabParameters.cs)	(revision 5777)
+++ DamClients/DamUI/trunk/src/DamClientsLibrary/Deltares.Dam.Data/MStabParameters.cs	(.../MStabParameters.cs)	(revision 5779)
@@ -93,6 +93,21 @@
 
 public class SlipCircleDefinition : IVisibleEnabled, IAssignable<SlipCircleDefinition>, ICloneable<SlipCircleDefinition>
 {
+    private const string upliftVanTangentLinesDistanceObject = "upliftVanTangentLinesDistance";
+    private const string bishopTangentLinesDistanceObject = "bishopTangentLinesDistance";
+    private const string upliftVanLeftGridVerticalPointCountObject = "UpliftVanLeftGridVerticalPointCount";
+    private const string upliftVanLeftGridVerticalPointDistanceObject = "upliftVanLeftGridVerticalPointDistance";
+    private const string upliftVanLeftGridHorizontalPointCountObject = "UpliftVanLeftGridHorizontalPointCount";
+    private const string upliftVanLeftGridHorizontalPointDistanceObject = "UpliftVanLeftGridHorizontalPointDistance";
+    private const string upliftVanRightGridVerticalPointCountObject = "UpliftVanRightGridVerticalPointCount";
+    private const string upliftVanRightGridVerticalPointDistanceObject = "UpliftVanRightGridVerticalPointDistance";
+    private const string upliftVanRightGridHorizontalPointCountObject = "UpliftVanRightGridHorizontalPointCount";
+    private const string upliftVanRightGridHorizontalPointDistanceObject = "UpliftVanRightGridHorizontalPointDistance";
+    private const string bishopGridHorizontalPointCountObject = "BishopGridHorizontalPointCount";
+    private const string bishopGridHorizontalPointDistanceObject = "BishopGridHorizontalPointDistance";
+    private const string bishopGridVerticalPointCountObject = "bishopGridVerticalPointCount";
+    private const string bishopGridVerticalPointDistanceObject = "bishopGridVerticalPointDistance";
+                            
     private double xCoordinateLastUpliftPoint;
     private int upliftVanLeftGridVerticalPointCount;
     private double upliftVanTangentLinesDistance;
@@ -139,9 +154,9 @@
         }
         set
         {
-            DataEventPublisher.BeforeChange(this, "UpliftVanTangentLinesDistance");
+            DataEventPublisher.BeforeChange(this, upliftVanTangentLinesDistanceObject);
             upliftVanTangentLinesDistance = value;
-            DataEventPublisher.AfterChange(this, "UpliftVanTangentLinesDistance");
+            DataEventPublisher.AfterChange(this, upliftVanTangentLinesDistanceObject);
         }
     }
 
@@ -157,9 +172,9 @@
         }
         set
         {
-            DataEventPublisher.BeforeChange(this, "BishopTangentLinesDistance");
+            DataEventPublisher.BeforeChange(this, bishopTangentLinesDistanceObject);
             bishopTangentLinesDistance = value;
-            DataEventPublisher.AfterChange(this, "BishopTangentLinesDistance");
+            DataEventPublisher.AfterChange(this, bishopTangentLinesDistanceObject);
         }
     }
 
@@ -178,9 +193,9 @@
         }
         set
         {
-            DataEventPublisher.BeforeChange(this, "UpliftVanLeftGridVerticalPointCount");
+            DataEventPublisher.BeforeChange(this, upliftVanLeftGridVerticalPointCountObject);
             upliftVanLeftGridVerticalPointCount = value;
-            DataEventPublisher.AfterChange(this, "UpliftVanLeftGridVerticalPointCount");
+            DataEventPublisher.AfterChange(this, upliftVanLeftGridVerticalPointCountObject);
         }
     }
 
@@ -196,9 +211,9 @@
         }
         set
         {
-            DataEventPublisher.BeforeChange(this, "UpliftVanLeftGridVerticalPointDistance");
+            DataEventPublisher.BeforeChange(this, upliftVanLeftGridVerticalPointDistanceObject);
             upliftVanLeftGridVerticalPointDistance = value;
-            DataEventPublisher.AfterChange(this, "UpliftVanLeftGridVerticalPointDistance");
+            DataEventPublisher.AfterChange(this, upliftVanLeftGridVerticalPointDistanceObject);
         }
     }
 
@@ -213,9 +228,9 @@
         }
         set
         {
-            DataEventPublisher.BeforeChange(this, "UpliftVanLeftGridHorizontalPointCount");
+            DataEventPublisher.BeforeChange(this, upliftVanLeftGridHorizontalPointCountObject);
             upliftVanLeftGridHorizontalPointCount = value;
-            DataEventPublisher.AfterChange(this, "UpliftVanLeftGridHorizontalPointCount");
+            DataEventPublisher.AfterChange(this, upliftVanLeftGridHorizontalPointCountObject);
         }
     }
 
@@ -231,9 +246,9 @@
         }
         set
         {
-            DataEventPublisher.BeforeChange(this, "UpliftVanLeftGridHorizontalPointDistance");
+            DataEventPublisher.BeforeChange(this, upliftVanLeftGridHorizontalPointDistanceObject);
             upliftVanLeftGridHorizontalPointDistance = value;
-            DataEventPublisher.AfterChange(this, "UpliftVanLeftGridHorizontalPointDistance");
+            DataEventPublisher.AfterChange(this, upliftVanLeftGridHorizontalPointDistanceObject);
         }
     }
 
@@ -248,9 +263,9 @@
         }
         set
         {
-            DataEventPublisher.BeforeChange(this, "UpliftVanRightGridVerticalPointCount");
+            DataEventPublisher.BeforeChange(this, upliftVanRightGridVerticalPointCountObject);
             upliftVanRightGridVerticalPointCount = value;
-            DataEventPublisher.AfterChange(this, "UpliftVanRightGridVerticalPointCount");
+            DataEventPublisher.AfterChange(this, upliftVanRightGridVerticalPointCountObject);
         }
     }
 
@@ -266,9 +281,9 @@
         }
         set
         {
-            DataEventPublisher.BeforeChange(this, "UpliftVanRightGridVerticalPointDistance");
+            DataEventPublisher.BeforeChange(this, upliftVanRightGridVerticalPointDistanceObject);
             upliftVanRightGridVerticalPointDistance = value;
-            DataEventPublisher.AfterChange(this, "UpliftVanRightGridVerticalPointDistance");
+            DataEventPublisher.AfterChange(this, upliftVanRightGridVerticalPointDistanceObject);
         }
     }
 
@@ -283,9 +298,9 @@
         }
         set
         {
-            DataEventPublisher.BeforeChange(this, "UpliftVanRightGridHorizontalPointCount");
+            DataEventPublisher.BeforeChange(this, upliftVanRightGridHorizontalPointCountObject);
             upliftVanRightGridHorizontalPointCount = value;
-            DataEventPublisher.AfterChange(this, "UpliftVanRightGridHorizontalPointCount");
+            DataEventPublisher.AfterChange(this, upliftVanRightGridHorizontalPointCountObject);
         }
     }
 
@@ -301,9 +316,9 @@
         }
         set
         {
-            DataEventPublisher.BeforeChange(this, "UpliftVanRightGridHorizontalPointDistance");
+            DataEventPublisher.BeforeChange(this, upliftVanRightGridHorizontalPointDistanceObject);
             upliftVanRightGridHorizontalPointDistance = value;
-            DataEventPublisher.AfterChange(this, "UpliftVanRightGridHorizontalPointDistance");
+            DataEventPublisher.AfterChange(this, upliftVanRightGridHorizontalPointDistanceObject);
         }
     }
 
@@ -318,9 +333,9 @@
         }
         set
         {
-            DataEventPublisher.BeforeChange(this, "BishopGridVerticalPointCount");
+            DataEventPublisher.BeforeChange(this, bishopGridVerticalPointCountObject);
             bishopGridVerticalPointCount = value;
-            DataEventPublisher.AfterChange(this, "BishopGridVerticalPointCount");
+            DataEventPublisher.AfterChange(this, bishopGridVerticalPointCountObject);
         }
     }
 
@@ -336,9 +351,9 @@
         }
         set
         {
-            DataEventPublisher.BeforeChange(this, "BishopGridVerticalPointDistance");
+            DataEventPublisher.BeforeChange(this, bishopGridVerticalPointDistanceObject);
             bishopGridVerticalPointDistance = value;
-            DataEventPublisher.AfterChange(this, "BishopGridVerticalPointDistance");
+            DataEventPublisher.AfterChange(this, bishopGridVerticalPointDistanceObject);
         }
     }
 
@@ -353,9 +368,9 @@
         }
         set
         {
-            DataEventPublisher.BeforeChange(this, "BishopGridHorizontalPointCount");
+            DataEventPublisher.BeforeChange(this, bishopGridHorizontalPointCountObject);
             bishopGridHorizontalPointCount = value;
-            DataEventPublisher.AfterChange(this, "BishopGridHorizontalPointCount");
+            DataEventPublisher.AfterChange(this, bishopGridHorizontalPointCountObject);
         }
     }
 
@@ -371,9 +386,9 @@
         }
         set
         {
-            DataEventPublisher.BeforeChange(this, "BishopGridHorizontalPointDistance");
+            DataEventPublisher.BeforeChange(this, bishopGridHorizontalPointDistanceObject);
             bishopGridHorizontalPointDistance = value;
-            DataEventPublisher.AfterChange(this, "BishopGridHorizontalPointDistance");
+            DataEventPublisher.AfterChange(this, bishopGridHorizontalPointDistanceObject);
         }
     }
 
@@ -419,39 +434,24 @@
         {
             // Uplift Van
             case "UpliftVanGridSizeDetermination": 
-                return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan();
             case "UpliftVanTangentLinesDefinition":
-                return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan();
             case "UpliftVanTangentLinesDistance":
-                return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan();
             case "UpliftVanLeftGridVerticalPointCount":
-                return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan();
             case "UpliftVanLeftGridVerticalPointDistance":
-                return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan();
             case "UpliftVanLeftGridHorizontalPointCount":
-                return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan();
             case "UpliftVanLeftGridHorizontalPointDistance":
-                return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan();
             case "UpliftVanRightGridVerticalPointCount":
-                return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan();
             case "UpliftVanRightGridVerticalPointDistance":
-                return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan();
             case "UpliftVanRightGridHorizontalPointCount":
-                return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan();
             case "UpliftVanRightGridHorizontalPointDistance":
                 return IsStabilityUpliftVan() || IsStabilityBishopUpliftVan();
 
             // Bishop
             case "BishopSearchAreaDetermination":
-                return IsStabilityBishop() || IsStabilityBishopUpliftVan(); 
             case "BishopTangentLinesDistance":
-                return IsStabilityBishop() || IsStabilityBishopUpliftVan();
             case "BishopGridVerticalPointCount":
-                return IsStabilityBishop() || IsStabilityBishopUpliftVan();
             case "BishopGridVerticalPointDistance":
-                return IsStabilityBishop() || IsStabilityBishopUpliftVan();
             case "BishopGridHorizontalPointCount":
-                return IsStabilityBishop() || IsStabilityBishopUpliftVan();
             case "BishopGridHorizontalPointDistance":
                 return IsStabilityBishop() || IsStabilityBishopUpliftVan();
             default: return true;