diff --git a/src/NzbDrone.Common/Composition/Container.cs b/src/NzbDrone.Common/Composition/Container.cs index 47fd372de..9e80b75c5 100644 --- a/src/NzbDrone.Common/Composition/Container.cs +++ b/src/NzbDrone.Common/Composition/Container.cs @@ -24,8 +24,6 @@ namespace NzbDrone.Common.Composition _container.Register(); } - public TinyIoCContainer TinyContainer { get { return _container; } } - public void Register(T instance) where T : class { _container.Register(instance); @@ -51,18 +49,6 @@ namespace NzbDrone.Common.Composition _container.Register((c, n) => factory(this)); } - public void RegisterSingleton() - where TImplementation : class, TService - where TService : class - { - _container.Register().AsSingleton(); - } - - public void RegisterSingleton() where T : class - { - _container.Register().AsSingleton(); - } - public void RegisterSingleton(Type service, Type implementation) { _container.Register(service, implementation).AsSingleton(); @@ -73,16 +59,6 @@ namespace NzbDrone.Common.Composition return _container.ResolveAll(); } - public IEnumerable ResolveAll(Type type) - { - return _container.ResolveAll(type); - } - - public void Register(Type registrationType, object instance) - { - _container.Register(registrationType, instance); - } - public void RegisterAllAsSingleton(Type registrationType, IEnumerable implementationList) { _container.RegisterMultiple(registrationType, implementationList).AsSingleton(); diff --git a/src/NzbDrone.Common/Composition/IContainer.cs b/src/NzbDrone.Common/Composition/IContainer.cs index e65009f24..43335f200 100644 --- a/src/NzbDrone.Common/Composition/IContainer.cs +++ b/src/NzbDrone.Common/Composition/IContainer.cs @@ -6,7 +6,6 @@ namespace NzbDrone.Common.Composition { public interface IContainer { - TinyIoCContainer TinyContainer { get; } void Register(T instance) where T : class; void Register() @@ -16,14 +15,8 @@ namespace NzbDrone.Common.Composition object Resolve(Type type); void Register(Type serviceType, Type implementationType); void Register(Func factory) where TService : class; - void RegisterSingleton() - where TImplementation : class, TService - where TService : class; - void RegisterSingleton() where T : class; void RegisterSingleton(Type service, Type implementation); IEnumerable ResolveAll() where T : class; - IEnumerable ResolveAll(Type type); - void Register(Type registrationType, object instance); void RegisterAllAsSingleton(Type registrationType, IEnumerable implementationList); bool IsTypeRegistered(Type type);