[asp.net] HtmlForum.Name rendering updates + test updates

[mono.git] / mcs / class / System.Web / System.Web.UI / CollectionBuilder.cs

diff --git a/mcs/class/System.Web/System.Web.UI/CollectionBuilder.cs b/mcs/class/System.Web/System.Web.UI/CollectionBuilder.cs
index 47b6672f9adb98917cd2b4899c919a4e99c10545..9f9a9f49528f765e08d596a3983cafc924221bc8 100644 (file)
--- a/mcs/class/System.Web/System.Web.UI/CollectionBuilder.cs
+++ b/mcs/class/System.Web/System.Web.UI/CollectionBuilder.cs
@@ -31,12 +31,13 @@
 using System;
 using System.Collections;
 using System.Reflection;
+using System.Text;
 
 namespace System.Web.UI
 {
        sealed class CollectionBuilder : ControlBuilder
        {
-               Type elementType;
+               Type[] possibleElementTypes;
 
                internal CollectionBuilder ()
                {
@@ -44,15 +45,28 @@ namespace System.Web.UI
 
                public override void AppendLiteralString (string s)
                {
-                       if (s != null && s.Trim () != "")
+                       if (s != null && s.Trim ().Length > 0)
                                throw new HttpException ("Literal content not allowed for " + ControlType);
                }
 
                public override Type GetChildControlType (string tagName, IDictionary attribs)
                {
                        Type t = Root.GetChildControlType (tagName, attribs);
-                       if (elementType != null && !elementType.IsAssignableFrom (t)) 
-                               throw new HttpException ("Cannot add a " + t + " to " + elementType);
+                       if (possibleElementTypes != null) {
+                               bool foundMatchingType = false;
+                               for (int i = 0; i < possibleElementTypes.Length && !foundMatchingType; ++i)
+                                       foundMatchingType = possibleElementTypes[i].IsAssignableFrom (t);
+                               
+                               if (!foundMatchingType) {
+                                       StringBuilder possibleTypesString = new StringBuilder ();
+                                       for (int i = 0; i < possibleElementTypes.Length; i++) {
+                                               if (i != 0)
+                                                       possibleTypesString.Append (", ");
+                                               possibleTypesString.Append (possibleElementTypes[i]);
+                                       }
+                                       throw new HttpException ("Cannot add a " + t + " to " + possibleTypesString);
+                               }
+                       }
 
                        return t;
                }
@@ -63,17 +77,19 @@ namespace System.Web.UI
                                           string tagName,
                                           string id,
                                           IDictionary attribs)
-               {
+               {                       
                        base.Init (parser, parentBuilder, type, tagName, id, attribs);
 
-                       PropertyInfo prop = parentBuilder.ControlType.GetProperty (tagName, flagsNoCase);
+                       PropertyInfo prop = parentBuilder.ControlType.GetProperty (tagName, FlagsNoCase);
                        SetControlType (prop.PropertyType);
 
-                       MemberInfo[] mems = ControlType.GetMember ("Item", MemberTypes.Property, flagsNoCase & ~BindingFlags.IgnoreCase);
-                       if (mems.Length > 0) prop = (PropertyInfo) mems [0];
-                       else throw new HttpException ("Collection of type '" + ControlType + "' does not have an indexer.");
-                       
-                       elementType = prop.PropertyType;
+                       MemberInfo[] mems = ControlType.GetMember ("Item", MemberTypes.Property, FlagsNoCase & ~BindingFlags.IgnoreCase);
+                       if (mems.Length > 0) {
+                               possibleElementTypes = new Type [mems.Length];
+                               for (int i = 0; i < mems.Length; ++i)
+                                       possibleElementTypes [i] = ((PropertyInfo)mems [i]).PropertyType;
+                       } else
+                               throw new HttpException ("Collection of type '" + ControlType + "' does not have an indexer.");
                }
        }
 }