From: <fab...@us...> - 2010-07-28 19:45:31
|
Revision: 5069 http://nhibernate.svn.sourceforge.net/nhibernate/?rev=5069&view=rev Author: fabiomaulo Date: 2010-07-28 19:45:24 +0000 (Wed, 28 Jul 2010) Log Message: ----------- - Fixed the build (sorry) - Removed unused method Modified Paths: -------------- trunk/nhibernate/src/NHibernate/Linq/Functions/FunctionRegistry.cs trunk/nhibernate/src/NHibernate/Linq/Visitors/SelectClauseVisitor.cs Modified: trunk/nhibernate/src/NHibernate/Linq/Functions/FunctionRegistry.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Linq/Functions/FunctionRegistry.cs 2010-07-28 19:38:13 UTC (rev 5068) +++ trunk/nhibernate/src/NHibernate/Linq/Functions/FunctionRegistry.cs 2010-07-28 19:45:24 UTC (rev 5069) @@ -12,68 +12,55 @@ { 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>(); - 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() - { - // TODO - could use reflection here - Register(new QueryableGenerator()); - Register(new StringGenerator()); - Register(new DateTimeGenerator()); - Register(new ICollectionGenerator()); - } + private FunctionRegistry() + { + // TODO - could use reflection here + Register(new QueryableGenerator()); + Register(new StringGenerator()); + Register(new DateTimeGenerator()); + Register(new ICollectionGenerator()); + } - private bool GetMethodGeneratorForType(MethodInfo method, out IHqlGeneratorForMethod methodGenerator) - { - methodGenerator = null; + private bool GetMethodGeneratorForType(MethodInfo method, out IHqlGeneratorForMethod methodGenerator) + { + methodGenerator = null; - foreach (var typeGenerator in typeGenerators.Where(typeGenerator => typeGenerator.SupportsMethod(method))) - { - methodGenerator = typeGenerator.GetMethodGenerator(method); - return true; - } - return false; - } + foreach (var typeGenerator in typeGenerators.Where(typeGenerator => typeGenerator.SupportsMethod(method))) + { + methodGenerator = typeGenerator.GetMethodGenerator(method); + return true; + } + return false; + } - private bool GetStandardLinqExtensionMethodGenerator(MethodInfo method, out IHqlGeneratorForMethod methodGenerator) - { - methodGenerator = null; + private bool GetStandardLinqExtensionMethodGenerator(MethodInfo method, out IHqlGeneratorForMethod methodGenerator) + { + methodGenerator = null; - var attr = method.GetCustomAttributes(typeof(LinqExtensionMethodAttribute), false); + var attr = method.GetCustomAttributes(typeof(LinqExtensionMethodAttribute), false); - if (attr.Length == 1) - { - // It is - methodGenerator = new HqlGeneratorForExtensionMethod((LinqExtensionMethodAttribute)attr[0], method); - return true; - } - return false; - } + if (attr.Length == 1) + { + // It is + methodGenerator = new HqlGeneratorForExtensionMethod((LinqExtensionMethodAttribute)attr[0], method); + return true; + } + return false; + } - private bool GetRegisteredMethodGenerator(MethodInfo method, out IHqlGeneratorForMethod methodGenerator) - { - if (registeredMethods.TryGetValue(method, out methodGenerator)) - { - return true; - } - return false; - } + private bool GetRegisteredMethodGenerator(MethodInfo method, out IHqlGeneratorForMethod methodGenerator) + { + if (registeredMethods.TryGetValue(method, out methodGenerator)) + { + return true; + } + return false; + } - public IHqlGeneratorForProperty GetGenerator(MemberInfo member) - { - IHqlGeneratorForProperty propertyGenerator; - - if (registeredProperties.TryGetValue(member, out propertyGenerator)) - { - return propertyGenerator; - } - - // TODO - different usage pattern to method generator - return null; - } - public bool TryGetGenerator(MethodInfo method, out IHqlGeneratorForMethod generator) { if (method.IsGenericMethod) @@ -98,21 +85,21 @@ } public void RegisterGenerator(MethodInfo method, IHqlGeneratorForMethod generator) - { - registeredMethods.Add(method, generator); - } + { + registeredMethods.Add(method, generator); + } - public void RegisterGenerator(MemberInfo property, IHqlGeneratorForProperty generator) - { - registeredProperties.Add(property, generator); - } + public void RegisterGenerator(MemberInfo property, IHqlGeneratorForProperty generator) + { + registeredProperties.Add(property, generator); + } - private void Register(IHqlGeneratorForType typeMethodGenerator) - { - typeGenerators.Add(typeMethodGenerator); - typeMethodGenerator.Register(this); - } - } + private void Register(IHqlGeneratorForType typeMethodGenerator) + { + typeGenerators.Add(typeMethodGenerator); + typeMethodGenerator.Register(this); + } + } public class HqlGeneratorForExtensionMethod : BaseHqlGeneratorForMethod { Modified: trunk/nhibernate/src/NHibernate/Linq/Visitors/SelectClauseVisitor.cs =================================================================== --- trunk/nhibernate/src/NHibernate/Linq/Visitors/SelectClauseVisitor.cs 2010-07-28 19:38:13 UTC (rev 5068) +++ trunk/nhibernate/src/NHibernate/Linq/Visitors/SelectClauseVisitor.cs 2010-07-28 19:45:24 UTC (rev 5069) @@ -71,7 +71,7 @@ return base.VisitExpression(expression); } - private static bool CanBeEvaluatedInHqlSelectStatement(Expression expression) + private bool CanBeEvaluatedInHqlSelectStatement(Expression expression) { if ((expression.NodeType == ExpressionType.MemberInit) || (expression.NodeType == ExpressionType.New) || (expression.NodeType == ExpressionType.Constant)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |