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

[<Ric...@us...>]

Revision: 4526
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=4526&view=rev
Author:   RicBrown
Date:     2009-06-24 19:58:07 +0000 (Wed, 24 Jun 2009)

Log Message:
-----------
Renamed ICriteria<T>.Add to ICriteria<T>.And (.Where to come).

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/ICriteriaOfT.cs
    trunk/nhibernate/src/NHibernate/Impl/CriteriaOfTImpl.cs
    trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/CriteriaOfTFixture.cs
    trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs

Modified: trunk/nhibernate/src/NHibernate/ICriteriaOfT.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/ICriteriaOfT.cs	2009-06-24 19:22:41 UTC (rev 4525)
+++ trunk/nhibernate/src/NHibernate/ICriteriaOfT.cs	2009-06-24 19:58:07 UTC (rev 4526)
@@ -26,7 +26,7 @@
 		/// </summary>
 		/// <param name="expression">Lambda expression</param>
 		/// <returns>criteria instance</returns>
-		ICriteria<T> Add(Expression<Func<T, bool>> expression);
+		ICriteria<T> And(Expression<Func<T, bool>> expression);
 
 		/// <summary>
 		/// Get the results of the root type and fill the <see cref="IList&lt;T&gt;"/>

Modified: trunk/nhibernate/src/NHibernate/Impl/CriteriaOfTImpl.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Impl/CriteriaOfTImpl.cs	2009-06-24 19:22:41 UTC (rev 4525)
+++ trunk/nhibernate/src/NHibernate/Impl/CriteriaOfTImpl.cs	2009-06-24 19:58:07 UTC (rev 4526)
@@ -25,7 +25,7 @@
 			get { return _criteria; }
 		}
 
-		ICriteria<T> ICriteria<T>.Add(Expression<Func<T, bool>> expression)
+		ICriteria<T> ICriteria<T>.And(Expression<Func<T, bool>> expression)
 		{
 			_criteria.Add(expression);
 			return this;

Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/CriteriaOfTFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/CriteriaOfTFixture.cs	2009-06-24 19:22:41 UTC (rev 4525)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/CriteriaOfTFixture.cs	2009-06-24 19:58:07 UTC (rev 4526)
@@ -24,7 +24,7 @@
 
 			ICriteria<Person> actual =
 				CreateTestCriteria<Person>()
-					.Add(p => p.Name == "test name");
+					.And(p => p.Name == "test name");
 
 			AssertCriteriaAreEqual(expected, actual);
 		}

Modified: trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs
===================================================================
--- trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs	2009-06-24 19:22:41 UTC (rev 4525)
+++ trunk/nhibernate/src/NHibernate.Test/Criteria/Lambda/IntegrationFixture.cs	2009-06-24 19:58:07 UTC (rev 4526)
@@ -83,7 +83,7 @@
 			{
 				IList<Person> actual =
 					s.QueryOver<Person>()
-						.Add(p => p.Name == "test person 2")
+						.And(p => p.Name == "test person 2")
 						.List();
 
 				Assert.That(actual.Count, Is.EqualTo(1));


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