[Nhibernate-commit] SF.net SVN: nhibernate:[5713] trunk/nhibernate/src/NHibernate/Mapping/ ByCode/ModelMapper.cs

[<fab...@us...>]

Revision: 5713
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5713&view=rev
Author:   fabiomaulo
Date:     2011-04-16 22:07:50 +0000 (Sat, 16 Apr 2011)

Log Message:
-----------
Refactoring (removed duplicated code)

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs

Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs	2011-04-16 21:27:47 UTC (rev 5712)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/ModelMapper.cs	2011-04-16 22:07:50 UTC (rev 5713)
@@ -1598,14 +1598,18 @@
 
 		public void AddMapping<T>() where T: IConformistHoldersProvider, new()
 		{
-			var mapping = new T();
+			AddMapping(new T());
+		}
+
+		public void AddMapping(IConformistHoldersProvider mapping)
+		{
 			var thisCustomizerHolder = customizerHolder as CustomizersHolder;
 			if (thisCustomizerHolder == null)
 			{
 				throw new NotSupportedException("To merge 'conformist' mappings, the instance of ICustomizersHolder, provided in the ModelMapper constructor, have to be a CustomizersHolder instance.");
 			}
 			var otherCustomizerHolder = mapping.CustomizersHolder as CustomizersHolder;
-			if(otherCustomizerHolder == null)
+			if (otherCustomizerHolder == null)
 			{
 				throw new NotSupportedException("The mapping class have to provide a CustomizersHolder instance.");
 			}
@@ -1630,18 +1634,7 @@
 			{
 				throw new ArgumentOutOfRangeException("type", "The mapping class must be an implementation of IConformistHoldersProvider.");
 			}
-			var thisCustomizerHolder = customizerHolder as CustomizersHolder;
-			if (thisCustomizerHolder == null)
-			{
-				throw new NotSupportedException("To merge 'conformist' mappings, the instance of ICustomizersHolder, provided in the ModelMapper constructor, have to be a CustomizersHolder instance.");
-			}
-			var otherCustomizerHolder = mapping.CustomizersHolder as CustomizersHolder;
-			if (otherCustomizerHolder == null)
-			{
-				throw new NotSupportedException("The mapping class have to provide a CustomizersHolder instance.");
-			}
-			thisCustomizerHolder.Merge(otherCustomizerHolder);
-			explicitDeclarationsHolder.Merge(mapping.ExplicitDeclarationsHolder);
+			AddMapping(mapping);
 		}
 
 		public void AddMappings(IEnumerable<System.Type> types)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.