Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into SPRNET-1518

Browse Source
This commit is contained in:
Thomas Trageser
2012-08-20 18:31:50 +01:00
parent 441cf45e58 e5c8a0396a
commit f48e169c6a
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Spring/Spring.Core/Objects/Factory/Support/DelegatingFactoryObject.cs → src/Spring/Spring.Core/Objects/Factory/Support/DelegateInvokingFactoryObject.cs
View File

@@ -34,18 +34,18 @@ namespace Spring.Objects.Factory.Support
/// </para>
/// </remarks>
/// <typeparam name="T"></typeparam>
public class DelegatingFactoryObject<T> : IFactoryObject
public class DelegateInvokingFactoryObject<T> : IFactoryObject
{
private readonly bool _isSingleton;
private readonly Func<T> _builderDelegate;
/// <summary>
/// Initializes a new instance of the <see cref="DelegatingFactoryObject&lt;T&gt;"/> class.
/// Initializes a new instance of the <see cref="DelegateInvokingFactoryObject{T}"/> class.
/// </summary>
/// <param name="builderDelegate">The builder delegate.</param>
/// <param name="isSingleton">if set to <c>true</c> [is singleton].</param>
public DelegatingFactoryObject(Func<T> builderDelegate, bool isSingleton)
public DelegateInvokingFactoryObject(Func<T> builderDelegate, bool isSingleton)
{
_builderDelegate = builderDelegate;
_isSingleton = isSingleton;

2
src/Spring/Spring.Core/Spring.Core.2008.csproj
View File

@@ -708,7 +708,7 @@
<Compile Include="Objects\Factory\Parsing\ObjectDefinitionParsingException.cs" />
<Compile Include="Objects\Factory\Parsing\Problem.cs" />
<Compile Include="Objects\Factory\Parsing\ReaderContext.cs" />
<Compile Include="Objects\Factory\Support\DelegatingFactoryObject.cs" />
<Compile Include="Objects\Factory\Support\DelegateInvokingFactoryObject.cs" />
<Compile Include="Objects\Factory\Support\IObjectDefinitionRegistryPostProcessor.cs" />
<Compile Include="Objects\Factory\Support\ObjectScope.cs" />
<Compile Include="Util\ConstructorInstantiationInfo.cs" />

2
src/Spring/Spring.Core/Spring.Core.2010.csproj
View File

@@ -710,7 +710,7 @@
<Compile Include="Objects\Factory\Parsing\ObjectDefinitionParsingException.cs" />
<Compile Include="Objects\Factory\Parsing\Problem.cs" />
<Compile Include="Objects\Factory\Parsing\ReaderContext.cs" />
<Compile Include="Objects\Factory\Support\DelegatingFactoryObject.cs" />
<Compile Include="Objects\Factory\Support\DelegateInvokingFactoryObject.cs" />
<Compile Include="Objects\Factory\Support\IObjectDefinitionRegistryPostProcessor.cs" />
<Compile Include="Objects\Factory\Support\ObjectScope.cs" />
<Compile Include="Stereotype\ControllerAttribute.cs" />

4
test/Spring/Spring.Core.Tests/Objects/Factory/Support/DelegatingFactoryObjectTests.cs → test/Spring/Spring.Core.Tests/Objects/Factory/Support/DelegateInvokingFactoryObjectTests.cs
View File

@@ -5,7 +5,7 @@ using Spring.Context.Support;
namespace Spring.Objects.Factory.Support
{
[TestFixture]
public class DelegatingFactoryObjectTests
public class DelegateInvokingFactoryObjectTests
{
[SetUp]
public void _TestSetUp()
@@ -18,7 +18,7 @@ namespace Spring.Objects.Factory.Support
private void RegisterDelegatingFactoryWithContext(bool buildSingletonObjectsWhenInvoked)
{
var targetBuilder = new ThingThatBuildsTargets();
var factory = new DelegatingFactoryObject<TargetToBuild>(targetBuilder.BuildTarget, buildSingletonObjectsWhenInvoked);
var factory = new DelegateInvokingFactoryObject<TargetToBuild>(targetBuilder.BuildTarget, buildSingletonObjectsWhenInvoked);
Assume.That(ContextRegistry.GetContext(), Is.InstanceOf<IConfigurableApplicationContext>(), "test requires a registered context that implements IConfigurableApplicationContext!");

2
test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj
View File

@@ -339,7 +339,7 @@
<Compile Include="Objects\Factory\Config\VariablePlaceholderConfigurerTests.cs" />
<Compile Include="Objects\Factory\DefaultListableObjectFactoryPerfTests.cs" />
<Compile Include="Objects\Factory\DummyConfigurableFactory.cs" />
<Compile Include="Objects\Factory\Support\DelegatingFactoryObjectTests.cs" />
<Compile Include="Objects\Factory\Support\DelegateInvokingFactoryObjectTests.cs" />
<Compile Include="Objects\Factory\Support\ManagedNameValueCollectionTests.cs" />
<Compile Include="Objects\Factory\Support\ManagedListTests.cs" />
<Compile Include="Objects\Factory\Support\ManagedDictionaryTests.cs" />

2
test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj
View File

@@ -342,6 +342,7 @@
<Compile Include="Objects\Factory\DefaultListableObjectFactoryPerfTests.cs" />
<Compile Include="Objects\Factory\DummyConfigurableFactory.cs" />
<Compile Include="Objects\Factory\ObjectFactoryUtils_PreserveOrderInHierarchy_Tests.cs" />
<Compile Include="Objects\Factory\Support\DelegateInvokingFactoryObjectTests.cs" />
<Compile Include="Objects\Factory\Support\ManagedNameValueCollectionTests.cs" />
<Compile Include="Objects\Factory\Support\ManagedListTests.cs" />
<Compile Include="Objects\Factory\Support\ManagedDictionaryTests.cs" />
@@ -359,7 +360,6 @@
<Compile Include="Objects\LazyTestObject.cs" />
<Compile Include="Objects\Support\AbstractSharedStateFactoryTests.cs" />
<Compile Include="Objects\Support\ByTypeSharedStateProviderTests.cs" />
<Compile Include="Objects\Factory\Support\DelegatingFactoryObjectTests.cs" />
<Compile Include="Objects\Support\MethodInvokerTests.cs">
<SubType>Code</SubType>
</Compile>