Index: DamEngine/trunk/src/Deltares.DamEngine.Data/Standard/ObjectCopier.cs
===================================================================
diff -u -r4031 -r4052
--- DamEngine/trunk/src/Deltares.DamEngine.Data/Standard/ObjectCopier.cs	(.../ObjectCopier.cs)	(revision 4031)
+++ DamEngine/trunk/src/Deltares.DamEngine.Data/Standard/ObjectCopier.cs	(.../ObjectCopier.cs)	(revision 4052)
@@ -49,120 +49,119 @@
 using System.Collections.Generic;
 using System.Reflection;
 
-namespace Deltares.DamEngine.Data.Standard
+namespace Deltares.DamEngine.Data.Standard;
+
+/// <summary>
+/// Class to handle copying of objects 
+/// </summary>
+public static class ObjectCopier
 {
+    private static readonly MethodInfo CloneMethod = typeof(Object).GetMethod("MemberwiseClone", BindingFlags.NonPublic | BindingFlags.Instance);
+
     /// <summary>
-    /// Class to handle copying of objects 
+    /// Determines whether this instance is primitive.
     /// </summary>
-    public static class ObjectCopier
+    /// <param name="type">The type.</param>
+    /// <returns>
+    ///   <c>true</c> if the specified type is primitive; otherwise, <c>false</c>.
+    /// </returns>
+    public static bool IsPrimitive(this Type type)
     {
-        private static readonly MethodInfo CloneMethod = typeof(Object).GetMethod("MemberwiseClone", BindingFlags.NonPublic | BindingFlags.Instance);
+        if (type == typeof(String))
+        {
+            return true;
+        }
 
-        /// <summary>
-        /// Determines whether this instance is primitive.
-        /// </summary>
-        /// <param name="type">The type.</param>
-        /// <returns>
-        ///   <c>true</c> if the specified type is primitive; otherwise, <c>false</c>.
-        /// </returns>
-        public static bool IsPrimitive(this Type type)
+        return type.IsValueType && type.IsPrimitive;
+    }
+
+    /// <summary>
+    /// Copies the specified original object.
+    /// </summary>
+    /// <param name="originalObject">The original object.</param>
+    /// <returns></returns>
+    public static Object Copy(Object originalObject)
+    {
+        return InternalCopy(originalObject, new Dictionary<Object, Object>(new ReferenceEqualityComparer()));
+    }
+
+    /// <summary>
+    /// Copies the specified original object with specified type.
+    /// </summary>
+    /// <typeparam name="T"></typeparam>
+    /// <param name="original">The original.</param>
+    /// <returns></returns>
+    public static T Copy<T>(this T original)
+    {
+        return (T) Copy((Object) original);
+    }
+
+    private static Object InternalCopy(Object originalObject, IDictionary<Object, Object> visited)
+    {
+        if (originalObject == null)
         {
-            if (type == typeof(String))
-            {
-                return true;
-            }
+            return null;
+        }
 
-            return type.IsValueType && type.IsPrimitive;
+        Type typeToReflect = originalObject.GetType();
+        if (IsPrimitive(typeToReflect))
+        {
+            return originalObject;
         }
 
-        /// <summary>
-        /// Copies the specified original object.
-        /// </summary>
-        /// <param name="originalObject">The original object.</param>
-        /// <returns></returns>
-        public static Object Copy(Object originalObject)
+        if (visited.ContainsKey(originalObject))
         {
-            return InternalCopy(originalObject, new Dictionary<Object, Object>(new ReferenceEqualityComparer()));
+            return visited[originalObject];
         }
 
-        /// <summary>
-        /// Copies the specified original object with specified type.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="original">The original.</param>
-        /// <returns></returns>
-        public static T Copy<T>(this T original)
+        if (typeof(Delegate).IsAssignableFrom(typeToReflect))
         {
-            return (T) Copy((Object) original);
+            return null;
         }
 
-        private static Object InternalCopy(Object originalObject, IDictionary<Object, Object> visited)
+        object cloneObject = CloneMethod.Invoke(originalObject, null);
+        if (typeToReflect.IsArray)
         {
-            if (originalObject == null)
+            Type arrayType = typeToReflect.GetElementType();
+            if (!IsPrimitive(arrayType))
             {
-                return null;
+                var clonedArray = (Array) cloneObject;
+                clonedArray.ForEach((array, indices) => array.SetValue(InternalCopy(clonedArray.GetValue(indices), visited), indices));
             }
+        }
 
-            Type typeToReflect = originalObject.GetType();
-            if (IsPrimitive(typeToReflect))
-            {
-                return originalObject;
-            }
+        visited.Add(originalObject, cloneObject);
+        CopyFields(originalObject, visited, cloneObject, typeToReflect);
+        RecursiveCopyBaseTypePrivateFields(originalObject, visited, cloneObject, typeToReflect);
+        return cloneObject;
+    }
 
-            if (visited.ContainsKey(originalObject))
-            {
-                return visited[originalObject];
-            }
-
-            if (typeof(Delegate).IsAssignableFrom(typeToReflect))
-            {
-                return null;
-            }
-
-            object cloneObject = CloneMethod.Invoke(originalObject, null);
-            if (typeToReflect.IsArray)
-            {
-                Type arrayType = typeToReflect.GetElementType();
-                if (!IsPrimitive(arrayType))
-                {
-                    var clonedArray = (Array) cloneObject;
-                    clonedArray.ForEach((array, indices) => array.SetValue(InternalCopy(clonedArray.GetValue(indices), visited), indices));
-                }
-            }
-
-            visited.Add(originalObject, cloneObject);
-            CopyFields(originalObject, visited, cloneObject, typeToReflect);
-            RecursiveCopyBaseTypePrivateFields(originalObject, visited, cloneObject, typeToReflect);
-            return cloneObject;
+    private static void RecursiveCopyBaseTypePrivateFields(object originalObject, IDictionary<object, object> visited, object cloneObject, Type typeToReflect)
+    {
+        if (typeToReflect.BaseType != null)
+        {
+            RecursiveCopyBaseTypePrivateFields(originalObject, visited, cloneObject, typeToReflect.BaseType);
+            CopyFields(originalObject, visited, cloneObject, typeToReflect.BaseType, BindingFlags.Instance | BindingFlags.NonPublic, info => info.IsPrivate);
         }
+    }
 
-        private static void RecursiveCopyBaseTypePrivateFields(object originalObject, IDictionary<object, object> visited, object cloneObject, Type typeToReflect)
+    private static void CopyFields(object originalObject, IDictionary<object, object> visited, object cloneObject, Type typeToReflect, BindingFlags bindingFlags = BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.FlattenHierarchy, Func<FieldInfo, bool> filter = null)
+    {
+        foreach (FieldInfo fieldInfo in typeToReflect.GetFields(bindingFlags))
         {
-            if (typeToReflect.BaseType != null)
+            if (filter != null && !filter(fieldInfo))
             {
-                RecursiveCopyBaseTypePrivateFields(originalObject, visited, cloneObject, typeToReflect.BaseType);
-                CopyFields(originalObject, visited, cloneObject, typeToReflect.BaseType, BindingFlags.Instance | BindingFlags.NonPublic, info => info.IsPrivate);
+                continue;
             }
-        }
 
-        private static void CopyFields(object originalObject, IDictionary<object, object> visited, object cloneObject, Type typeToReflect, BindingFlags bindingFlags = BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.FlattenHierarchy, Func<FieldInfo, bool> filter = null)
-        {
-            foreach (FieldInfo fieldInfo in typeToReflect.GetFields(bindingFlags))
+            if (IsPrimitive(fieldInfo.FieldType))
             {
-                if (filter != null && !filter(fieldInfo))
-                {
-                    continue;
-                }
-
-                if (IsPrimitive(fieldInfo.FieldType))
-                {
-                    continue;
-                }
-
-                object originalFieldValue = fieldInfo.GetValue(originalObject);
-                object clonedFieldValue = InternalCopy(originalFieldValue, visited);
-                fieldInfo.SetValue(cloneObject, clonedFieldValue);
+                continue;
             }
+
+            object originalFieldValue = fieldInfo.GetValue(originalObject);
+            object clonedFieldValue = InternalCopy(originalFieldValue, visited);
+            fieldInfo.SetValue(cloneObject, clonedFieldValue);
         }
     }
 }
\ No newline at end of file