Refactoring

SVN: trunk@5068

Author: fabiomaulo

src/NHibernate/Linq/Functions/FunctionRegistry.cs

@@ -10,7 +10,7 @@ namespace NHibernate.Linq.Functions
 {
 	public class FunctionRegistry : ILinqToHqlGeneratorsRegistry
 	{
-        public static readonly FunctionRegistry Instance = new FunctionRegistry();
+		public static readonly ILinqToHqlGeneratorsRegistry Instance = new FunctionRegistry();
 
         private readonly Dictionary<MethodInfo, IHqlGeneratorForMethod> registeredMethods = new Dictionary<MethodInfo, IHqlGeneratorForMethod>();
         private readonly Dictionary<MemberInfo, IHqlGeneratorForProperty> registeredProperties = new Dictionary<MemberInfo, IHqlGeneratorForProperty>();

src/NHibernate/Linq/Visitors/HqlGeneratorExpressionTreeVisitor.cs

@@ -12,7 +12,7 @@ public class HqlGeneratorExpressionTreeVisitor : IHqlExpressionVisitor
     {
         private readonly HqlTreeBuilder _hqlTreeBuilder;
         private readonly VisitorParameters _parameters;
-        static private readonly FunctionRegistry FunctionRegistry = FunctionRegistry.Instance;
+				private readonly ILinqToHqlGeneratorsRegistry functionRegistry;
 
         public static HqlTreeNode Visit(Expression expression, VisitorParameters parameters)
         {
@@ -23,7 +23,8 @@ public static HqlTreeNode Visit(Expression expression, VisitorParameters paramet
 
         public HqlGeneratorExpressionTreeVisitor(VisitorParameters parameters)
         {
-            _parameters = parameters;
+        	functionRegistry = FunctionRegistry.Instance;
+        	_parameters = parameters;
 			_hqlTreeBuilder = new HqlTreeBuilder();
         }
 
@@ -352,9 +353,8 @@ protected HqlTreeNode VisitMemberExpression(MemberExpression expression)
 
             // Look for "special" properties (DateTime.Month etc)
             IHqlGeneratorForProperty generator;
-        	generator = FunctionRegistry.GetGenerator(expression.Member);
 
-        	if (generator != null)
+					if (functionRegistry.TryGetGenerator(expression.Member, out generator))
             {
                 return generator.BuildHql(expression.Member, expression.Expression, _hqlTreeBuilder, this);
             }
@@ -398,7 +398,7 @@ protected HqlTreeNode VisitMethodCallExpression(MethodCallExpression expression)
 					IHqlGeneratorForMethod generator;
 
         	var method = expression.Method;
-        	if (!FunctionRegistry.TryGetGenerator(method, out generator))
+        	if (!functionRegistry.TryGetGenerator(method, out generator))
 					{
 						throw new NotSupportedException(method.ToString());
 					}

src/NHibernate/Linq/Visitors/SelectClauseVisitor.cs

@@ -10,7 +10,7 @@ namespace NHibernate.Linq.Visitors
 {
     public class SelectClauseVisitor : ExpressionTreeVisitor
     {
-        static private readonly FunctionRegistry FunctionRegistry = FunctionRegistry.Instance;
+			private readonly ILinqToHqlGeneratorsRegistry functionRegistry;
 
         private HashSet<Expression> _hqlNodes;
         private readonly ParameterExpression _inputParameter;
@@ -20,7 +20,8 @@ public class SelectClauseVisitor : ExpressionTreeVisitor
 
         public SelectClauseVisitor(System.Type inputType, VisitorParameters parameters)
         {
-            _inputParameter = Expression.Parameter(inputType, "input");
+        	functionRegistry = FunctionRegistry.Instance;
+        	_inputParameter = Expression.Parameter(inputType, "input");
             _parameters = parameters;
         }
 
@@ -82,7 +83,7 @@ private static bool CanBeEvaluatedInHqlSelectStatement(Expression expression)
             {
                 // Depends if it's in the function registry
                 IHqlGeneratorForMethod methodGenerator;
-                if (!FunctionRegistry.TryGetGenerator(((MethodCallExpression) expression).Method, out methodGenerator))
+                if (!functionRegistry.TryGetGenerator(((MethodCallExpression) expression).Method, out methodGenerator))
                 {
                     return false;
                 }