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

Resolved .Net3.5 compile issues relating to ISet

Browse Source
This commit is contained in:
Thomas Trageser
2012-09-03 11:13:22 +01:00
parent 8d817c2c0f
commit 1261b223ff
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/Spring/Spring.Core/Objects/Factory/Attributes/QualifierAnnotationAutowireCandidateResolver.cs
View File

@@ -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>

2
src/Spring/Spring.Core/Objects/Factory/Support/AbstractObjectFactory.cs
View File

@@ -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