From 1261b223ffaa31048eb6b1f01c77456a740b9139 Mon Sep 17 00:00:00 2001
From: Thomas Trageser <thomast74@gmail.com>
Date: Mon, 3 Sep 2012 11:13:22 +0100
Subject: [PATCH] Resolved .Net3.5 compile issues relating to ISet

---
 ...alifierAnnotationAutowireCandidateResolver.cs | 16 ++++++++++------
 .../Factory/Support/AbstractObjectFactory.cs     |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/Spring/Spring.Core/Objects/Factory/Attributes/QualifierAnnotationAutowireCandidateResolver.cs b/src/Spring/Spring.Core/Objects/Factory/Attributes/QualifierAnnotationAutowireCandidateResolver.cs
index e521ac5f..73d82a09 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Attributes/QualifierAnnotationAutowireCandidateResolver.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Attributes/QualifierAnnotationAutowireCandidateResolver.cs
@@ -20,7 +20,7 @@
 
 using System;
 using System.Collections.Generic;
-using System.Diagnostics;
+using Spring.Collections.Generic;
 using Spring.Core;
 using Spring.Core.TypeConversion;
 using Spring.Objects.Factory.Config;
@@ -38,7 +38,7 @@ namespace Spring.Objects.Factory.Attributes
     {
         private IObjectFactory _objectFactory;
 
-        private ISet<Type> _qualifierTypes = new HashSet<Type>();
+        private Collections.Generic.ISet<Type> _qualifierTypes = new HashedSet<Type>();
 
         private Type _valueAttributeType = typeof(ValueAttribute);
 
@@ -68,7 +68,7 @@ namespace Spring.Objects.Factory.Attributes
         /// <param name="qualifierType">the qualifier attribute to look for</param>
         public QualifierAnnotationAutowireCandidateResolver(Type qualifierType)
         {
-		    Trace.Assert(qualifierType != null, "'qualifierType' must not be null");
+            AssertUtils.ArgumentNotNull(qualifierType, "'qualifierType' must not be null");
 		    _qualifierTypes.Add(qualifierType);
 	    }
 
@@ -77,9 +77,13 @@ namespace Spring.Objects.Factory.Attributes
 	    /// for the given qualifier attribute types.
 	    /// </summary>
 	    /// <param name="qualifierTypes">the qualifier annotations to look for</param>
-	    public QualifierAnnotationAutowireCandidateResolver(ISet<Type> qualifierTypes) {
-		    Trace.Assert(qualifierTypes != null, "'qualifierTypes' must not be null");
-		    _qualifierTypes.UnionWith(qualifierTypes);
+	    public QualifierAnnotationAutowireCandidateResolver(Collections.Generic.ISet<Type> qualifierTypes) {
+            AssertUtils.ArgumentNotNull(qualifierTypes, "'qualifierTypes' must not be null");
+            foreach(var type in qualifierTypes)
+            {
+                if (!_qualifierTypes.Contains(type))
+                    _qualifierTypes.Add(type);
+            }
 	    }
 
 	    /// <summary>
diff --git a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectFactory.cs b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectFactory.cs
index 72c66b3d..ac65c8a0 100644
--- a/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectFactory.cs
+++ b/src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectFactory.cs
@@ -1606,7 +1606,7 @@ namespace Spring.Objects.Factory.Support
         /// <summary>
         /// String Resolver applied to Autowired value injections
         /// </summary>
-        private ISet<IStringValueResolver> embeddedValueResolvers = new SortedSet<IStringValueResolver>(); 
+        private ISet embeddedValueResolvers = new SortedSet(); 
 
         /// <summary>
         /// Indicates whether any IInstantiationAwareBeanPostProcessors have been registered