Code cleanup

Author: hazzik

src/NHibernate/Linq/Visitors/QueryModelVisitor.cs

@@ -164,12 +164,6 @@ public override void VisitAdditionalFromClause(AdditionalFromClause fromClause,
 		{
 			var querySourceName = VisitorParameters.QuerySourceNamer.GetName(fromClause);
 
-			//var joinClause = fromClause as NhJoinClause;
-			//if (joinClause != null)
-			//{
-			//	VisitNhJoinClause(querySourceName, joinClause);
-			//}
-			//else
 			if (fromClause.FromExpression is MemberExpression)
 			{
 				// It's a join
@@ -191,19 +185,21 @@ public override void VisitAdditionalFromClause(AdditionalFromClause fromClause,
 			base.VisitAdditionalFromClause(fromClause, queryModel, index);
 		}
 
-		private void VisitNhJoinClause(string querySourceName, NhJoinClause joinClause)
+		public override void VisitNhJoinClause(NhJoinClause joinClause, QueryModel queryModel, int index)
 		{
+			var querySourceName = VisitorParameters.QuerySourceNamer.GetName(joinClause);
+
 			var expression = HqlGeneratorExpressionVisitor.Visit(joinClause.FromExpression, VisitorParameters).AsExpression();
 			var alias = _hqlTree.TreeBuilder.Alias(querySourceName);
 
 			HqlTreeNode hqlJoin;
 			if (joinClause.IsInner)
 			{
-				hqlJoin = _hqlTree.TreeBuilder.Join(expression, @alias);
+				hqlJoin = _hqlTree.TreeBuilder.Join(expression, alias);
 			}
 			else
 			{
-				hqlJoin = _hqlTree.TreeBuilder.LeftJoin(expression, @alias);
+				hqlJoin = _hqlTree.TreeBuilder.LeftJoin(expression, alias);
 			}
 
 			foreach (var withClause in joinClause.Restrictions)
@@ -311,12 +307,5 @@ public override void VisitNhWithClause(NhWithClause withClause, QueryModel query
 			var expression = HqlGeneratorExpressionVisitor.Visit(withClause.Predicate, VisitorParameters).ToBooleanExpression();
 			_hqlTree.AddWhereClause(expression);
 		}
-
-		public override void VisitNhJoinClause(NhJoinClause joinClause, QueryModel queryModel, int index)
-		{
-			var querySourceName = VisitorParameters.QuerySourceNamer.GetName(joinClause);
-
-			VisitNhJoinClause(querySourceName, joinClause);
-		}
 	}
 }