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

[<jul...@us...>]

Revision: 5286
          http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5286&view=rev
Author:   julian-maughan
Date:     2010-12-02 11:46:19 +0000 (Thu, 02 Dec 2010)

Log Message:
-----------
Minor tidy-ups following on from r5267. No functional changes.

Modified Paths:
--------------
    trunk/nhibernate/src/NHibernate/Criterion/BetweenExpression.cs
    trunk/nhibernate/src/NHibernate/Criterion/InExpression.cs
    trunk/nhibernate/src/NHibernate/Engine/QueryParameters.cs
    trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs
    trunk/nhibernate/src/NHibernate/Type/TypeHelper.cs

Modified: trunk/nhibernate/src/NHibernate/Criterion/BetweenExpression.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/BetweenExpression.cs	2010-12-01 16:03:31 UTC (rev 5285)
+++ trunk/nhibernate/src/NHibernate/Criterion/BetweenExpression.cs	2010-12-02 11:46:19 UTC (rev 5286)
@@ -20,9 +20,9 @@
 		/// <summary>
 		/// Initializes a new instance of the <see cref="BetweenExpression"/> class.
 		/// </summary>
-		/// <param name="_projection">The _projection.</param>
-		/// <param name="_lo">The _lo.</param>
-		/// <param name="_hi">The _hi.</param>
+		/// <param name="projection">The _projection.</param>
+		/// <param name="lo">The _lo.</param>
+		/// <param name="hi">The _hi.</param>
 		public BetweenExpression(IProjection projection, object lo, object hi)
 		{
 			this._projection = projection;

Modified: trunk/nhibernate/src/NHibernate/Criterion/InExpression.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Criterion/InExpression.cs	2010-12-01 16:03:31 UTC (rev 5285)
+++ trunk/nhibernate/src/NHibernate/Criterion/InExpression.cs	2010-12-02 11:46:19 UTC (rev 5286)
@@ -26,7 +26,7 @@
 		/// Initializes a new instance of the <see cref="InExpression"/> class.
 		/// </summary>
 		/// <param name="projection">The projection.</param>
-		/// <param name="_values">The _values.</param>
+		/// <param name="values">The _values.</param>
 		public InExpression(IProjection projection, object[] values)
 		{
 			_projection = projection;

Modified: trunk/nhibernate/src/NHibernate/Engine/QueryParameters.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Engine/QueryParameters.cs	2010-12-01 16:03:31 UTC (rev 5285)
+++ trunk/nhibernate/src/NHibernate/Engine/QueryParameters.cs	2010-12-02 11:46:19 UTC (rev 5286)
@@ -43,7 +43,6 @@
 		private bool _readOnly;
 		private int? limitParameterIndex = null;
 		private int? offsetParameterIndex = null;
-		private int wildcardSubqueryLimitParameterIndex = -1;
 		private IDictionary<int, int> _adjustedParameterLocations;
 		private IDictionary<int, int> _tempPagingParameterIndexes;
 		private IDictionary<int, int> _pagingParameterIndexMap;

Modified: trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs	2010-12-01 16:03:31 UTC (rev 5285)
+++ trunk/nhibernate/src/NHibernate/Loader/Criteria/CriteriaQueryTranslator.cs	2010-12-02 11:46:19 UTC (rev 5286)
@@ -20,12 +20,15 @@
 	{
 		public static readonly string RootSqlAlias = CriteriaSpecification.RootAlias + '_';
 
+		private static readonly IInternalLogger logger = LoggerProvider.LoggerFor(typeof(CriteriaQueryTranslator));
+		
+		private const int AliasCount = 0;
+		
 		private readonly ICriteriaQuery outerQueryTranslator;
-
 		private readonly CriteriaImpl rootCriteria;
 		private readonly string rootEntityName;
 		private readonly string rootSQLAlias;
-		private const int aliasCount = 0;
+		private int indexForAlias = 0;		
 		private int _tempPagingParameterIndex = -1;
 		private IDictionary<int, int> _tempPagingParameterIndexes = new Dictionary<int, int>();
 
@@ -36,18 +39,12 @@
 			new Dictionary<string, ICriteriaInfoProvider>();
 
 		private readonly ISet<ICollectionPersister> criteriaCollectionPersisters = new HashedSet<ICollectionPersister>();
-
 		private readonly IDictionary<ICriteria, string> criteriaSQLAliasMap = new Dictionary<ICriteria, string>();
 		private readonly IDictionary<string, ICriteria> aliasCriteriaMap = new Dictionary<string, ICriteria>();
 		private readonly IDictionary<string, ICriteria> associationPathCriteriaMap = new LinkedHashMap<string, ICriteria>();
 		private readonly IDictionary<string, JoinType> associationPathJoinTypesMap = new LinkedHashMap<string, JoinType>();
 		private readonly IDictionary<string, ICriterion> withClauseMap = new Dictionary<string, ICriterion>();
-
 		private readonly ISessionFactoryImplementor sessionFactory;
-		private int indexForAlias = 0;
-		private static readonly IInternalLogger logger = LoggerProvider.LoggerFor(typeof(CriteriaQueryTranslator));
-
-		private readonly List<TypedValue> usedTypedValues = new List<TypedValue>();
 		private SessionFactoryHelper helper;
 
 		public CriteriaQueryTranslator(ISessionFactoryImplementor factory, CriteriaImpl criteria, string rootEntityName,
@@ -282,7 +279,7 @@
 
 		public string GenerateSQLAlias()
 		{
-			return StringHelper.GenerateAlias(rootSQLAlias, aliasCount);
+			return StringHelper.GenerateAlias(rootSQLAlias, AliasCount);
 		}
 
 		private ICriteria GetAliasedCriteria(string alias)

Modified: trunk/nhibernate/src/NHibernate/Type/TypeHelper.cs
===================================================================
--- trunk/nhibernate/src/NHibernate/Type/TypeHelper.cs	2010-12-01 16:03:31 UTC (rev 5285)
+++ trunk/nhibernate/src/NHibernate/Type/TypeHelper.cs	2010-12-02 11:46:19 UTC (rev 5286)
@@ -205,8 +205,8 @@
 	 	/// <para>If it is determined that no fields are dirty, null is returned.</para>
 		/// </summary>
 		/// <param name="properties">The property definitions</param>
-		/// <param name="x">The current state of the entity</param>
-		/// <param name="y">The baseline state of the entity</param>
+		/// <param name="currentState">The current state of the entity</param>
+		/// <param name="previousState">The baseline state of the entity</param>
 		/// <param name="includeColumns">Columns to be included in the dirty checking, per property</param>
 		/// <param name="anyUninitializedProperties">Does the entity currently hold any uninitialized property values?</param>
 		/// <param name="session">The session from which the dirty check request originated.</param>
@@ -256,8 +256,8 @@
 	 	/// <para>If it is determined that no fields are dirty, null is returned.</para>
 		/// </summary>
 		/// <param name="properties">The property definitions</param>
-		/// <param name="x">The current state of the entity</param>
-		/// <param name="y">The baseline state of the entity</param>
+		/// <param name="currentState">The current state of the entity</param>
+		/// <param name="previousState">The baseline state of the entity</param>
 		/// <param name="includeColumns">Columns to be included in the mod checking, per property</param>
 		/// <param name="anyUninitializedProperties">Does the entity currently hold any uninitialized property values?</param>
 		/// <param name="session">The session from which the dirty check request originated.</param>


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