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

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

Revision: 4865
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4865&view=rev
Author:   fabiomaulo
Date:     2009-11-28 12:57:59 +0000 (Sat, 28 Nov 2009)

Log Message:
-----------
Binders refactoring

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMapping.cs
    trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/MappingRootBinder.cs

Modified: trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMapping.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMapping.cs	2009-11-28 12:32:05 UTC (rev 4864)
+++ trunk/nhibernate/src/NHibernate/Cfg/MappingSchema/HbmMapping.cs	2009-11-28 12:57:59 UTC (rev 4865)
@@ -38,5 +38,15 @@
 		{
 			get { return Items != null ? Items.OfType<HbmUnionSubclass>().ToArray(): new HbmUnionSubclass[0]; }
 		}
+
+		public HbmQuery[] HqlQueries
+		{
+			get { return Items1 != null ? Items1.OfType<HbmQuery>().ToArray() : new HbmQuery[0]; }
+		}
+
+		public HbmSqlQuery[] SqlQueries
+		{
+			get { return Items1 != null ? Items1.OfType<HbmSqlQuery>().ToArray() : new HbmSqlQuery[0]; }
+		}
 	}
 }
\ No newline at end of file

Modified: trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/MappingRootBinder.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/MappingRootBinder.cs	2009-11-28 12:32:05 UTC (rev 4864)
+++ trunk/nhibernate/src/NHibernate/Cfg/XmlHbmBinding/MappingRootBinder.cs	2009-11-28 12:57:59 UTC (rev 4865)
@@ -112,31 +112,13 @@
 		private void AddQueries(HbmMapping mappingSchema)
 		{
 			var binder = new NamedQueryBinder(this);
-
-			foreach (object item in mappingSchema.Items1 ?? new object[0])
-			{
-				var querySchema = item as HbmQuery;
-
-				if (querySchema != null)
-				{
-					binder.AddQuery(querySchema);
-				}
-			}
+			System.Array.ForEach(mappingSchema.HqlQueries, binder.AddQuery);
 		}
 
 		private void AddSqlQueries(HbmMapping mappingSchema)
 		{
 			var binder = new NamedSQLQueryBinder(this);
-
-			foreach (object item in mappingSchema.Items1 ?? new object[0])
-			{
-				var sqlQuerySchema = item as HbmSqlQuery;
-
-				if (sqlQuerySchema != null)
-				{
-					binder.AddSqlQuery(sqlQuerySchema);
-				}
-			}
+			System.Array.ForEach(mappingSchema.SqlQueries, binder.AddSqlQuery);
 		}
 
 		public void AddImports(HbmMapping mappingSchema)


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