From 5872ece3ddc42d27e84df3eae24ef6fba5903d01 Mon Sep 17 00:00:00 2001
From: cneuwirt <cneuwirt@73e77b4c-caa6-f847-a29a-24ab75ae54b6>
Date: Sun, 2 Dec 2007 14:27:54 +0000
Subject: [PATCH] Added ability to order the execution of dictionary adapter
 behaviors.

git-svn-id: https://svn.castleproject.org/svn/castle/trunk@4553 73e77b4c-caa6-f847-a29a-24ab75ae54b6
---
 .../DictionaryAdapterPropertyBinderAttribute.cs    |  4 +-
 .../DictionaryBehaviorAttribute.cs}                | 19 +++---
 .../Attributes/DictionaryComponentAttribute.cs     |  2 +-
 .../Attributes/DictionaryKeyAttribute.cs           |  2 +-
 .../Attributes/DictionaryKeyPrefixAttribute.cs     |  2 +-
 .../DictionaryKeySubstitutionAttribute.cs          |  2 +-
 .../Attributes/DictionaryStringListAttribute.cs    |  2 +-
 .../Attributes/DictionaryStringValuesAttribute.cs  |  2 +-
 ...stle.Components.DictionaryAdapter-vs2005.csproj |  3 +
 .../DefaultPropertyGetter.cs                       |  8 +++
 .../DictionaryAdapterFactory.cs                    | 40 +++++++++----
 ...yAttribute.cs => DictionaryBehaviorComparer.cs} | 33 ++++++-----
 ...tionaryKeyBuilder.cs => IDictionaryBehavior.cs} | 15 ++---
 .../IDictionaryKeyBuilder.cs                       |  2 +-
 .../IDictionaryPropertyGetter.cs                   |  2 +-
 .../IDictionaryPropertySetter.cs                   |  2 +-
 .../PropertyDescriptor.cs                          | 67 ++++++++++++----------
 17 files changed, 119 insertions(+), 88 deletions(-)
 copy Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/{IDictionaryKeyBuilder.cs => Attributes/DictionaryBehaviorAttribute.cs} (61%)
 copy Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/{Attributes/DictionaryKeyAttribute.cs => DictionaryBehaviorComparer.cs} (51%)
 copy Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/{IDictionaryKeyBuilder.cs => IDictionaryBehavior.cs} (60%)

diff --git a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryAdapterPropertyBinderAttribute.cs b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryAdapterPropertyBinderAttribute.cs
index 2e47ad7b9..28e6f17fd 100644
--- a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryAdapterPropertyBinderAttribute.cs
+++ b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryAdapterPropertyBinderAttribute.cs
@@ -22,8 +22,8 @@ namespace Castle.Components.DictionaryAdapter
 	/// Allows the user to convert the values in the dictionary into a different type on access.
 	/// </summary>
 	[AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
-	public class DictionaryAdapterPropertyBinderAttribute : 
-		Attribute, IDictionaryPropertyGetter, IDictionaryPropertySetter
+	public class DictionaryAdapterPropertyBinderAttribute :
+		DictionaryBehaviorAttribute, IDictionaryPropertyGetter, IDictionaryPropertySetter
 	{
 		private readonly DictionaryAdapterPropertyBinder binder;
 
diff --git a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/IDictionaryKeyBuilder.cs b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryBehaviorAttribute.cs
similarity index 61%
copy from Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/IDictionaryKeyBuilder.cs
copy to Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryBehaviorAttribute.cs
index eaf0fc8fc..fac514e25 100644
--- a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/IDictionaryKeyBuilder.cs
+++ b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryBehaviorAttribute.cs
@@ -15,20 +15,21 @@
 namespace Castle.Components.DictionaryAdapter
 {
 	using System;
-	using System.Collections;
 
 	/// <summary>
-	/// Defines the contract for building typed dictionary keys.
+	/// Assignes a specific dictionary key.
 	/// </summary>
-	public interface IDictionaryKeyBuilder
+	public abstract class DictionaryBehaviorAttribute : Attribute, IDictionaryBehavior
 	{
+		private int executionOrder = int.MaxValue;
+
 		/// <summary>
-		/// Builds the specified key.
+		/// Determines relative order to apply related behaviors.
 		/// </summary>
-		/// <param name="dictionary">The dictionary.</param>
-		/// <param name="key">The current key.</param>
-		/// <param name="property">The property.</param>
-		/// <returns>The updated key</returns>
-		String GetKey(IDictionary dictionary, String key, PropertyDescriptor property);
+		public int ExecutionOrder
+		{
+			get { return executionOrder; }
+			set { executionOrder = value; }
+		}
 	}
 }
\ No newline at end of file
diff --git a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryComponentAttribute.cs b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryComponentAttribute.cs
index 9a2339a57..39e1e2d7a 100644
--- a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryComponentAttribute.cs
+++ b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryComponentAttribute.cs
@@ -22,7 +22,7 @@ namespace Castle.Components.DictionaryAdapter
 	/// </summary>
 	[AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
 	public class DictionaryComponentAttribute :
-		Attribute, IDictionaryKeyBuilder, IDictionaryPropertyGetter
+		DictionaryBehaviorAttribute, IDictionaryKeyBuilder, IDictionaryPropertyGetter
 	{
 		private String prefix;
 
diff --git a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryKeyAttribute.cs b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryKeyAttribute.cs
index b49c72431..3bd4c1e3f 100644
--- a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryKeyAttribute.cs
+++ b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryKeyAttribute.cs
@@ -21,7 +21,7 @@ namespace Castle.Components.DictionaryAdapter
 	/// Assignes a specific dictionary key.
 	/// </summary>
 	[AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
-	public class DictionaryKeyAttribute : Attribute, IDictionaryKeyBuilder
+	public class DictionaryKeyAttribute : DictionaryBehaviorAttribute, IDictionaryKeyBuilder
 	{
 		private readonly String key;
 
diff --git a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryKeyPrefixAttribute.cs b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryKeyPrefixAttribute.cs
index ff129f86f..afa119be6 100644
--- a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryKeyPrefixAttribute.cs
+++ b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryKeyPrefixAttribute.cs
@@ -21,7 +21,7 @@ namespace Castle.Components.DictionaryAdapter
 	/// Assigns a prefix to the keyed properties of an interface.
 	/// </summary>
 	[AttributeUsage(AttributeTargets.Interface, AllowMultiple = false, Inherited = true)]
-	public class DictionaryKeyPrefixAttribute : Attribute, IDictionaryKeyBuilder
+	public class DictionaryKeyPrefixAttribute : DictionaryBehaviorAttribute, IDictionaryKeyBuilder
 	{
 		private String keyPrefix;
 
diff --git a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryKeySubstitutionAttribute.cs b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryKeySubstitutionAttribute.cs
index f8f342929..24070b223 100644
--- a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryKeySubstitutionAttribute.cs
+++ b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryKeySubstitutionAttribute.cs
@@ -21,7 +21,7 @@ namespace Castle.Components.DictionaryAdapter
 	/// Substitutes part of key with another string.
 	/// </summary>
 	[AttributeUsage(AttributeTargets.Interface | AttributeTargets.Property, AllowMultiple = true, Inherited = true)]
-	public class DictionaryKeySubstitutionAttribute : Attribute, IDictionaryKeyBuilder
+	public class DictionaryKeySubstitutionAttribute : DictionaryBehaviorAttribute, IDictionaryKeyBuilder
 	{
 		private readonly String oldValue;
 		private readonly String newValue;
diff --git a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryStringListAttribute.cs b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryStringListAttribute.cs
index 7bae7b0c6..c7ef5c3bd 100644
--- a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryStringListAttribute.cs
+++ b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryStringListAttribute.cs
@@ -25,7 +25,7 @@ namespace Castle.Components.DictionaryAdapter
 	/// delimited string value.
 	/// </summary>
 	[AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
-	public class DictionaryStringListAttribute : Attribute,
+	public class DictionaryStringListAttribute : DictionaryBehaviorAttribute,
 	                                             IDictionaryPropertyGetter,
 	                                             IDictionaryPropertySetter
 	{
diff --git a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryStringValuesAttribute.cs b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryStringValuesAttribute.cs
index 1a7b10374..99eaa60f8 100644
--- a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryStringValuesAttribute.cs
+++ b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryStringValuesAttribute.cs
@@ -23,7 +23,7 @@ namespace Castle.Components.DictionaryAdapter
 	/// </summary>
 	[AttributeUsage(AttributeTargets.Interface | AttributeTargets.Property,
 		AllowMultiple = false, Inherited = true)]
-	public class DictionaryStringValuesAttribute : Attribute, IDictionaryPropertySetter
+	public class DictionaryStringValuesAttribute : DictionaryBehaviorAttribute, IDictionaryPropertySetter
 	{
 		private string format;
 
diff --git a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Castle.Components.DictionaryAdapter-vs2005.csproj b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Castle.Components.DictionaryAdapter-vs2005.csproj
index efa524824..fdfa8db7b 100644
--- a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Castle.Components.DictionaryAdapter-vs2005.csproj
+++ b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Castle.Components.DictionaryAdapter-vs2005.csproj
@@ -37,9 +37,12 @@
     <Compile Include="AssemblyInfo.cs" />
     <Compile Include="AbstractDictionaryAdapter.cs" />
     <Compile Include="Attributes\AttributesUtil.cs" />
+    <Compile Include="Attributes\DictionaryBehaviorAttribute.cs" />
     <Compile Include="Attributes\DictionaryStringListAttribute.cs" />
     <Compile Include="Attributes\DictionaryComponentAttribute.cs" />
     <Compile Include="Attributes\DictionaryStringValuesAttribute.cs" />
+    <Compile Include="DictionaryBehaviorComparer.cs" />
+    <Compile Include="IDictionaryBehavior.cs" />
     <Compile Include="DefaultPropertyGetter.cs" />
     <Compile Include="IDictionaryPropertySetter.cs" />
     <Compile Include="Attributes\DictionaryKeyAttribute.cs" />
diff --git a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/DefaultPropertyGetter.cs b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/DefaultPropertyGetter.cs
index 5c3c002be..e2746a505 100644
--- a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/DefaultPropertyGetter.cs
+++ b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/DefaultPropertyGetter.cs
@@ -35,6 +35,14 @@ namespace Castle.Components.DictionaryAdapter
 		}
 
 		/// <summary>
+		/// 
+		/// </summary>
+		public int ExecutionOrder
+		{
+			get { return int.MaxValue; }
+		}
+
+		/// <summary>
 		/// Gets the effective dictionary value.
 		/// </summary>
 		/// <param name="factory">The dictionary factory.</param>
diff --git a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/DictionaryAdapterFactory.cs b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/DictionaryAdapterFactory.cs
index 5fd3382af..1ae915bf9 100644
--- a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/DictionaryAdapterFactory.cs
+++ b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/DictionaryAdapterFactory.cs
@@ -418,28 +418,24 @@ namespace Castle.Components.DictionaryAdapter
 		{
 			Dictionary<String, PropertyDescriptor> propertyMap =
 				new Dictionary<String, PropertyDescriptor>();
-			ICollection<IDictionaryPropertyGetter> typeGetters =
-				AttributesUtil.GetTypeAttributes<IDictionaryPropertyGetter>(type);
+			ICollection<IDictionaryPropertyGetter> typeGetters = 
+				GetOrderedBehaviors<IDictionaryPropertyGetter>(type);
 			ICollection<IDictionaryPropertySetter> typeSetters =
-				AttributesUtil.GetTypeAttributes<IDictionaryPropertySetter>(type);
+				GetOrderedBehaviors<IDictionaryPropertySetter>(type);
 
 			RecursivelyDiscoverProperties(
 				type, delegate(PropertyInfo property)
 				      {
 				      	PropertyDescriptor descriptor = new PropertyDescriptor(property);
 
-				      	descriptor.AddKeyBuilders(
-				      		AttributesUtil.GetAttributes<IDictionaryKeyBuilder>(property));
-				      	descriptor.AddKeyBuilders(
-				      		AttributesUtil.GetTypeAttributes<IDictionaryKeyBuilder>(property.ReflectedType));
+				      	descriptor.AddKeyBuilders(GetOrderedBehaviors<IDictionaryKeyBuilder>(property));
+				      	descriptor.AddKeyBuilders(GetOrderedBehaviors<IDictionaryKeyBuilder>(property.ReflectedType));
 
-				      	descriptor.AddGetters(
-				      		AttributesUtil.GetAttributes<IDictionaryPropertyGetter>(property));
+						descriptor.AddGetters(GetOrderedBehaviors<IDictionaryPropertyGetter>(property));
 				      	descriptor.AddGetters(typeGetters);
-				      	AddDefaultGetter(descriptor);
+						AddDefaultGetter(descriptor);
 
-				      	descriptor.AddSetters(
-				      		AttributesUtil.GetAttributes<IDictionaryPropertySetter>(property));
+				      	descriptor.AddSetters(GetOrderedBehaviors<IDictionaryPropertySetter>(property));
 				      	descriptor.AddSetters(typeSetters);
 
 				      	propertyMap.Add(property.Name, descriptor);
@@ -448,6 +444,26 @@ namespace Castle.Components.DictionaryAdapter
 			return propertyMap;
 		}
 
+		private static List<T> GetOrderedBehaviors<T>(Type type) where T : IDictionaryBehavior
+		{
+			List<T> behaviors = AttributesUtil.GetTypeAttributes<T>(type);
+			if (behaviors != null)
+			{
+				behaviors.Sort(DictionaryBehaviorComparer<T>.Instance);
+			}
+			return behaviors;
+		}
+
+		private static List<T> GetOrderedBehaviors<T>(MemberInfo member) where T : IDictionaryBehavior
+		{
+			List<T> behaviors = AttributesUtil.GetAttributes<T>(member);
+			if (behaviors != null)
+			{
+				behaviors.Sort(DictionaryBehaviorComparer<T>.Instance);
+			}
+			return behaviors;
+		}
+
 		private static void RecursivelyDiscoverProperties(
 			Type currentType, Action<PropertyInfo> onProperty)
 		{
diff --git a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryKeyAttribute.cs b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/DictionaryBehaviorComparer.cs
similarity index 51%
copy from Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryKeyAttribute.cs
copy to Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/DictionaryBehaviorComparer.cs
index b49c72431..cc9fe5425 100644
--- a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/Attributes/DictionaryKeyAttribute.cs
+++ b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/DictionaryBehaviorComparer.cs
@@ -14,30 +14,33 @@
 
 namespace Castle.Components.DictionaryAdapter
 {
-	using System;
-	using System.Collections;
+	using System.Collections.Generic;
 
 	/// <summary>
-	/// Assignes a specific dictionary key.
+	/// Comparer for ordering the execution of <see cref="IDictionaryBehavior"/>
 	/// </summary>
-	[AttributeUsage(AttributeTargets.Property, AllowMultiple = false, Inherited = true)]
-	public class DictionaryKeyAttribute : Attribute, IDictionaryKeyBuilder
+	public class DictionaryBehaviorComparer<T> : IComparer<T>
+		where T : IDictionaryBehavior
 	{
-		private readonly String key;
-
 		/// <summary>
-		/// Initializes a new instance of the <see cref="DictionaryKeyAttribute"/> class.
+		/// Singleton instance of <see cref="DictionaryBehaviorComparer{T}"/>
 		/// </summary>
-		/// <param name="key">The key.</param>
-		public DictionaryKeyAttribute(String key)
-		{
-			this.key = key;
+		public static readonly DictionaryBehaviorComparer<T> 
+			Instance = new DictionaryBehaviorComparer<T>();
+ 
+		private DictionaryBehaviorComparer()
+		{	
 		}
 
-		String IDictionaryKeyBuilder.GetKey(IDictionary dictionary, String key,
-		                                   PropertyDescriptor property)
+		/// <summary>
+		/// Determines the relative ordering of the behaviors.
+		/// </summary>
+		/// <param name="x"></param>
+		/// <param name="y"></param>
+		/// <returns></returns>
+		public int Compare(T x, T y)
 		{
-			return this.key;
+			return x.ExecutionOrder - y.ExecutionOrder;
 		}
 	}
 }
\ No newline at end of file
diff --git a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/IDictionaryKeyBuilder.cs b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/IDictionaryBehavior.cs
similarity index 60%
copy from Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/IDictionaryKeyBuilder.cs
copy to Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/IDictionaryBehavior.cs
index eaf0fc8fc..00348cdf8 100644
--- a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/IDictionaryKeyBuilder.cs
+++ b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/IDictionaryBehavior.cs
@@ -14,21 +14,14 @@
 
 namespace Castle.Components.DictionaryAdapter
 {
-	using System;
-	using System.Collections;
-
 	/// <summary>
-	/// Defines the contract for building typed dictionary keys.
+	/// Defines the contract for customizing dictionary access.
 	/// </summary>
-	public interface IDictionaryKeyBuilder
+	public interface IDictionaryBehavior
 	{
 		/// <summary>
-		/// Builds the specified key.
+		/// Determines relative order to apply related behaviors.
 		/// </summary>
-		/// <param name="dictionary">The dictionary.</param>
-		/// <param name="key">The current key.</param>
-		/// <param name="property">The property.</param>
-		/// <returns>The updated key</returns>
-		String GetKey(IDictionary dictionary, String key, PropertyDescriptor property);
+		int ExecutionOrder { get; }
 	}
 }
\ No newline at end of file
diff --git a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/IDictionaryKeyBuilder.cs b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/IDictionaryKeyBuilder.cs
index eaf0fc8fc..723ea9d0b 100644
--- a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/IDictionaryKeyBuilder.cs
+++ b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/IDictionaryKeyBuilder.cs
@@ -20,7 +20,7 @@ namespace Castle.Components.DictionaryAdapter
 	/// <summary>
 	/// Defines the contract for building typed dictionary keys.
 	/// </summary>
-	public interface IDictionaryKeyBuilder
+	public interface IDictionaryKeyBuilder : IDictionaryBehavior
 	{
 		/// <summary>
 		/// Builds the specified key.
diff --git a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/IDictionaryPropertyGetter.cs b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/IDictionaryPropertyGetter.cs
index b89ca2ea1..53d37d14d 100644
--- a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/IDictionaryPropertyGetter.cs
+++ b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/IDictionaryPropertyGetter.cs
@@ -19,7 +19,7 @@ namespace Castle.Components.DictionaryAdapter
 	/// <summary>
 	/// Defines the contract for retrieving dictionary values.
 	/// </summary>
-	public interface IDictionaryPropertyGetter
+	public interface IDictionaryPropertyGetter : IDictionaryBehavior
 	{
 		/// <summary>
 		/// Gets the effective dictionary value.
diff --git a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/IDictionaryPropertySetter.cs b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/IDictionaryPropertySetter.cs
index 76590c053..d8db28465 100644
--- a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/IDictionaryPropertySetter.cs
+++ b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/IDictionaryPropertySetter.cs
@@ -19,7 +19,7 @@ namespace Castle.Components.DictionaryAdapter
 	/// <summary>
 	/// Defines the contract for updating dictionary values.
 	/// </summary>
-	public interface IDictionaryPropertySetter
+	public interface IDictionaryPropertySetter : IDictionaryBehavior
 	{
 		/// <summary>
 		/// Sets the stored dictionary value.
diff --git a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/PropertyDescriptor.cs b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/PropertyDescriptor.cs
index 30038c867..10c706a1f 100644
--- a/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/PropertyDescriptor.cs
+++ b/Components/DictionaryAdapter/Castle.Components.DictionaryAdapter/PropertyDescriptor.cs
@@ -28,9 +28,9 @@ namespace Castle.Components.DictionaryAdapter
 	                                  IDictionaryPropertySetter
 	{
 		private readonly PropertyInfo property;
-		private ICollection<IDictionaryPropertyGetter> getters;
-		private ICollection<IDictionaryPropertySetter> setters;
-		private ICollection<IDictionaryKeyBuilder> keyBuilders;
+		private List<IDictionaryPropertyGetter> getters;
+		private List<IDictionaryPropertySetter> setters;
+		private List<IDictionaryKeyBuilder> keyBuilders;
 		private TypeConverter typeConverter;
 
 		/// <summary>
@@ -56,6 +56,14 @@ namespace Castle.Components.DictionaryAdapter
 		}
 
 		/// <summary>
+		/// 
+		/// </summary>
+		public int ExecutionOrder
+		{
+			get { return 0; }
+		}
+
+		/// <summary>
 		/// Gets the property name.
 		/// </summary>
 		public string PropertyName
@@ -113,7 +121,6 @@ namespace Castle.Components.DictionaryAdapter
 		public ICollection<IDictionaryKeyBuilder> KeyBuilders
 		{
 			get { return keyBuilders; }
-			set { keyBuilders = value; }
 		}
 
 		/// <summary>
@@ -123,7 +130,6 @@ namespace Castle.Components.DictionaryAdapter
 		public ICollection<IDictionaryPropertySetter> Setters
 		{
 			get { return setters; }
-			set { setters = value; }
 		}
 
 		/// <summary>
@@ -133,7 +139,6 @@ namespace Castle.Components.DictionaryAdapter
 		public ICollection<IDictionaryPropertyGetter> Getters
 		{
 			get { return getters; }
-			set { getters = value; }
 		}
 
 		#region IDictionaryKeyBuilder Members
@@ -183,15 +188,15 @@ namespace Castle.Components.DictionaryAdapter
 		/// <param name="builders">The builders.</param>
 		public void AddKeyBuilders(ICollection<IDictionaryKeyBuilder> builders)
 		{
-			if (keyBuilders == null)
+			if (builders != null)
 			{
-				keyBuilders = builders;
-			}
-			else if (builders != null)
-			{
-				foreach(IDictionaryKeyBuilder builder in builders)
+				if (keyBuilders == null)
 				{
-					keyBuilders.Add(builder);
+					keyBuilders = new List<IDictionaryKeyBuilder>(builders);
+				}
+				else
+				{
+					keyBuilders.AddRange(builders);
 				}
 			}
 		}
@@ -250,15 +255,15 @@ namespace Castle.Components.DictionaryAdapter
 		/// <param name="gets">The getters.</param>
 		public void AddGetters(ICollection<IDictionaryPropertyGetter> gets)
 		{
-			if (getters == null)
+			if (gets != null)
 			{
-				getters = gets;
-			}
-			else if (gets != null)
-			{
-				foreach(IDictionaryPropertyGetter getter in gets)
+				if (getters == null)
 				{
-					getters.Add(getter);
+					getters = new List<IDictionaryPropertyGetter>(gets);
+				}
+				else
+				{
+					getters.AddRange(gets);
 				}
 			}
 		}
@@ -280,6 +285,8 @@ namespace Castle.Components.DictionaryAdapter
 			IDictionaryAdapterFactory factory, IDictionary dictionary,
 			string key, ref object value, PropertyDescriptor descriptor)
 		{
+			bool consumed = false;
+
 			if (setters != null)
 			{
 				foreach(IDictionaryPropertySetter setter in setters)
@@ -287,7 +294,7 @@ namespace Castle.Components.DictionaryAdapter
 					if (!setter.SetPropertyValue(
 						factory, dictionary, key, ref value, this))
 					{
-						return false;
+						consumed = true;
 					}
 				}
 			}
@@ -297,11 +304,11 @@ namespace Castle.Components.DictionaryAdapter
 				if (!descriptor.SetPropertyValue(
 					factory, dictionary, key, ref value, null))
 				{
-					return false;
+					consumed = true;
 				}
 			}
 
-			return true;
+			return !consumed;
 		}
 
 		/// <summary>
@@ -323,15 +330,15 @@ namespace Castle.Components.DictionaryAdapter
 		/// <param name="sets">The setters.</param>
 		public void AddSetters(ICollection<IDictionaryPropertySetter> sets)
 		{
-			if (setters == null)
-			{
-				setters = sets;
-			}
-			else if (sets != null)
+			if (sets != null)
 			{
-				foreach(IDictionaryPropertySetter setter in sets)
+				if (setters == null)
+				{
+					setters = new List<IDictionaryPropertySetter>(sets);
+				}
+				else
 				{
-					setters.Add(setter);
+					setters.AddRange(sets);
 				}
 			}
 		}
-- 
2.11.4.GIT