-Removed superfulous checks

-Used explicit namespaces when registering views
HEskandari · Jul 24, 2010 · 6340bbd · 6340bbd
1 parent 981d274
commit 6340bbd
Show file tree

Hide file tree

Showing 10 changed files with 109 additions and 87 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
-bin
+[Bb]in
-obj
+[Oo]bj
 _ReSharper.*
 *.csproj.user
 *.resharper

diff --git a/Silverlight/Windsor.SLExample.5.0.ReSharper.user b/Silverlight/Windsor.SLExample.5.0.ReSharper.user
diff --git a/...LExample/Services/Impl/CustomerFactory.cs → ...or.SLExample/Factories/CustomerFactory.cs b/...LExample/Services/Impl/CustomerFactory.cs → ...or.SLExample/Factories/CustomerFactory.cs
@@ -1,10 +1,14 @@
-using System;
 using Castle.Core;
 using Castle.Windsor;
 using Windsor.SLExample.Model;
 
-namespace Windsor.SLExample.Services.Impl
+namespace Windsor.SLExample.Factories
 {
+    public interface ICustomerFactory
+    {
+        Customer Create(string firstname, string lastname);
+    }
+
     [Singleton]
     public class CustomerFactory : ICustomerFactory
     {

diff --git a/Silverlight/Windsor.SLExample/Installers/ModelInstaller.cs b/Silverlight/Windsor.SLExample/Installers/ModelInstaller.cs
@@ -15,8 +15,7 @@ public void Install(IWindsorContainer container, IConfigurationStore store)
                                        .Where(t => t.Namespace.EndsWith("Model"))
                                        .Configure(c => c.LifeStyle.Transient
                                                         .Proxy.AdditionalInterfaces(typeof(IEditableObject), typeof(INotifyPropertyChanged))
-                                                        .Interceptors(typeof(EditableBehavior), typeof(NotifyPropertyChangedBehavior))
+                                                        .Interceptors(typeof(EditableBehavior), typeof(NotifyPropertyChangedBehavior))));
-                              ));
         }
     }
 }
diff --git a/Silverlight/Windsor.SLExample/Installers/ServiceInstaller.cs b/Silverlight/Windsor.SLExample/Installers/ServiceInstaller.cs
@@ -3,6 +3,7 @@
 using Castle.Windsor;
 using Microsoft.Practices.ServiceLocation;
 using Windsor.SLExample.Container;
+using Windsor.SLExample.Factories;
 using Windsor.SLExample.Services;
 using Windsor.SLExample.Services.Impl;
 

diff --git a/Silverlight/Windsor.SLExample/Installers/ViewInstaller.cs b/Silverlight/Windsor.SLExample/Installers/ViewInstaller.cs
@@ -1,3 +1,4 @@
+using Castle.Facilities.FactorySupport;
 using Castle.MicroKernel.Registration;
 using Castle.MicroKernel.SubSystems.Configuration;
 using Castle.Windsor;
@@ -8,14 +9,9 @@ public class ViewInstaller : IWindsorInstaller
     {
         public void Install(IWindsorContainer container, IConfigurationStore store)
         {
-            //Register all types and filter by predicate
+            //Register all types and filter by namespace
-
             container.Register(AllTypes.FromThisAssembly()
-                                       .Where(t => t.Namespace != null &&
+                                       .Where(Component.IsInNamespace("Windsor.SLExample.Views")));
-                                                   t.Namespace.EndsWith("Views") &&
-                                                   t.IsClass &&
-                                                   t.IsInterface == false &&
-                                                   t.IsAbstract == false));
         }
     }
 }
diff --git a/Silverlight/Windsor.SLExample/Services/ICustomerFactory.cs b/Silverlight/Windsor.SLExample/Services/ICustomerFactory.cs
diff --git a/Silverlight/Windsor.SLExample/Services/Impl/CustomerRepository.cs b/Silverlight/Windsor.SLExample/Services/Impl/CustomerRepository.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using Windsor.SLExample.Factories;
 using Windsor.SLExample.Model;
 using System.Linq;
 

diff --git a/Silverlight/Windsor.SLExample/Startup/GuyWire.cs b/Silverlight/Windsor.SLExample/Startup/GuyWire.cs
@@ -7,10 +7,15 @@ public class GuyWire
     {
         private IWindsorContainer _container;
 
-        public GuyWire() : this(new WindsorContainer())
+        public GuyWire() : this(CreateContainer())
         {
         }
 
+        private static IWindsorContainer CreateContainer()
+        {
+            return new WindsorContainer();
+        }
+
         public GuyWire(IWindsorContainer container)
         {
             _container = container;

diff --git a/Silverlight/Windsor.SLExample/Windsor.SLExample.csproj b/Silverlight/Windsor.SLExample/Windsor.SLExample.csproj
@@ -95,9 +95,8 @@
     <Compile Include="Interceptors\NotifyPropertyChangedBehavior.cs" />
     <Compile Include="Model\Customer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Services\ICustomerFactory.cs" />
+    <Compile Include="Factories\CustomerFactory.cs" />
     <Compile Include="Services\ICustomerRepository.cs" />
-    <Compile Include="Services\Impl\CustomerFactory.cs" />
     <Compile Include="Services\Impl\CustomerRepository.cs" />
     <Compile Include="Services\IRepository.cs" />
     <Compile Include="Startup\GuyWire.cs" />