Index: DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.cs
===================================================================
diff -u -r3896 -r4070
--- DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.cs	(.../DamProjectCalculationSpecificationPropertyControl.cs)	(revision 3896)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamProjectCalculationSpecificationPropertyControl.cs	(.../DamProjectCalculationSpecificationPropertyControl.cs)	(revision 4070)
@@ -42,7 +42,7 @@
             Name = "Calculation";
 
             BindSupport.Bind<DamProjectCalculationSpecification>(this, Grid, p => p.DamCalculationSpecifications);
-            
+
             DataEventPublisher.OnSelectionChanged += DataEventPublisher_OnSubSelectionChanged;
             DataEventPublisher.OnAfterChange += DataEventPublisher_OnAfterChange;
 
@@ -64,47 +64,9 @@
             }
         }
 
-        #region IPropertyControl Members
-
-
-        public bool IsVisible
-        {
-            get
-            {
-                return damProjectData != null &&
-                       (damProjectData.DamProjectType == DamProjectType.Calamity ||
-                        damProjectData.DamProjectType == DamProjectType.Design);
-            }
-        }
-
-        public object SelectedObject
-        {
-            get { return damProjectData; }
-            set
-            {
-                var data = value as DamProjectData;
-                if (data != null)
-                {
-                    damProjectData = data;
-                    damProjectCalculationSpecification = damProjectData.DamProjectCalculationSpecification;
-                    BindSupport.Assign(this, damProjectCalculationSpecification);
-                    // enable other Stability kernel options (WTI and converted .NET)
-                    BindSupport.Assign(stabilityKernelTypeSpecificationsControl1, damProjectData.DamProjectCalculationSpecification);
-                    // for now, always set first specification
-                    SetSelectedDamCalculationSpecification();
-                    if (damProjectData.DamProjectType == DamProjectType.Design)
-                    {
-                         Grid.ShowToolbar = false;
-                    }                    
-                }
-            }
-        }
-
-        #endregion
-
         private void SetSelectedDamCalculationSpecification()
         {
-            var selection = damProjectCalculationSpecification.CurrentSpecification;
+            DamFailureMechanismeCalculationSpecification selection = damProjectCalculationSpecification.CurrentSpecification;
             if (selection != null)
             {
                 selection.FailureMechanismeParamatersMStab.MStabParameters.SlipCircleDefinition.Specification =
@@ -115,6 +77,7 @@
                     // Ensure that all edits of the damProjectCalculationOptionsPropertyControl1 are updated at start
                     damProjectCalculationOptionsPropertyControl1.SelectedObject = selection;
                 }
+
                 if (selection.FailureMechanismSystemType != FailureMechanismSystemType.Piping && firstEdit)
                 {
                     // this is a hack to force update on ill placed edits.
@@ -139,5 +102,45 @@
                 }
             }
         }
+
+        #region IPropertyControl Members
+
+        public bool IsVisible
+        {
+            get
+            {
+                return damProjectData != null &&
+                       (damProjectData.DamProjectType == DamProjectType.Calamity ||
+                        damProjectData.DamProjectType == DamProjectType.Design);
+            }
+        }
+
+        public object SelectedObject
+        {
+            get
+            {
+                return damProjectData;
+            }
+            set
+            {
+                var data = value as DamProjectData;
+                if (data != null)
+                {
+                    damProjectData = data;
+                    damProjectCalculationSpecification = damProjectData.DamProjectCalculationSpecification;
+                    BindSupport.Assign(this, damProjectCalculationSpecification);
+                    // enable other Stability kernel options (WTI and converted .NET)
+                    BindSupport.Assign(stabilityKernelTypeSpecificationsControl1, damProjectData.DamProjectCalculationSpecification);
+                    // for now, always set first specification
+                    SetSelectedDamCalculationSpecification();
+                    if (damProjectData.DamProjectType == DamProjectType.Design)
+                    {
+                        Grid.ShowToolbar = false;
+                    }
+                }
+            }
+        }
+
+        #endregion
     }
-}
+}
\ No newline at end of file