Refactoring:

- use of strongly typed collections
- use of JoinedEnumerable instead create new collections
- changed methods/properties names like H3.2
- insured properties changing its type from ICollection to IEnumerable

SVN: trunk@3086

Author: fabiomaulo

src/NHibernate.Test/TestCase.cs

@@ -296,7 +296,7 @@ protected void ApplyCacheSettings(Configuration configuration)
 			foreach (PersistentClass clazz in configuration.ClassMappings)
 			{
 				bool hasLob = false;
-				foreach (Mapping.Property prop in clazz.PropertyClosureCollection)
+				foreach (Mapping.Property prop in clazz.PropertyClosureIterator)
 				{
 					if (prop.Value.IsSimpleValue)
 					{

src/NHibernate/Cfg/XmlHbmBinding/ResultSetMappingBinder.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using Iesi.Collections;
 using NHibernate.Cfg.MappingSchema;
 using NHibernate.Engine;
@@ -179,7 +180,7 @@ private IDictionary BindPropertyResults(string alias, HbmReturnDiscriminator dis
 					int dotIndex = name.LastIndexOf('.');
 					string reducedName = name.Substring(0, dotIndex);
 					IValue value = pc.GetRecursiveProperty(reducedName).Value;
-					ICollection parentPropIter;
+					IEnumerable<Mapping.Property> parentPropIter;
 					if (value is Component)
 					{
 						Component comp = (Component) value;

src/NHibernate/Engine/Query/HQLQueryPlan.cs

@@ -282,11 +282,11 @@ public IEnumerable<T> PerformIterate<T>(QueryParameters queryParameters, IEventS
 
 			// NH Different behavior (we need to implement the translators.GetEnumerable<T>)
 			if (many.HasValue && many.Value)
-				return new GenericJoinedEnumerable<T>(results);
+				return new JoinedEnumerable<T>(results);
 			else
 			{
-				results = new IEnumerable[] {result};
-				return new GenericJoinedEnumerable<T>(results);
+				results = new IEnumerable[] { result };
+				return new JoinedEnumerable<T>(results);
 			}
 		}
 

src/NHibernate/Mapping/Collection.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 using NHibernate.Engine;
 using NHibernate.SqlCommand;
 using NHibernate.Type;
@@ -63,8 +64,8 @@ public abstract class Collection : IFetchable, IValue, IFilterable
 
 		private bool isGeneric;
 		private System.Type[] genericArguments;
-		private IDictionary filters = new Hashtable();
-		private IDictionary manyToManyFilters = new Hashtable();
+		private readonly Dictionary<string, string> filters = new Dictionary<string, string>();
+		private readonly Dictionary<string, string> manyToManyFilters = new Dictionary<string, string>();
 		private bool subselectLoadable;
 		private string manyToManyWhere;
 		private string manyToManyOrderBy;
@@ -480,7 +481,7 @@ public void AddFilter(string name, string condition)
 			filters.Add(name, condition);
 		}
 
-		public IDictionary FilterMap
+		public IDictionary<string,string> FilterMap
 		{
 			get { return filters; }
 		}
@@ -490,7 +491,7 @@ public void AddManyToManyFilter(string name, string condition)
 			manyToManyFilters.Add(name, condition);
 		}
 
-		public IDictionary ManyToManyFilterMap
+		public IDictionary<string, string> ManyToManyFilterMap
 		{
 			get { return manyToManyFilters; }
 		}

src/NHibernate/Mapping/Component.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections;
+using System.Collections.Generic;
 
 namespace NHibernate.Mapping
 {
@@ -9,7 +10,7 @@ namespace NHibernate.Mapping
 	/// </summary>
 	public class Component : SimpleValue
 	{
-		private ArrayList properties = new ArrayList();
+		private readonly List<Property> properties = new List<Property>();
 		private System.Type componentClass;
 		private bool embedded;
 		private string parentProperty;
@@ -23,7 +24,7 @@ public int PropertySpan
 		}
 
 		/// <summary></summary>
-		public ICollection PropertyCollection
+		public IEnumerable<Property> PropertyCollection
 		{
 			get { return properties; }
 		}
@@ -145,12 +146,6 @@ public string ParentProperty
 			set { parentProperty = value; }
 		}
 
-		/// <summary></summary>
-		public ArrayList Properties
-		{
-			get { return properties; }
-		}
-
 		public override bool[] ColumnInsertability
 		{
 			get
@@ -191,7 +186,7 @@ public override bool[] ColumnUpdateability
 
 		public Property GetProperty(string propertyName)
 		{
-			ICollection iter = PropertyCollection;
+			IEnumerable<Property> iter = PropertyCollection;
 			foreach (Property prop in iter)
 			{
 				if (prop.Name.Equals(propertyName))

src/NHibernate/Mapping/IFilterable.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Collections;
+using System.Collections.Generic;
 
 namespace NHibernate.Mapping
 {
@@ -8,8 +7,8 @@ namespace NHibernate.Mapping
 	/// </summary>
 	public interface IFilterable
 	{
-		void AddFilter(String name, String condition);
+		void AddFilter(string name, string condition);
 
-		IDictionary FilterMap { get; }
+		IDictionary<string, string> FilterMap { get; }
 	}
 }

src/NHibernate/Mapping/Join.cs

@@ -1,6 +1,5 @@
 using System;
-using System.Collections;
-
+using System.Collections.Generic;
 using NHibernate.Engine;
 using NHibernate.SqlCommand;
 
@@ -11,7 +10,7 @@ public class Join
 	{
 		private static readonly Alias PK_ALIAS = new Alias(15, "PK");
 
-		private ArrayList properties = new ArrayList();
+		private readonly List<Property> properties = new List<Property>();
 		private Table table;
 		private IKeyValue key;
 		private PersistentClass persistentClass;
@@ -33,15 +32,15 @@ public class Join
 		public void AddProperty(Property prop)
 		{
 			properties.Add(prop);
-			prop.PersistentClass = this.PersistentClass;
+			prop.PersistentClass = PersistentClass;
 		}
 
 		public bool ContainsProperty(Property prop)
 		{
 			return properties.Contains(prop);
 		}
 
-		public ICollection PropertyCollection
+		public IEnumerable<Property> PropertyIterator
 		{
 			get { return properties; }
 		}

src/NHibernate/Mapping/JoinedSubclass.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Text;
 
 using NHibernate.Engine;
@@ -45,5 +46,10 @@ public override void Validate(IMapping mapping)
 				throw new MappingException(string.Format("subclass key has wrong number of columns: {0} type: {1}", MappedClass.Name, Key.Type.Name));
 			}
 		}
+
+		public override IEnumerable<Property> ReferenceablePropertyIterator
+		{
+			get { return PropertyIterator; }
+		}
 	}
 }