Minor (renaming)

SVN: trunk@5066

Author: fabiomaulo

src/NHibernate/Linq/Functions/BaseHqlGeneratorForType.cs

@@ -16,15 +16,15 @@ public void Register(FunctionRegistry functionRegistry)
             {
                 foreach (var method in generator.SupportedMethods)
                 {
-                    functionRegistry.RegisterMethodGenerator(method, generator);
+                    functionRegistry.RegisterGenerator(method, generator);
                 }
             }
 
             foreach (var generator in PropertyRegistry)
             {
                 foreach (var property in generator.SupportedProperties)
                 {
-                    functionRegistry.RegisterPropertyGenerator(property, generator);
+                    functionRegistry.RegisterGenerator(property, generator);
                 }
             }
         }

src/NHibernate/Linq/Functions/FunctionRegistry.cs

@@ -13,9 +13,9 @@ public class FunctionRegistry
     {
         public static readonly FunctionRegistry Instance = new FunctionRegistry();
 
-        private readonly Dictionary<MethodInfo, IHqlGeneratorForMethod> _registeredMethods = new Dictionary<MethodInfo, IHqlGeneratorForMethod>();
-        private readonly Dictionary<MemberInfo, IHqlGeneratorForProperty> _registeredProperties = new Dictionary<MemberInfo, IHqlGeneratorForProperty>();
-        private readonly List<IHqlGeneratorForType> _typeGenerators = new List<IHqlGeneratorForType>();
+        private readonly Dictionary<MethodInfo, IHqlGeneratorForMethod> registeredMethods = new Dictionary<MethodInfo, IHqlGeneratorForMethod>();
+        private readonly Dictionary<MemberInfo, IHqlGeneratorForProperty> registeredProperties = new Dictionary<MemberInfo, IHqlGeneratorForProperty>();
+        private readonly List<IHqlGeneratorForType> typeGenerators = new List<IHqlGeneratorForType>();
 
         private FunctionRegistry()
         {
@@ -26,7 +26,7 @@ private FunctionRegistry()
             Register(new ICollectionGenerator());
         }
 
-        public IHqlGeneratorForMethod GetMethodGenerator(MethodInfo method)
+        public IHqlGeneratorForMethod GetGenerator(MethodInfo method)
         {
             IHqlGeneratorForMethod methodGenerator;
 
@@ -60,7 +60,7 @@ private bool GetMethodGeneratorForType(MethodInfo method, out IHqlGeneratorForMe
         {
             methodGenerator = null;
 
-            foreach (var typeGenerator in _typeGenerators.Where(typeGenerator => typeGenerator.SupportsMethod(method)))
+            foreach (var typeGenerator in typeGenerators.Where(typeGenerator => typeGenerator.SupportsMethod(method)))
             {
                 methodGenerator = typeGenerator.GetMethodGenerator(method);
                 return true;
@@ -85,18 +85,18 @@ private bool GetStandardLinqExtensionMethodGenerator(MethodInfo method, out IHql
 
         private bool GetRegisteredMethodGenerator(MethodInfo method, out IHqlGeneratorForMethod methodGenerator)
         {
-            if (_registeredMethods.TryGetValue(method, out methodGenerator))
+            if (registeredMethods.TryGetValue(method, out methodGenerator))
             {
                 return true;
             }
             return false;
         }
 
-        public IHqlGeneratorForProperty GetPropertyGenerator(MemberInfo member)
+        public IHqlGeneratorForProperty GetGenerator(MemberInfo member)
         {
             IHqlGeneratorForProperty propertyGenerator;
 
-            if (_registeredProperties.TryGetValue(member, out propertyGenerator))
+            if (registeredProperties.TryGetValue(member, out propertyGenerator))
             {
                 return propertyGenerator;
             }
@@ -105,19 +105,19 @@ public IHqlGeneratorForProperty GetPropertyGenerator(MemberInfo member)
             return null;
         }
 
-        public void RegisterMethodGenerator(MethodInfo method, IHqlGeneratorForMethod generator)
+        public void RegisterGenerator(MethodInfo method, IHqlGeneratorForMethod generator)
         {
-            _registeredMethods.Add(method, generator);
+            registeredMethods.Add(method, generator);
         }
 
-        public void RegisterPropertyGenerator(MemberInfo property, IHqlGeneratorForProperty generator)
+        public void RegisterGenerator(MemberInfo property, IHqlGeneratorForProperty generator)
         {
-            _registeredProperties.Add(property, generator);
+            registeredProperties.Add(property, generator);
         }
 
         private void Register(IHqlGeneratorForType typeMethodGenerator)
         {
-            _typeGenerators.Add(typeMethodGenerator);
+            typeGenerators.Add(typeMethodGenerator);
             typeMethodGenerator.Register(this);
         }
     }

src/NHibernate/Linq/Visitors/HqlGeneratorExpressionTreeVisitor.cs

@@ -351,7 +351,7 @@ protected HqlTreeNode VisitMemberExpression(MemberExpression expression)
             }
 
             // Look for "special" properties (DateTime.Month etc)
-            var generator = FunctionRegistry.GetPropertyGenerator(expression.Member);
+            var generator = FunctionRegistry.GetGenerator(expression.Member);
 
             if (generator != null)
             {
@@ -394,7 +394,7 @@ protected HqlTreeNode VisitConstantExpression(ConstantExpression expression)
 
         protected HqlTreeNode VisitMethodCallExpression(MethodCallExpression expression)
         {
-            var generator = FunctionRegistry.GetMethodGenerator(expression.Method);
+            var generator = FunctionRegistry.GetGenerator(expression.Method);
 
             return generator.BuildHql(expression.Method, expression.Object, expression.Arguments, _hqlTreeBuilder, this);
         }