Reverted delegate factories to generic - makes more sense

grumpydev · Sep 8, 2011 · 2feec98 · 2feec98
1 parent b95f61c
commit 2feec98
Showing 1 changed file with 21 additions and 25 deletions.
diff --git a/src/TinyIoC/TinyIoC.cs b/src/TinyIoC/TinyIoC.cs
@@ -4,7 +4,7 @@
 // An easy to use, hassle free, Inversion of Control Container for small projects
 // and beginners alike.
 //
-// http://hg.grumpydev.com/tinyioc
+// https://github.com/grumpydev/TinyIoC
 //===============================================================================
 // Copyright © Steven Robbins.  All rights reserved.
 // THIS CODE AND INFORMATION IS PROVIDED "AS IS" WITHOUT WARRANTY
@@ -971,8 +971,7 @@ public RegisterOptions Register<RegisterType, RegisterImplementation>(RegisterIm
         public RegisterOptions Register<RegisterType>(Func<TinyIoCContainer, NamedParameterOverloads, RegisterType> factory)
             where RegisterType : class
         {
-            throw new NotImplementedException();
-            //return RegisterInternal(typeof(RegisterType), string.Empty, new DelegateFactory(typeof(RegisterType), factory));
+            return RegisterInternal(typeof(RegisterType), string.Empty, new DelegateFactory<RegisterType>(factory));
         }
 
         /// <summary>
@@ -985,8 +984,7 @@ public RegisterOptions Register<RegisterType>(Func<TinyIoCContainer, NamedParame
         public RegisterOptions Register<RegisterType>(Func<TinyIoCContainer, NamedParameterOverloads, RegisterType> factory, string name)
             where RegisterType : class
         {
-            throw new NotImplementedException();
-            //return RegisterInternal(typeof(RegisterType), name, new DelegateFactory<RegisterType>(factory));
+            return RegisterInternal(typeof(RegisterType), name, new DelegateFactory<RegisterType>(factory));
         }
 
         /// <summary>
@@ -2111,14 +2109,15 @@ public override ObjectFactoryBase MultiInstanceVariant
         /// <summary>
         /// IObjectFactory that invokes a specified delegate to construct the object
         /// </summary>
-        private class DelegateFactory : ObjectFactoryBase
+        /// <typeparam name="RegisterType">Registered type to be constructed</typeparam>
+        private class DelegateFactory<RegisterType> : ObjectFactoryBase
+            where RegisterType : class
         {
-            private readonly Type registerType;
-            private Func<TinyIoCContainer, NamedParameterOverloads, object> _factory;
+            private Func<TinyIoCContainer, NamedParameterOverloads, RegisterType> _factory;
 
             public override bool AssumeConstruction { get { return true; } }
 
-            public override Type CreatesType { get { return this.registerType; } }
+            public override Type CreatesType { get { return typeof(RegisterType); } }
 
             public override object GetObject(Type requestedType, TinyIoCContainer container, NamedParameterOverloads parameters, ResolveOptions options)
             {
@@ -2128,24 +2127,23 @@ public override object GetObject(Type requestedType, TinyIoCContainer container,
                 }
                 catch (Exception ex)
                 {
-                    throw new TinyIoCResolutionException(this.registerType, ex);
+                    throw new TinyIoCResolutionException(typeof(RegisterType), ex);
                 }
             }
 
-            public DelegateFactory(Type registerType, Func<TinyIoCContainer, NamedParameterOverloads, object> factory)
+            public DelegateFactory(Func<TinyIoCContainer, NamedParameterOverloads, RegisterType> factory)
             {
                 if (factory == null)
                     throw new ArgumentNullException("factory");
 
-                this.registerType = registerType;
                 _factory = factory;
             }
 
             public override ObjectFactoryBase WeakReferenceVariant
             {
                 get
                 {
-                    return new WeakDelegateFactory(this.registerType, _factory);
+                    return new WeakDelegateFactory<RegisterType>(_factory);
                 }
             }
 
@@ -2165,39 +2163,37 @@ public override void SetConstructor(ConstructorInfo constructor)
 
         /// <summary>
         /// IObjectFactory that invokes a specified delegate to construct the object
-        /// 
         /// Holds the delegate using a weak reference
         /// </summary>
         /// <typeparam name="RegisterType">Registered type to be constructed</typeparam>
-        private class WeakDelegateFactory : ObjectFactoryBase
+        private class WeakDelegateFactory<RegisterType> : ObjectFactoryBase
+            where RegisterType : class
         {
-            private readonly Type registerType;
             private WeakReference _factory;
 
             public override bool AssumeConstruction { get { return true; } }
 
-            public override Type CreatesType { get { return this.registerType; } }
+            public override Type CreatesType { get { return typeof(RegisterType); } }
 
             public override object GetObject(Type requestedType, TinyIoCContainer container, NamedParameterOverloads parameters, ResolveOptions options)
             {
-                var factory = _factory.Target as Func<TinyIoCContainer, NamedParameterOverloads, object>;
+                var factory = _factory.Target as Func<TinyIoCContainer, NamedParameterOverloads, RegisterType>;
 
                 if (factory == null)
-                    throw new TinyIoCWeakReferenceException(this.registerType);
+                    throw new TinyIoCWeakReferenceException(typeof(RegisterType));
 
                 try
                 {
                     return factory.Invoke(container, parameters);
                 }
                 catch (Exception ex)
                 {
-                    throw new TinyIoCResolutionException(this.registerType, ex);
+                    throw new TinyIoCResolutionException(typeof(RegisterType), ex);
                 }
             }
 
-            public WeakDelegateFactory(Type registerType, Func<TinyIoCContainer, NamedParameterOverloads, object> factory)
+            public WeakDelegateFactory(Func<TinyIoCContainer, NamedParameterOverloads, RegisterType> factory)
             {
-                this.registerType = registerType;
                 if (factory == null)
                     throw new ArgumentNullException("factory");
 
@@ -2208,12 +2204,12 @@ public override ObjectFactoryBase StrongReferenceVariant
             {
                 get
                 {
-                    var factory = _factory.Target as Func<TinyIoCContainer, NamedParameterOverloads, object>;
+                    var factory = _factory.Target as Func<TinyIoCContainer, NamedParameterOverloads, RegisterType>;
 
                     if (factory == null)
-                        throw new TinyIoCWeakReferenceException(this.registerType);
+                        throw new TinyIoCWeakReferenceException(typeof(RegisterType));
 
-                    return new DelegateFactory(this.registerType, factory);
+                    return new DelegateFactory<RegisterType>(factory);
                 }
             }