Commit

[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 feaaea0c74cc047ccaa543646df8078780e916b4..8e11797c9eb8d8d8810b006d6851727ecb7574bb 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;
@@ -16,21 +37,47 @@ using System.Runtime.InteropServices;
 namespace System.ComponentModel
 {
        [ComVisible (true)]
-       public class AttributeCollection : ICollection, IEnumerable
+       public class AttributeCollection : ICollection
        {
                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;
+               }
                
+#if NET_2_0
+               public AttributeCollection (params Attribute[] attributes)
+#else
                public AttributeCollection (Attribute[] attributes)
+#endif
                {
                        if (attributes != null)
                                for (int i = 0; i < attributes.Length; i++)
                                        attrList.Add (attributes[i]);
                }
 
+#if NET_2_0
+               public static AttributeCollection FromExisting (AttributeCollection existing, params Attribute [] newAttributes)
+               {
+                       if (existing == null)
+                               throw new ArgumentNullException ("existing");
+                       AttributeCollection ret = new AttributeCollection ();
+                       ret.attrList.AddRange (existing.attrList);
+                       if (newAttributes != null)
+                               ret.attrList.AddRange (newAttributes);
+                       return ret;
+               }
+#endif
+
                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)
@@ -50,6 +97,10 @@ namespace System.ComponentModel
                        attrList.CopyTo (array, index);
                }
 
+               IEnumerator IEnumerable.GetEnumerator () {
+                       return GetEnumerator ();
+               }
+
                public IEnumerator GetEnumerator ()
                {
                        return attrList.GetEnumerator ();
@@ -73,12 +124,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 {
@@ -88,18 +141,24 @@ namespace System.ComponentModel
                        return attr;
                }
 
-               public bool IsSynchronized {
+               bool ICollection.IsSynchronized {
                        get {
                                return attrList.IsSynchronized;
                        }
                }
 
-               public object SyncRoot {
+               object ICollection.SyncRoot {
                        get {
                                return attrList.SyncRoot;
                        }
                }
                
+               int ICollection.Count {
+                       get {
+                               return Count;
+                       }
+               }
+
                public int Count {
                        get {
                                return attrList.Count;
@@ -110,7 +169,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;
                                        }