Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DtoPropertyAttributeMap.cs
===================================================================
diff -u -r3893 -r4000
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DtoPropertyAttributeMap.cs	(.../DtoPropertyAttributeMap.cs)	(revision 3893)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DtoPropertyAttributeMap.cs	(.../DtoPropertyAttributeMap.cs)	(revision 4000)
@@ -36,6 +36,162 @@
         /// </summary>
         private readonly IDictionary<string, DtoPropertyAttributeMapping> dict = new Dictionary<string, DtoPropertyAttributeMapping>();
 
+        /// <summary>
+        /// Adds a property attribute mapping to the dictionary
+        /// </summary>
+        /// <param name="item">The <see cref="DtoPropertyAttributeMapping"/> item to add</param>
+        public void Add(DtoPropertyAttributeMapping item)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException("item");
+            }
+
+            Add(item.PropertyName, item);
+        }
+
+        /// <summary>
+        /// Adds a or updtes a property attribute mapping to the dictionary
+        /// </summary>
+        /// <param name="item">The <see cref="DtoPropertyAttributeMapping"/> item to add</param>
+        public void AddOrUpdate(string propName, string attrName)
+        {
+            AddOrUpdate(propName, attrName, DtoPropertyImportance.Optional);
+        }
+
+        /// <summary>
+        /// Adds a or updtes a property attribute mapping to the dictionary
+        /// </summary>
+        /// <param name="item">The <see cref="DtoPropertyAttributeMapping"/> item to add</param>
+        public void AddOrUpdate(string propName, string attrName, DtoPropertyImportance importance)
+        {
+            if (!attrName.HasValidStringValue())
+            {
+                throw new DtoPropertyMapException("attrName");
+            }
+
+            AddOrUpdate(propName,
+                        new DtoPropertyAttributeMapping
+                        {
+                            PropertyName = propName,
+                            AttributeName = attrName,
+                            Importance = importance
+                        });
+        }
+
+        /// <summary>
+        /// Adds a or updtes a property attribute mapping to the dictionary
+        /// </summary>
+        /// <param name="item">The <see cref="DtoPropertyAttributeMapping"/> item to add</param>
+        public void AddOrUpdate(DtoPropertyAttributeMapping item)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException("item");
+            }
+
+            AddOrUpdate(item.PropertyName, item);
+        }
+
+        /// <summary>
+        /// Adds or updates new items in the dictionary
+        /// </summary>
+        /// <param name="propName">The name of the property</param>
+        /// <param name="value">The value</param>
+        public void AddOrUpdate(string propName, DtoPropertyAttributeMapping item)
+        {
+            if (item == null)
+            {
+                throw new ArgumentNullException("item");
+            }
+
+            if (!propName.HasValidStringValue())
+            {
+                throw new DtoPropertyMapException("Property name (or key) is empty");
+            }
+
+            if (!dict.ContainsKey(propName))
+            {
+                Add(item.PropertyName, item);
+            }
+            else
+            {
+                dict[propName] = item;
+            }
+        }
+
+        /// <summary>
+        /// Adds or updates new items in the dictionary
+        /// </summary>
+        /// <param name="coll">The key value pair collection to handle</param>
+        public void AddOrUpdateRange(IEnumerable<DtoPropertyAttributeMapping> coll)
+        {
+            foreach (DtoPropertyAttributeMapping item in coll)
+            {
+                AddOrUpdate(item);
+            }
+        }
+
+        /// <summary>
+        /// Gets an item by property name
+        /// </summary>
+        /// <param name="name">The name of the property to look for</param>
+        /// <returns>The item if found null otherwise</returns>
+        public DtoPropertyAttributeMapping GetByPropertyName(string name)
+        {
+            return GetByPropertyName(name, StringComparison.InvariantCultureIgnoreCase);
+        }
+
+        /// <summary>
+        /// Gets an item by property name
+        /// </summary>
+        /// <param name="name">The name of the property to look for</param>        
+        /// <param name="comparisonType">The string <see cref="StringComparison"/> type</param>
+        /// <returns>The item if found null otherwise</returns>
+        public DtoPropertyAttributeMapping GetByPropertyName(string name, StringComparison comparisonType)
+        {
+            IEnumerable<DtoPropertyAttributeMapping> q = from x in dict.Values
+                                                         where x.PropertyName.Equals(name, comparisonType)
+                                                         select x;
+
+            if (q.Any())
+            {
+                return q.Single();
+            }
+
+            return null;
+        }
+
+        /// <summary>
+        /// Gets an item by attribute name
+        /// </summary>
+        /// <param name="name">The name of the property to look for</param>
+        /// <returns>The item if found null otherwise</returns>
+        public DtoPropertyAttributeMapping GetByAttributeName(string name)
+        {
+            return GetByAttributeName(name, StringComparison.InvariantCultureIgnoreCase);
+        }
+
+        /// <summary>
+        /// Gets an item by attribute name
+        /// </summary>
+        /// <param name="name">The name of the property to look for</param>
+        /// <param name="comparisonType">The string <see cref="StringComparison"/> type</param>
+        /// <returns>The item if found null otherwise</returns>
+        public DtoPropertyAttributeMapping GetByAttributeName(string name, StringComparison comparisonType)
+        {
+            IEnumerable<DtoPropertyAttributeMapping> q = from x in dict.Values
+                                                         where x.AttributeName.Equals(name, comparisonType)
+                                                         select x;
+
+            if (q.Any())
+            {
+                return q.Single();
+            }
+
+            return null;
+        }
+
         #region IDictionary<string,DtoPropertyAttriubteMapping> Members
 
         /// <summary>
@@ -46,10 +202,14 @@
         public void Add(string propName, DtoPropertyAttributeMapping item)
         {
             if (item == null)
+            {
                 throw new DtoPropertyMapException("Cannot add an empty or null item to the map");
+            }
 
             if (!item.PropertyName.HasValidStringValue() || propName != item.PropertyName)
+            {
                 throw new DtoPropertyMapException("Property name is empty or doesn't match dictionary property name (key)");
+            }
 
             dict.Add(propName, item);
         }
@@ -69,7 +229,10 @@
         /// </summary>
         public ICollection<string> Keys
         {
-            get { return dict.Keys; }
+            get
+            {
+                return dict.Keys;
+            }
         }
 
         /// <summary>
@@ -98,7 +261,10 @@
         /// </summary>
         public ICollection<DtoPropertyAttributeMapping> Values
         {
-            get { return dict.Values; }
+            get
+            {
+                return dict.Values;
+            }
         }
 
         /// <summary>
@@ -108,8 +274,14 @@
         /// <returns></returns>
         public DtoPropertyAttributeMapping this[string propName]
         {
-            get { return dict[propName]; }
-            set { dict[propName] = value; }
+            get
+            {
+                return dict[propName];
+            }
+            set
+            {
+                dict[propName] = value;
+            }
         }
 
         /// <summary>
@@ -188,149 +360,5 @@
         }
 
         #endregion
-
-        /// <summary>
-        /// Adds a property attribute mapping to the dictionary
-        /// </summary>
-        /// <param name="item">The <see cref="DtoPropertyAttributeMapping"/> item to add</param>
-        public void Add(DtoPropertyAttributeMapping item)
-        {
-            if (item == null)
-                throw new ArgumentNullException("item");
-
-            Add(item.PropertyName, item);
-        }
-
-        /// <summary>
-        /// Adds a or updtes a property attribute mapping to the dictionary
-        /// </summary>
-        /// <param name="item">The <see cref="DtoPropertyAttributeMapping"/> item to add</param>
-        public void AddOrUpdate(string propName, string attrName)
-        {
-            AddOrUpdate(propName, attrName, DtoPropertyImportance.Optional);
-        }
-
-        /// <summary>
-        /// Adds a or updtes a property attribute mapping to the dictionary
-        /// </summary>
-        /// <param name="item">The <see cref="DtoPropertyAttributeMapping"/> item to add</param>
-        public void AddOrUpdate(string propName, string attrName, DtoPropertyImportance importance)
-        {
-            if (!attrName.HasValidStringValue())
-                throw new DtoPropertyMapException("attrName");
-
-            AddOrUpdate(propName,
-                             new DtoPropertyAttributeMapping()
-                                 {
-                                     PropertyName = propName,
-                                     AttributeName = attrName,
-                                     Importance = importance
-                                 });
-        }
-
-
-        /// <summary>
-        /// Adds a or updtes a property attribute mapping to the dictionary
-        /// </summary>
-        /// <param name="item">The <see cref="DtoPropertyAttributeMapping"/> item to add</param>
-        public void AddOrUpdate(DtoPropertyAttributeMapping item)
-        {
-            if (item == null)
-                throw new ArgumentNullException("item");
-
-            AddOrUpdate(item.PropertyName, item);
-        }
-
-
-        /// <summary>
-        /// Adds or updates new items in the dictionary
-        /// </summary>
-        /// <param name="propName">The name of the property</param>
-        /// <param name="value">The value</param>
-        public void AddOrUpdate(string propName, DtoPropertyAttributeMapping item)
-        {
-            if (item == null)
-                throw new ArgumentNullException("item");
-
-            if (!propName.HasValidStringValue())
-                throw new DtoPropertyMapException("Property name (or key) is empty");
-
-            if (!dict.ContainsKey(propName))
-            {
-                Add(item.PropertyName, item);
-            }
-            else
-            {
-                dict[propName] = item;
-            }
-        }
-
-        /// <summary>
-        /// Adds or updates new items in the dictionary
-        /// </summary>
-        /// <param name="coll">The key value pair collection to handle</param>
-        public void AddOrUpdateRange(IEnumerable<DtoPropertyAttributeMapping> coll)
-        {
-            foreach (DtoPropertyAttributeMapping item in coll)
-            {
-                AddOrUpdate(item);
-            }
-        }
-
-        /// <summary>
-        /// Gets an item by property name
-        /// </summary>
-        /// <param name="name">The name of the property to look for</param>
-        /// <returns>The item if found null otherwise</returns>
-        public DtoPropertyAttributeMapping GetByPropertyName(string name)
-        {
-            return GetByPropertyName(name, StringComparison.InvariantCultureIgnoreCase);
-        }
-
-        /// <summary>
-        /// Gets an item by property name
-        /// </summary>
-        /// <param name="name">The name of the property to look for</param>        
-        /// <param name="comparisonType">The string <see cref="StringComparison"/> type</param>
-        /// <returns>The item if found null otherwise</returns>
-        public DtoPropertyAttributeMapping GetByPropertyName(string name, StringComparison comparisonType)
-        {
-            IEnumerable<DtoPropertyAttributeMapping> q = from x in dict.Values
-                                                         where x.PropertyName.Equals(name, comparisonType)
-                                                         select x;
-
-            if (q.Any())
-                return q.Single();
-
-            return null;
-        }
-
-        /// <summary>
-        /// Gets an item by attribute name
-        /// </summary>
-        /// <param name="name">The name of the property to look for</param>
-        /// <returns>The item if found null otherwise</returns>
-        public DtoPropertyAttributeMapping GetByAttributeName(string name)
-        {
-            return GetByAttributeName(name, StringComparison.InvariantCultureIgnoreCase);
-        }
-
-        /// <summary>
-        /// Gets an item by attribute name
-        /// </summary>
-        /// <param name="name">The name of the property to look for</param>
-        /// <param name="comparisonType">The string <see cref="StringComparison"/> type</param>
-        /// <returns>The item if found null otherwise</returns>
-        public DtoPropertyAttributeMapping GetByAttributeName(string name, StringComparison comparisonType)
-        {
-            IEnumerable<DtoPropertyAttributeMapping> q = from x in dict.Values
-                                                         where x.AttributeName.Equals(name, comparisonType)
-                                                         select x;
-
-            if (q.Any())
-                return q.Single();
-
-            return null;
-        }
     }
 }
\ No newline at end of file