Menu
▾
▴
[Structuremap-commits] SF.net SVN: structuremap: [73] trunk/Source/StructureMap
|
From: <jer...@us...> - 2008-04-06 19:13:16
|
Revision: 73
http://structuremap.svn.sourceforge.net/structuremap/?rev=73&view=rev
Author: jeremydmiller
Date: 2008-04-06 12:13:08 -0700 (Sun, 06 Apr 2008)
Log Message:
-----------
refactoring the emitting code
Modified Paths:
--------------
trunk/Source/StructureMap/Emitting/BuildInstanceMethod.cs
trunk/Source/StructureMap/InstanceBuilder.cs
trunk/Source/StructureMap/InstanceFactory.cs
trunk/Source/StructureMap.Testing/Container/EmittingTester.cs
trunk/Source/StructureMap.Testing.Widget/ArrayConstruction.cs
trunk/Source/StructureMap.Testing.Widget/Decision.cs
trunk/Source/StructureMap.Testing.Widget/Hierarchy.cs
trunk/Source/StructureMap.Testing.Widget2/EnumerationCheck.cs
trunk/Source/StructureMap.Testing.Widget5/BasicGridColumnInstanceBuilder.cs
Modified: trunk/Source/StructureMap/Emitting/BuildInstanceMethod.cs
===================================================================
--- trunk/Source/StructureMap/Emitting/BuildInstanceMethod.cs 2008-04-06 19:02:29 UTC (rev 72)
+++ trunk/Source/StructureMap/Emitting/BuildInstanceMethod.cs 2008-04-06 19:13:08 UTC (rev 73)
@@ -33,7 +33,7 @@
public override Type[] ArgumentList
{
- get { return new Type[] {typeof (IConfiguredInstance)}; }
+ get { return new Type[] { typeof(IConfiguredInstance), typeof(StructureMap.Pipeline.IInstanceCreator) }; }
}
public override string MethodName
Modified: trunk/Source/StructureMap/InstanceBuilder.cs
===================================================================
--- trunk/Source/StructureMap/InstanceBuilder.cs 2008-04-06 19:02:29 UTC (rev 72)
+++ trunk/Source/StructureMap/InstanceBuilder.cs 2008-04-06 19:13:08 UTC (rev 73)
@@ -24,7 +24,7 @@
get { return _manager; }
}
- public abstract object BuildInstance(IConfiguredInstance instance);
+ public abstract object BuildInstance(IConfiguredInstance instance, StructureMap.Pipeline.IInstanceCreator creator);
public void SetInstanceManager(InstanceManager manager)
{
Modified: trunk/Source/StructureMap/InstanceFactory.cs
===================================================================
--- trunk/Source/StructureMap/InstanceFactory.cs 2008-04-06 19:02:29 UTC (rev 72)
+++ trunk/Source/StructureMap/InstanceFactory.cs 2008-04-06 19:13:08 UTC (rev 73)
@@ -145,7 +145,7 @@
try
{
InstanceBuilder builder = _instanceBuilders[memento.ConcreteKey];
- object constructedInstance = builder.BuildInstance(memento);
+ object constructedInstance = builder.BuildInstance(memento, null);
CompoundInterceptor interceptor = _interceptorLibrary.FindInterceptor(constructedInstance.GetType());
return interceptor.Process(constructedInstance);
}
Modified: trunk/Source/StructureMap.Testing/Container/EmittingTester.cs
===================================================================
--- trunk/Source/StructureMap.Testing/Container/EmittingTester.cs 2008-04-06 19:02:29 UTC (rev 72)
+++ trunk/Source/StructureMap.Testing/Container/EmittingTester.cs 2008-04-06 19:13:08 UTC (rev 73)
@@ -1,4 +1,5 @@
using System;
+using System.Diagnostics;
using System.Reflection;
using NUnit.Framework;
using StructureMap.Emitting;
@@ -36,12 +37,13 @@
if (builder != null)
{
- rule = (ComplexRule) builder.BuildInstance(memento);
+ rule = (ComplexRule) builder.BuildInstance(memento, null);
}
}
catch (Exception e)
{
ex = e;
+ Debug.WriteLine(e.ToString());
}
}
Modified: trunk/Source/StructureMap.Testing.Widget/ArrayConstruction.cs
===================================================================
--- trunk/Source/StructureMap.Testing.Widget/ArrayConstruction.cs 2008-04-06 19:02:29 UTC (rev 72)
+++ trunk/Source/StructureMap.Testing.Widget/ArrayConstruction.cs 2008-04-06 19:13:08 UTC (rev 73)
@@ -68,7 +68,7 @@
}
- public override object BuildInstance(IConfiguredInstance instance)
+ public override object BuildInstance(IConfiguredInstance instance, StructureMap.Pipeline.IInstanceCreator creator)
{
return null;
}
Modified: trunk/Source/StructureMap.Testing.Widget/Decision.cs
===================================================================
--- trunk/Source/StructureMap.Testing.Widget/Decision.cs 2008-04-06 19:02:29 UTC (rev 72)
+++ trunk/Source/StructureMap.Testing.Widget/Decision.cs 2008-04-06 19:13:08 UTC (rev 73)
@@ -31,7 +31,7 @@
get { return null; }
}
- public override object BuildInstance(IConfiguredInstance instance)
+ public override object BuildInstance(IConfiguredInstance instance, StructureMap.Pipeline.IInstanceCreator creator)
{
return new Decision(
(Rule[]) Manager.CreateInstanceArray("StructureMap.Testing.Widget", instance.GetChildrenArray("Rules")));
Modified: trunk/Source/StructureMap.Testing.Widget/Hierarchy.cs
===================================================================
--- trunk/Source/StructureMap.Testing.Widget/Hierarchy.cs 2008-04-06 19:02:29 UTC (rev 72)
+++ trunk/Source/StructureMap.Testing.Widget/Hierarchy.cs 2008-04-06 19:13:08 UTC (rev 73)
@@ -108,7 +108,7 @@
}
- public override object BuildInstance(IConfiguredInstance instance)
+ public override object BuildInstance(IConfiguredInstance instance, StructureMap.Pipeline.IInstanceCreator creator)
{
return new Child(
instance.GetProperty("Name"),
Modified: trunk/Source/StructureMap.Testing.Widget2/EnumerationCheck.cs
===================================================================
--- trunk/Source/StructureMap.Testing.Widget2/EnumerationCheck.cs 2008-04-06 19:02:29 UTC (rev 72)
+++ trunk/Source/StructureMap.Testing.Widget2/EnumerationCheck.cs 2008-04-06 19:13:08 UTC (rev 73)
@@ -45,7 +45,7 @@
}
- public override object BuildInstance(IConfiguredInstance instance)
+ public override object BuildInstance(IConfiguredInstance instance, StructureMap.Pipeline.IInstanceCreator creator)
{
return new Cow(
long.Parse(instance.GetProperty("Weight")),
Modified: trunk/Source/StructureMap.Testing.Widget5/BasicGridColumnInstanceBuilder.cs
===================================================================
--- trunk/Source/StructureMap.Testing.Widget5/BasicGridColumnInstanceBuilder.cs 2008-04-06 19:02:29 UTC (rev 72)
+++ trunk/Source/StructureMap.Testing.Widget5/BasicGridColumnInstanceBuilder.cs 2008-04-06 19:13:08 UTC (rev 73)
@@ -29,7 +29,7 @@
get { throw new NotImplementedException(); }
}
- public override object BuildInstance(IConfiguredInstance instance)
+ public override object BuildInstance(IConfiguredInstance instance, StructureMap.Pipeline.IInstanceCreator creator)
{
BasicGridColumn column = new BasicGridColumn(instance.GetProperty("headerText"));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
