[Nhibernate-commit] SF.net SVN: nhibernate:[5590] trunk/nhibernate/src/NHibernate

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

Revision: 5590
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5590&view=rev
Author:   fabiomaulo
Date:     2011-04-03 13:52:07 +0000 (Sun, 03 Apr 2011)

Log Message:
-----------
Simplified API

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPropertyContainerMapper.cs
    trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs
    trunk/nhibernate/src/NHibernate.Test/MappingByCode/NatureDemo/ShowXmlDemo.cs

Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPropertyContainerMapper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPropertyContainerMapper.cs	2011-04-03 13:43:54 UTC (rev 5589)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/IPropertyContainerMapper.cs	2011-04-03 13:52:07 UTC (rev 5590)
@@ -39,5 +39,8 @@
 		                         Action<IMapPropertiesMapper<TEntity, TKey, TElement>> collectionMapping,
 		                         Action<IMapKeyRelation<TKey>> keyMapping,
 		                         Action<ICollectionElementRelation<TElement>> mapping);
+		void Map<TKey, TElement>(Expression<Func<TEntity, IDictionary<TKey, TElement>>> property,
+														 Action<IMapPropertiesMapper<TEntity, TKey, TElement>> collectionMapping,
+														 Action<ICollectionElementRelation<TElement>> mapping);
 	}
 }
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs	2011-04-03 13:43:54 UTC (rev 5589)
+++ trunk/nhibernate/src/NHibernate/Mapping/ByCode/Impl/CustomizersImpl/PropertyContainerCustomizer.cs	2011-04-03 13:52:07 UTC (rev 5590)
@@ -149,5 +149,12 @@
 			keyMapping(new MapKeyRelationCustomizer<TKey>(explicitDeclarationsHolder, memberOfPath, CustomizersHolder));
 			mapping(new CollectionElementRelationCustomizer<TElement>(explicitDeclarationsHolder, memberOfPath, CustomizersHolder));
 		}
+
+		public void Map<TKey, TElement>(Expression<Func<TEntity, IDictionary<TKey, TElement>>> property,
+																		Action<IMapPropertiesMapper<TEntity, TKey, TElement>> collectionMapping,
+																		Action<ICollectionElementRelation<TElement>> mapping)
+		{
+			Map(property, collectionMapping, keyMapping => { }, mapping);
+		}
 	}
 }
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate.Test/MappingByCode/NatureDemo/ShowXmlDemo.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/MappingByCode/NatureDemo/ShowXmlDemo.cs	2011-04-03 13:43:54 UTC (rev 5589)
+++ trunk/nhibernate/src/NHibernate.Test/MappingByCode/NatureDemo/ShowXmlDemo.cs	2011-04-03 13:52:07 UTC (rev 5590)
@@ -66,7 +66,7 @@
 				jsc.Property(human => human.BigDecimalValue);
 				jsc.Property(human => human.BigIntegerValue);
 				jsc.Bag(human => human.Friends, cm => { }, rel => rel.ManyToMany());
-				jsc.Map(human => human.Family, cm => { }, km=> { }, rel => rel.ManyToMany());
+				jsc.Map(human => human.Family, cm => { }, rel => rel.ManyToMany());
 				jsc.Bag(human => human.Pets, cm => { cm.Inverse(true); }, rel => rel.OneToMany());
 				jsc.Set(human => human.NickNames, cm =>
 				{
@@ -97,8 +97,8 @@
 				rc.Id(x => x.Id, map => map.Generator(Generators.Native));
 				rc.Property(zoo => zoo.Name);
 				rc.Property(zoo => zoo.Classification);
-				rc.Map(zoo => zoo.Mammals, cm => { }, km => { km.Element(); }, rel => rel.OneToMany());
-				rc.Map(zoo => zoo.Animals, cm => { cm.Inverse(true); }, km => { km.Element(); }, rel => rel.OneToMany());
+				rc.Map(zoo => zoo.Mammals, cm => { }, rel => rel.OneToMany());
+				rc.Map(zoo => zoo.Animals, cm => { cm.Inverse(true); }, rel => rel.OneToMany());
 				rc.Component(zoo => zoo.Address, comp =>
 				{
 					comp.Property(address => address.Street);


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