From 28f5e66c23efeb4df71c0eed3d7977f55fb031b5 Mon Sep 17 00:00:00 2001 From: Steve Bohlen Date: Fri, 20 Jul 2012 18:12:07 -0400 Subject: [PATCH 1/4] SPRNET-1514 renaming DelegatingFactoryObject and related tests --- ...ingFactoryObject.cs => DelegateInvokingFactoryObject.cs} | 6 +++--- ...ObjectTests.cs => DelegateInvokingFactoryObjectTests.cs} | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) rename src/Spring/Spring.Core/Objects/Factory/Support/{DelegatingFactoryObject.cs => DelegateInvokingFactoryObject.cs} (93%) rename test/Spring/Spring.Core.Tests/Objects/Factory/Support/{DelegatingFactoryObjectTests.cs => DelegateInvokingFactoryObjectTests.cs} (93%) diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/DelegatingFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Support/DelegateInvokingFactoryObject.cs similarity index 93% rename from src/Spring/Spring.Core/Objects/Factory/Support/DelegatingFactoryObject.cs rename to src/Spring/Spring.Core/Objects/Factory/Support/DelegateInvokingFactoryObject.cs index 22971e80..63ed941a 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/DelegatingFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/DelegateInvokingFactoryObject.cs @@ -34,18 +34,18 @@ namespace Spring.Objects.Factory.Support /// /// /// - public class DelegatingFactoryObject : IFactoryObject + public class DelegateInvokingFactoryObject : IFactoryObject { private readonly bool _isSingleton; private readonly Func _builderDelegate; /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The builder delegate. /// if set to true [is singleton]. - public DelegatingFactoryObject(Func builderDelegate, bool isSingleton) + public DelegateInvokingFactoryObject(Func builderDelegate, bool isSingleton) { _builderDelegate = builderDelegate; _isSingleton = isSingleton; diff --git a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/DelegatingFactoryObjectTests.cs b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/DelegateInvokingFactoryObjectTests.cs similarity index 93% rename from test/Spring/Spring.Core.Tests/Objects/Factory/Support/DelegatingFactoryObjectTests.cs rename to test/Spring/Spring.Core.Tests/Objects/Factory/Support/DelegateInvokingFactoryObjectTests.cs index e1597777..feeda910 100644 --- a/test/Spring/Spring.Core.Tests/Objects/Factory/Support/DelegatingFactoryObjectTests.cs +++ b/test/Spring/Spring.Core.Tests/Objects/Factory/Support/DelegateInvokingFactoryObjectTests.cs @@ -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(targetBuilder.BuildTarget, buildSingletonObjectsWhenInvoked); + var factory = new DelegateInvokingFactoryObject(targetBuilder.BuildTarget, buildSingletonObjectsWhenInvoked); Assume.That(ContextRegistry.GetContext(), Is.InstanceOf(), "test requires a registered context that implements IConfigurableApplicationContext!"); From d4fff365acac702374d8e8e5c61ba151f007b11d Mon Sep 17 00:00:00 2001 From: Steve Bohlen Date: Mon, 20 Aug 2012 10:16:47 -0400 Subject: [PATCH 2/4] fixing merge of csproj files --- src/Spring/Spring.Core/Spring.Core.2010.csproj | 2 +- test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Spring/Spring.Core/Spring.Core.2010.csproj b/src/Spring/Spring.Core/Spring.Core.2010.csproj index e6f1052e..18b82f56 100644 --- a/src/Spring/Spring.Core/Spring.Core.2010.csproj +++ b/src/Spring/Spring.Core/Spring.Core.2010.csproj @@ -710,7 +710,7 @@ - + diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj index 80c70a18..d9fbeafe 100644 --- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj +++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2010.csproj @@ -341,6 +341,7 @@ + @@ -358,7 +359,6 @@ - Code From a969ebd05253fc111f9d604b2d9cc28ba90a03a5 Mon Sep 17 00:00:00 2001 From: Steve Bohlen Date: Mon, 20 Aug 2012 10:50:06 -0400 Subject: [PATCH 3/4] fixing merge error in xml comment --- .../Objects/Factory/Support/DelegateInvokingFactoryObject.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/DelegateInvokingFactoryObject.cs b/src/Spring/Spring.Core/Objects/Factory/Support/DelegateInvokingFactoryObject.cs index 63ed941a..2fb656bd 100644 --- a/src/Spring/Spring.Core/Objects/Factory/Support/DelegateInvokingFactoryObject.cs +++ b/src/Spring/Spring.Core/Objects/Factory/Support/DelegateInvokingFactoryObject.cs @@ -41,7 +41,7 @@ namespace Spring.Objects.Factory.Support /// - /// Initializes a new instance of the class. + /// Initializes a new instance of the class. /// /// The builder delegate. /// if set to true [is singleton]. From e5c8a0396afb6f7e581b59405cf4cd1c49424998 Mon Sep 17 00:00:00 2001 From: Steve Bohlen Date: Mon, 20 Aug 2012 11:09:55 -0400 Subject: [PATCH 4/4] fixing merge errors in 2008 csproj files --- src/Spring/Spring.Core/Spring.Core.2008.csproj | 2 +- test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Spring/Spring.Core/Spring.Core.2008.csproj b/src/Spring/Spring.Core/Spring.Core.2008.csproj index 2dcd89a4..3ea6eac4 100644 --- a/src/Spring/Spring.Core/Spring.Core.2008.csproj +++ b/src/Spring/Spring.Core/Spring.Core.2008.csproj @@ -708,7 +708,7 @@ - + diff --git a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj index 0c4a138c..ace68efb 100644 --- a/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj +++ b/test/Spring/Spring.Core.Tests/Spring.Core.Tests.2008.csproj @@ -338,7 +338,7 @@ - +