[Nhibernate-commit] nhibernate/src/NHibernate/Impl CriteriaImpl.cs,1.7,1.8

[Kevin W. <kev...@us...>]

Update of /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12457

Modified Files:
	CriteriaImpl.cs 
Log Message:
fixing xml comments and letting ReSharper do reformatting

Index: CriteriaImpl.cs
===================================================================
RCS file: /cvsroot/nhibernate/nhibernate/src/NHibernate/Impl/CriteriaImpl.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** CriteriaImpl.cs	2 Sep 2004 04:00:41 -0000	1.7
--- CriteriaImpl.cs	31 Dec 2004 19:51:05 -0000	1.8
***************
*** 1,14 ****
- using System;
  using System.Collections;
- 
  using NHibernate.Engine;
  using NExpression = NHibernate.Expression;
  
! namespace NHibernate.Impl 
  {
  	/// <summary>
  	/// Implementation of the <see cref="ICriteria"/> interface
  	/// </summary>
! 	internal class CriteriaImpl : ICriteria 
  	{
  		private IList expressions = new ArrayList();
--- 1,12 ----
  using System.Collections;
  using NHibernate.Engine;
  using NExpression = NHibernate.Expression;
  
! namespace NHibernate.Impl
  {
  	/// <summary>
  	/// Implementation of the <see cref="ICriteria"/> interface
  	/// </summary>
! 	internal class CriteriaImpl : ICriteria
  	{
  		private IList expressions = new ArrayList();
***************
*** 19,115 ****
  		private System.Type persistentClass;
  		private SessionImpl session;
! 	
  		private NExpression.Junction conjunction = NExpression.Expression.Conjunction();
  
! 		
! 		public ICriteria SetMaxResults(int maxResults) 
  		{
  			selection.MaxRows = maxResults;
  			return this;
  		}
! 		
! 		public ICriteria SetFirstResult(int firstResult) 
  		{
  			selection.FirstRow = firstResult;
  			return this;
  		}
! 		
! 		public ICriteria SetTimeout(int timeout) 
  		{
  			selection.Timeout = timeout;
  			return this;
  		}
! 	
! 		public ICriteria Add(NExpression.Expression expression) 
  		{
! 			expressions.Add(expression);
! 			conjunction.Add(expression);
  			return this;
  		}
! 	
  		//ADDED this
! 		public NExpression.Expression Expression 
  		{
! 			get {return conjunction;}
  		}
! 		
! 		public RowSelection Selection 
  		{
  			get { return selection; }
  		}
! 	
! 		public CriteriaImpl(System.Type persistentClass, SessionImpl session) 
  		{
  			this.persistentClass = persistentClass;
  			this.session = session;
  		}
! 	
! 		public IList List() 
  		{
! 			return session.Find(this);
  		}
! 	
! 		public IEnumerator IterateExpressions() 
  		{
  			return expressions.GetEnumerator();
  		}
! 	
! 		public IEnumerator IterateOrderings() 
! 		{ 
! 			return orderings.GetEnumerator(); 
! 		} 
!     
! 		public System.Type PersistentClass 
  		{
  			get { return persistentClass; }
  		}
! 	
! 		public override string ToString() {
  			return expressions.ToString();
  		}
  
! 		public ICriteria AddOrder(NExpression.Order ordering) 
! 		{ 
! 			orderings.Add(ordering); 
! 			return this; 
! 		}          
  
! 		public FetchMode GetFetchMode(string path) 
  		{
! 			if (fetchModes.Contains(path))
  			{
! 				return (FetchMode)fetchModes[path];
  			}
  			else
  			{
! 			    return FetchMode.Default;
  			}
  		}
  
! 		public ICriteria SetFetchMode(string associationPath, FetchMode mode)
  		{
! 			fetchModes[associationPath] = mode;
  			return this;
  		}
  	}
! }
--- 17,161 ----
  		private System.Type persistentClass;
  		private SessionImpl session;
! 
  		private NExpression.Junction conjunction = NExpression.Expression.Conjunction();
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="maxResults"></param>
! 		/// <returns></returns>
! 		public ICriteria SetMaxResults( int maxResults )
  		{
  			selection.MaxRows = maxResults;
  			return this;
  		}
! 
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="firstResult"></param>
! 		/// <returns></returns>
! 		public ICriteria SetFirstResult( int firstResult )
  		{
  			selection.FirstRow = firstResult;
  			return this;
  		}
! 
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="timeout"></param>
! 		/// <returns></returns>
! 		public ICriteria SetTimeout( int timeout )
  		{
  			selection.Timeout = timeout;
  			return this;
  		}
! 
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="expression"></param>
! 		/// <returns></returns>
! 		public ICriteria Add( NExpression.Expression expression )
  		{
! 			expressions.Add( expression );
! 			conjunction.Add( expression );
  			return this;
  		}
! 
  		//ADDED this
! 		/// <summary></summary>
! 		public NExpression.Expression Expression
  		{
! 			get { return conjunction; }
  		}
! 
! 		/// <summary></summary>
! 		public RowSelection Selection
  		{
  			get { return selection; }
  		}
! 
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="persistentClass"></param>
! 		/// <param name="session"></param>
! 		public CriteriaImpl( System.Type persistentClass, SessionImpl session )
  		{
  			this.persistentClass = persistentClass;
  			this.session = session;
  		}
! 
! 		/// <summary></summary>
! 		public IList List()
  		{
! 			return session.Find( this );
  		}
! 
! 		/// <summary></summary>
! 		public IEnumerator IterateExpressions()
  		{
  			return expressions.GetEnumerator();
  		}
! 
! 		/// <summary></summary>
! 		public IEnumerator IterateOrderings()
! 		{
! 			return orderings.GetEnumerator();
! 		}
! 
! 		/// <summary></summary>
! 		public System.Type PersistentClass
  		{
  			get { return persistentClass; }
  		}
! 
! 		/// <summary></summary>
! 		public override string ToString()
! 		{
  			return expressions.ToString();
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="ordering"></param>
! 		/// <returns></returns>
! 		public ICriteria AddOrder( NExpression.Order ordering )
! 		{
! 			orderings.Add( ordering );
! 			return this;
! 		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="path"></param>
! 		/// <returns></returns>
! 		public FetchMode GetFetchMode( string path )
  		{
! 			if( fetchModes.Contains( path ) )
  			{
! 				return ( FetchMode ) fetchModes[ path ];
  			}
  			else
  			{
! 				return FetchMode.Default;
  			}
  		}
  
! 		/// <summary>
! 		/// 
! 		/// </summary>
! 		/// <param name="associationPath"></param>
! 		/// <param name="mode"></param>
! 		/// <returns></returns>
! 		public ICriteria SetFetchMode( string associationPath, FetchMode mode )
  		{
! 			fetchModes[ associationPath ] = mode;
  			return this;
  		}
  	}
! }
\ No newline at end of file