[Structuremap-commits] SF.net SVN: structuremap: [58] trunk/Source/StructureMap

[<jer...@us...>]

Revision: 58
          http://structuremap.svn.sourceforge.net/structuremap/?rev=58&view=rev
Author:   jeremydmiller
Date:     2008-01-16 06:23:24 -0800 (Wed, 16 Jan 2008)

Log Message:
-----------
adding work to interception cleanup

Modified Paths:
--------------
    trunk/Source/StructureMap/Configuration/DSL/Registry.cs
    trunk/Source/StructureMap/Configuration/Mementos/MemoryInstanceMemento.cs
    trunk/Source/StructureMap/StructureMap.csproj

Added Paths:
-----------
    trunk/Source/StructureMap/Interceptors/FilteredInstanceInterceptor.cs

Removed Paths:
-------------
    trunk/Source/StructureMap/Delegates.cs

Modified: trunk/Source/StructureMap/Configuration/DSL/Registry.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/DSL/Registry.cs	2008-01-15 15:56:14 UTC (rev 57)
+++ trunk/Source/StructureMap/Configuration/DSL/Registry.cs	2008-01-16 14:23:24 UTC (rev 58)
@@ -6,6 +6,8 @@
 
 namespace StructureMap.Configuration.DSL
 {
+    public delegate object InterceptionDelegate(object target);
+
     public class Registry : IDisposable
     {
         private readonly List<IExpression> _expressions = new List<IExpression>();

Modified: trunk/Source/StructureMap/Configuration/Mementos/MemoryInstanceMemento.cs
===================================================================
--- trunk/Source/StructureMap/Configuration/Mementos/MemoryInstanceMemento.cs	2008-01-15 15:56:14 UTC (rev 57)
+++ trunk/Source/StructureMap/Configuration/Mementos/MemoryInstanceMemento.cs	2008-01-16 14:23:24 UTC (rev 58)
@@ -50,11 +50,11 @@
 
         #endregion
 
-        private Hashtable _children = new Hashtable();
-        private string _concreteKey;
+        private readonly Hashtable _children = new Hashtable();
+        private readonly string _concreteKey;
         private string _instanceKey;
         private bool _isReference;
-        private NameValueCollection _properties = new NameValueCollection();
+        private readonly NameValueCollection _properties = new NameValueCollection();
         private string _referenceKey;
 
 
@@ -66,6 +66,7 @@
         public MemoryInstanceMemento(string concreteKey, string instanceKey)
             : this(concreteKey, instanceKey, new NameValueCollection())
         {
+            
         }
 
 

Deleted: trunk/Source/StructureMap/Delegates.cs
===================================================================
--- trunk/Source/StructureMap/Delegates.cs	2008-01-15 15:56:14 UTC (rev 57)
+++ trunk/Source/StructureMap/Delegates.cs	2008-01-16 14:23:24 UTC (rev 58)
@@ -1,4 +0,0 @@
-namespace StructureMap
-{
-    public delegate object InterceptionDelegate(object instance);
-}
\ No newline at end of file

Added: trunk/Source/StructureMap/Interceptors/FilteredInstanceInterceptor.cs
===================================================================
--- trunk/Source/StructureMap/Interceptors/FilteredInstanceInterceptor.cs	                        (rev 0)
+++ trunk/Source/StructureMap/Interceptors/FilteredInstanceInterceptor.cs	2008-01-16 14:23:24 UTC (rev 58)
@@ -0,0 +1,9 @@
+using System;
+
+namespace StructureMap.Interceptors
+{
+    public interface TypeInterceptor : InstanceInterceptor
+    {
+        bool MatchesType(Type type);
+    }
+}
\ No newline at end of file

Modified: trunk/Source/StructureMap/StructureMap.csproj
===================================================================
--- trunk/Source/StructureMap/StructureMap.csproj	2008-01-15 15:56:14 UTC (rev 57)
+++ trunk/Source/StructureMap/StructureMap.csproj	2008-01-16 14:23:24 UTC (rev 58)
@@ -335,7 +335,6 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="ConstructorMemento.cs" />
-    <Compile Include="Delegates.cs" />
     <Compile Include="DeploymentTasks\DeploymentConfiguration.cs">
       <SubType>Code</SubType>
     </Compile>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.