merging the Mainsoft branch to the trunk

[mono.git] / mcs / class / System / System.ComponentModel / AttributeCollection.cs

diff --git a/mcs/class/System/System.ComponentModel/AttributeCollection.cs b/mcs/class/System/System.ComponentModel/AttributeCollection.cs
index 9412d1966e579ae73c799acfeab28b738bca7d39..658117ac1af0982a8042209ee40985fa39bad2e7 100644 (file)
--- a/mcs/class/System/System.ComponentModel/AttributeCollection.cs
+++ b/mcs/class/System/System.ComponentModel/AttributeCollection.cs
@@ -8,6 +8,27 @@
 // (C) 2002 Ximian, Inc. (http://www.ximian.com)
 //
 
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+
 using System;
 using System.Collections;
 using System.Reflection;
@@ -19,7 +40,12 @@ namespace System.ComponentModel
        public class AttributeCollection : ICollection, IEnumerable
        {
                private ArrayList attrList = new ArrayList ();
-               public static readonly AttributeCollection Empty = new AttributeCollection (null);
+               public static readonly AttributeCollection Empty = new AttributeCollection ((ArrayList)null);
+               
+               internal AttributeCollection (ArrayList attributes)
+               {
+                       attrList = attributes;
+               }
                
                public AttributeCollection (Attribute[] attributes)
                {
@@ -30,7 +56,11 @@ namespace System.ComponentModel
 
                public bool Contains (Attribute attr)
                {
-                       return attrList.Contains (attr);
+                       Attribute at = this [attr.GetType ()];
+                       if (at != null)
+                               return attr.Equals (at);
+                       else
+                               return false;
                }
 
                public bool Contains (Attribute [] attributes)
@@ -73,12 +103,14 @@ namespace System.ComponentModel
 
                protected Attribute GetDefaultAttribute (Type attributeType)
                {
-                       Attribute attr;
+                       Attribute attr = null;
                        BindingFlags bf = BindingFlags.Public | BindingFlags.Static;
 
                        FieldInfo def = attributeType.GetField ("Default", bf);
                        if (def == null) {
-                               attr = Activator.CreateInstance (attributeType) as Attribute;
+                               ConstructorInfo constructorInfo = attributeType.GetConstructor (Type.EmptyTypes);
+                               if (constructorInfo != null)
+                                       attr = constructorInfo.Invoke (null) as Attribute;
                                if (attr != null && !attr.IsDefaultAttribute ())
                                        attr = null;
                        } else {
@@ -110,7 +142,7 @@ namespace System.ComponentModel
                        get {
                                Attribute attr = null;
                                foreach (Attribute a in attrList) {
-                                       if (a.GetType () == type){
+                                       if (type.IsAssignableFrom (a.GetType ())) {
                                                attr = a;
                                                break;
                                        }