Index: dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs
===================================================================
diff -u -r463 -r480
--- dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 463)
+++ dam clients/DamUI/trunk/src/Dam/Tests/DamEngineIo/FillXmlInputFromDamUiTests.cs	(.../FillXmlInputFromDamUiTests.cs)	(revision 480)
@@ -26,17 +26,24 @@
 
         private DamProjectData CreateExampleDamProjectData()
         {
-            const int locationCount = 3;
             var damProjectData = new DamProjectData();
             damProjectData.DamProjectType = DamProjectType.Design;
             damProjectData.WaterBoard = new WaterBoard();
             damProjectData.WaterBoard.Dikes = new List<Dike>();
             damProjectData.WaterBoard.Dikes.Add(new Dike());
+            Dike dike = damProjectData.WaterBoard.Dikes[0];
+            AddLocations(dike);
+            return damProjectData;
+        }
+
+        private static void AddLocations(Dike dike)
+        {
+            const int locationCount = 3;
             for (int i = 0; i < locationCount; i++)
             {
                 var location = new Location();
-                location.PLLineCreationMethod = (PLLineCreationMethod)i;
-                location.IntrusionVerticalWaterPressure = (IntrusionVerticalWaterPressureType)i;
+                location.PLLineCreationMethod = (PLLineCreationMethod) i;
+                location.IntrusionVerticalWaterPressure = (IntrusionVerticalWaterPressureType) i;
                 location.PolderLevel = 1.0 * i + 0.11;
                 location.DampingFactorPL4 = 1.0 * i + 0.12;
                 location.DampingFactorPL3 = 1.0 * i + 0.13;
@@ -55,9 +62,8 @@
                 location.HeadPL2 = 1.0 * i + 0.24;
                 location.HeadPl3 = 1.0 * i + 0.25;
                 location.HeadPl4 = 1.0 * i + 0.21;
-                damProjectData.WaterBoard.Dikes[0].Locations.Add(location);
+                dike.Locations.Add(location);
             }
-            return damProjectData;
         }
 
         private void CompareDamProjectData(DamProjectData actual, DamProjectData expected)
Index: dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs
===================================================================
diff -u -r458 -r480
--- dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 458)
+++ dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillXmlInputFromDamUi.cs	(.../FillXmlInputFromDamUi.cs)	(revision 480)
@@ -16,11 +16,18 @@
         {
             Input input = new Input();
             input.DamProjectType = ConversionHelper.ConvertToInputDamProjectType(damProjectData.DamProjectType);
-            int locationCount = damProjectData.WaterBoard.Dikes[0].Locations.Count;
+            Dike dike = damProjectData.WaterBoard.Dikes[0];
+            TransferLocations(dike, input);
+            return input;
+        }
+
+        private static void TransferLocations(Dike dike, Input input)
+        {
+            int locationCount = dike.Locations.Count;
             input.Locations = new DamEngine.Io.XmlInput.Location[locationCount];
             for (int i = 0; i < locationCount; i++)
             {
-                var location = damProjectData.WaterBoard.Dikes[0].Locations[i];
+                var location = dike.Locations[i];
                 input.Locations[i] = new DamEngine.Io.XmlInput.Location();
                 var waternetOptions = new LocationWaternetOptions();
 
@@ -51,7 +58,6 @@
                 waternetOptions.Pl1BelowToeDikePolderside = location.PlLineOffsetBelowDikeToeAtPolder;
                 input.Locations[i].WaternetOptions = waternetOptions;
             }
-            return input;
         }
     }
 }
Index: dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs
===================================================================
diff -u -r458 -r480
--- dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs	(.../FillDamUiFromXmlInput.cs)	(revision 458)
+++ dam clients/DamUI/trunk/src/Dam/Data/DamEngineIo/FillDamUiFromXmlInput.cs	(.../FillDamUiFromXmlInput.cs)	(revision 480)
@@ -21,6 +21,13 @@
             damProjectData.WaterBoard = new WaterBoard();
             damProjectData.WaterBoard.Dikes = new List<Dike>();
             damProjectData.WaterBoard.Dikes.Add(new Dike());
+            Dike dike = damProjectData.WaterBoard.Dikes[0];
+            TransferLocations(input, dike);
+            return damProjectData;
+        }
+
+        private static void TransferLocations(Input input, Dike dike)
+        {
             for (int i = 0; i < input.Locations.Length; i++)
             {
                 var location = new Location();
@@ -32,23 +39,22 @@
                 location.DampingFactorPL4 = waternetOptions.DampingFactorPL3;
                 location.DampingFactorPL3 = waternetOptions.DampingFactorPL4;
                 location.PenetrationLength = waternetOptions.PenetrationLength;
-                location.PlLineOffsetBelowDikeCrestMiddle = (waternetOptions.Pl1BelowCrestMiddleSpecified ? (double?)waternetOptions.Pl1BelowCrestMiddle : null);
+                location.PlLineOffsetBelowDikeCrestMiddle = (waternetOptions.Pl1BelowCrestMiddleSpecified ? (double?) waternetOptions.Pl1BelowCrestMiddle : null);
                 location.UsePlLineOffsetFactorBelowShoulderCrest = waternetOptions.Pl1FactorBelowShoulderCrestSpecified;
                 location.PlLineOffsetFactorBelowShoulderCrest = waternetOptions.Pl1FactorBelowShoulderCrest;
-                location.PlLineOffsetDryBelowDikeCrestMiddle = (waternetOptions.DryPl1BelowCrestMiddleSpecified ? (double?)waternetOptions.DryPl1BelowCrestMiddle : null);
+                location.PlLineOffsetDryBelowDikeCrestMiddle = (waternetOptions.DryPl1BelowCrestMiddleSpecified ? (double?) waternetOptions.DryPl1BelowCrestMiddle : null);
                 location.UsePlLineOffsetDryFactorBelowShoulderCrest = waternetOptions.DryPl1FactorBelowShoulderCrestSpecified;
                 location.PlLineOffsetDryFactorBelowShoulderCrest = waternetOptions.DryPl1FactorBelowShoulderCrest;
-                location.HeadPL2 = (waternetOptions.HeadPl2Specified ? (double?)waternetOptions.HeadPl2 : null);
-                location.HeadPl3 = (waternetOptions.HeadPl3Specified ? (double?)waternetOptions.HeadPl3 : null);
-                location.HeadPl4 = (waternetOptions.HeadPl4Specified ? (double?)waternetOptions.HeadPl4 : null);
+                location.HeadPL2 = (waternetOptions.HeadPl2Specified ? (double?) waternetOptions.HeadPl2 : null);
+                location.HeadPl3 = (waternetOptions.HeadPl3Specified ? (double?) waternetOptions.HeadPl3 : null);
+                location.HeadPl4 = (waternetOptions.HeadPl4Specified ? (double?) waternetOptions.HeadPl4 : null);
                 location.SlopeDampingPiezometricHeightPolderSide = waternetOptions.SlopeDampingFactor;
                 location.PlLineOffsetBelowDikeTopAtRiver = waternetOptions.Pl1BelowCrestRiverside;
                 location.PlLineOffsetBelowDikeTopAtPolder = waternetOptions.Pl1BelowCrestPolderside;
                 location.PlLineOffsetBelowShoulderBaseInside = waternetOptions.Pl1BelowShoulderCrestPolderside;
                 location.PlLineOffsetBelowDikeToeAtPolder = waternetOptions.Pl1BelowToeDikePolderside;
-                damProjectData.WaterBoard.Dikes[0].Locations.Add(location);
+                dike.Locations.Add(location);
             }
-            return damProjectData;
         }
     }
 }