Index: DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs
===================================================================
diff -u -r6755 -r6759
--- DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 6755)
+++ DamClients/DamUI/trunk/src/Dam/Forms/DamPlugin.cs	(.../DamPlugin.cs)	(revision 6759)
@@ -133,7 +133,7 @@
         private readonly LocationPropertyControl locationPropertyControl = new LocationPropertyControl();
         private readonly DamSurfaceLineControl damSurfaceLineControl = new DamSurfaceLineControl();
         private readonly DamProjectCalculationSpecificationPropertyControl damProjectCalculationSpecificationPropertyControl = new DamProjectCalculationSpecificationPropertyControl();
-        private readonly WaterBoardPropertyControl waterBoardPropertyControl = new WaterBoardPropertyControl();
+        private readonly DikePropertyControl dikePropertyControl = new DikePropertyControl();
         private readonly BarButtonItem showCalculationOptionsItem = new BarButtonItem();
         private readonly MapEditor mapControl = new MapEditor();
         private MainForm mainForm;
@@ -482,10 +482,8 @@
             dpc.BuildPropertyControlTabForTypes(new LocationScenariosControl(), typeof(Location), typeof(LocationJob));
             dpc.BuildPropertyControlTabForTypes(damSurfaceLineControl, typeof(SurfaceLine2), typeof(CharacteristicPoint), typeof(LocationJob));
 
-            progressDelegate = waterBoardPropertyControl.DoProgress;
-            dpc.BuildPropertyControlTabForTypes(waterBoardPropertyControl,
-                                                typeof(WaterBoard), typeof(WaterBoardJob), typeof(DamProjectData));
-            dpc.BuildPropertyControlTabForTypes(new DikePropertyControl(), typeof(Dike), typeof(DikeJob));
+            progressDelegate = dikePropertyControl.DoProgress;
+            dpc.BuildPropertyControlTabForTypes(dikePropertyControl, typeof(Dike), typeof(DikeJob));
             dpc.BuildPropertyControlTabForTypes(damProjectCalculationSpecificationPropertyControl, typeof(DamProjectData));
             dpc.BuildPropertyControlTabForTypes(designCalculationPropertyControl, typeof(CsvExportData), typeof(LocationJob));
         }
@@ -722,7 +720,7 @@
 
             DataEventPublisher.InvokeWithoutPublishingEvents(() =>
             {
-                mainForm.Invoke(new TaskDelegate(DataEventPublisher.SelectionChanged), damProject.DamProjectData.WaterBoard);
+                mainForm.Invoke(new TaskDelegate(DataEventPublisher.SelectionChanged), damProject.DamProjectData.WaterBoard.SelectedDike);
                 LogManager.Clear();
                 damProject.DamProjectData.ClearResults();
             });