Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DtoPropertyAttributeMap.cs
===================================================================
diff -u -r2895 -r2898
--- DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DtoPropertyAttributeMap.cs	(.../DtoPropertyAttributeMap.cs)	(revision 2895)
+++ DamEngine/trunk/src/Deltares.DamEngine.Calculators/KernelWrappers/Assemblers/DtoPropertyAttributeMap.cs	(.../DtoPropertyAttributeMap.cs)	(revision 2898)
@@ -29,12 +29,12 @@
     /// <summary>
     /// The property bag defines a dynamic property collection (dictionary)
     /// </summary>
-    public class DtoPropertyAttributeMap : IDictionary<string, DtoPropertyAttriubteMapping>
+    public class DtoPropertyAttributeMap : IDictionary<string, DtoPropertyAttributeMapping>
     {
         /// <summary>
         /// Holds the property dictionary
         /// </summary>
-        private readonly IDictionary<string, DtoPropertyAttriubteMapping> dict = new Dictionary<string, DtoPropertyAttriubteMapping>();
+        private readonly IDictionary<string, DtoPropertyAttributeMapping> dict = new Dictionary<string, DtoPropertyAttributeMapping>();
 
         #region IDictionary<string,DtoPropertyAttriubteMapping> Members
 
@@ -43,7 +43,7 @@
         /// </summary>
         /// <param name="propName">The name of the property</param>
         /// <param name="value">The value</param>
-        public void Add(string propName, DtoPropertyAttriubteMapping item)
+        public void Add(string propName, DtoPropertyAttributeMapping item)
         {
             if (item == null)
                 throw new DtoPropertyMapException("Cannot add an empty or null item to the map");
@@ -88,15 +88,15 @@
         /// <param name="propName"></param>
         /// <param name="value"></param>
         /// <returns></returns>
-        public bool TryGetValue(string propName, out DtoPropertyAttriubteMapping value)
+        public bool TryGetValue(string propName, out DtoPropertyAttributeMapping value)
         {
             return this.dict.TryGetValue(propName, out value);
         }
 
         /// <summary>
         /// 
         /// </summary>
-        public ICollection<DtoPropertyAttriubteMapping> Values
+        public ICollection<DtoPropertyAttributeMapping> Values
         {
             get { return this.dict.Values; }
         }
@@ -106,7 +106,7 @@
         /// </summary>
         /// <param name="propName"></param>
         /// <returns></returns>
-        public DtoPropertyAttriubteMapping this[string propName]
+        public DtoPropertyAttributeMapping this[string propName]
         {
             get { return this.dict[propName]; }
             set { this.dict[propName] = value; }
@@ -116,7 +116,7 @@
         /// 
         /// </summary>
         /// <param name="item"></param>
-        public void Add(KeyValuePair<string, DtoPropertyAttriubteMapping> item)
+        public void Add(KeyValuePair<string, DtoPropertyAttributeMapping> item)
         {
             this.dict.Add(item.Key, item.Value);
         }
@@ -134,19 +134,19 @@
         /// </summary>
         /// <param name="item"></param>
         /// <returns></returns>
-        public bool Contains(KeyValuePair<string, DtoPropertyAttriubteMapping> item)
+        public bool Contains(KeyValuePair<string, DtoPropertyAttributeMapping> item)
         {
-            return ((IDictionary<string, DtoPropertyAttriubteMapping>) this.dict).Contains(item);
+            return ((IDictionary<string, DtoPropertyAttributeMapping>) this.dict).Contains(item);
         }
 
         /// <summary>
         /// 
         /// </summary>
         /// <param name="array"></param>
         /// <param name="arrayIndex"></param>
-        public void CopyTo(KeyValuePair<string, DtoPropertyAttriubteMapping>[] array, int arrayIndex)
+        public void CopyTo(KeyValuePair<string, DtoPropertyAttributeMapping>[] array, int arrayIndex)
         {
-            ((IDictionary<string, DtoPropertyAttriubteMapping>) this.dict).CopyTo(array, arrayIndex);
+            ((IDictionary<string, DtoPropertyAttributeMapping>) this.dict).CopyTo(array, arrayIndex);
         }
 
         /// <summary>
@@ -170,7 +170,7 @@
         /// </summary>
         /// <param name="item"></param>
         /// <returns></returns>
-        public bool Remove(KeyValuePair<string, DtoPropertyAttriubteMapping> item)
+        public bool Remove(KeyValuePair<string, DtoPropertyAttributeMapping> item)
         {
             return this.dict.Remove(item.Key);
         }
@@ -179,7 +179,7 @@
         /// 
         /// </summary>
         /// <returns></returns>
-        public IEnumerator<KeyValuePair<string, DtoPropertyAttriubteMapping>> GetEnumerator()
+        public IEnumerator<KeyValuePair<string, DtoPropertyAttributeMapping>> GetEnumerator()
         {
             return this.dict.GetEnumerator();
         }
@@ -190,16 +190,16 @@
         /// <returns></returns>
         IEnumerator IEnumerable.GetEnumerator()
         {
-            return (IEnumerator) ((IDictionary<string, DtoPropertyAttriubteMapping>) this.dict).GetEnumerator();
+            return (IEnumerator) ((IDictionary<string, DtoPropertyAttributeMapping>) this.dict).GetEnumerator();
         }
 
         #endregion
 
         /// <summary>
         /// Adds a property attribute mapping to the dictionary
         /// </summary>
-        /// <param name="item">The <see cref="DtoPropertyAttriubteMapping"/> item to add</param>
-        public void Add(DtoPropertyAttriubteMapping item)
+        /// <param name="item">The <see cref="DtoPropertyAttributeMapping"/> item to add</param>
+        public void Add(DtoPropertyAttributeMapping item)
         {
             if (item == null)
                 throw new ArgumentNullException("item");
@@ -210,7 +210,7 @@
         /// <summary>
         /// Adds a or updtes a property attribute mapping to the dictionary
         /// </summary>
-        /// <param name="item">The <see cref="DtoPropertyAttriubteMapping"/> item to add</param>
+        /// <param name="item">The <see cref="DtoPropertyAttributeMapping"/> item to add</param>
         public void AddOrUpdate(string propName, string attrName)
         {
             this.AddOrUpdate(propName, attrName, DtoPropertyImportance.Optional);
@@ -219,14 +219,14 @@
         /// <summary>
         /// Adds a or updtes a property attribute mapping to the dictionary
         /// </summary>
-        /// <param name="item">The <see cref="DtoPropertyAttriubteMapping"/> item to add</param>
+        /// <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");
 
             this.AddOrUpdate(propName,
-                             new DtoPropertyAttriubteMapping()
+                             new DtoPropertyAttributeMapping()
                                  {
                                      PropertyName = propName,
                                      AttributeName = attrName,
@@ -238,8 +238,8 @@
         /// <summary>
         /// Adds a or updtes a property attribute mapping to the dictionary
         /// </summary>
-        /// <param name="item">The <see cref="DtoPropertyAttriubteMapping"/> item to add</param>
-        public void AddOrUpdate(DtoPropertyAttriubteMapping item)
+        /// <param name="item">The <see cref="DtoPropertyAttributeMapping"/> item to add</param>
+        public void AddOrUpdate(DtoPropertyAttributeMapping item)
         {
             if (item == null)
                 throw new ArgumentNullException("item");
@@ -253,7 +253,7 @@
         /// </summary>
         /// <param name="propName">The name of the property</param>
         /// <param name="value">The value</param>
-        public void AddOrUpdate(string propName, DtoPropertyAttriubteMapping item)
+        public void AddOrUpdate(string propName, DtoPropertyAttributeMapping item)
         {
             if (item == null)
                 throw new ArgumentNullException("item");
@@ -275,9 +275,9 @@
         /// Adds or updates new items in the dictionary
         /// </summary>
         /// <param name="coll">The key value pair collection to handle</param>
-        public void AddOrUpdateRange(IEnumerable<DtoPropertyAttriubteMapping> coll)
+        public void AddOrUpdateRange(IEnumerable<DtoPropertyAttributeMapping> coll)
         {
-            foreach (DtoPropertyAttriubteMapping item in coll)
+            foreach (DtoPropertyAttributeMapping item in coll)
             {
                 this.AddOrUpdate(item);
             }
@@ -288,7 +288,7 @@
         /// </summary>
         /// <param name="name">The name of the property to look for</param>
         /// <returns>The item if found null otherwise</returns>
-        public DtoPropertyAttriubteMapping GetByPropertyName(string name)
+        public DtoPropertyAttributeMapping GetByPropertyName(string name)
         {
             return this.GetByPropertyName(name, StringComparison.InvariantCultureIgnoreCase);
         }
@@ -299,9 +299,9 @@
         /// <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 DtoPropertyAttriubteMapping GetByPropertyName(string name, StringComparison comparisonType)
+        public DtoPropertyAttributeMapping GetByPropertyName(string name, StringComparison comparisonType)
         {
-            IEnumerable<DtoPropertyAttriubteMapping> q = from x in this.dict.Values
+            IEnumerable<DtoPropertyAttributeMapping> q = from x in this.dict.Values
                                                          where x.PropertyName.Equals(name, comparisonType)
                                                          select x;
 
@@ -316,7 +316,7 @@
         /// </summary>
         /// <param name="name">The name of the property to look for</param>
         /// <returns>The item if found null otherwise</returns>
-        public DtoPropertyAttriubteMapping GetByAttributeName(string name)
+        public DtoPropertyAttributeMapping GetByAttributeName(string name)
         {
             return this.GetByAttributeName(name, StringComparison.InvariantCultureIgnoreCase);
         }
@@ -327,9 +327,9 @@
         /// <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 DtoPropertyAttriubteMapping GetByAttributeName(string name, StringComparison comparisonType)
+        public DtoPropertyAttributeMapping GetByAttributeName(string name, StringComparison comparisonType)
         {
-            IEnumerable<DtoPropertyAttriubteMapping> q = from x in this.dict.Values
+            IEnumerable<DtoPropertyAttributeMapping> q = from x in this.dict.Values
                                                          where x.AttributeName.Equals(name, comparisonType)
                                                          select x;