New test.

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

diff --git a/mcs/class/System/System.ComponentModel/EditorAttribute.cs b/mcs/class/System/System.ComponentModel/EditorAttribute.cs
index 3f3913b172f2c4e09ca3b80c9eed28a5ae5640e8..6961f7e8c0c6eca47265345dc6553345c07f3959 100644 (file)
--- a/mcs/class/System/System.ComponentModel/EditorAttribute.cs
+++ b/mcs/class/System/System.ComponentModel/EditorAttribute.cs
@@ -2,9 +2,32 @@
 // System.ComponentModel.EditorAttribute.cs
 //
 // Author:
-//   Alejandro Sánchez Acosta (raciel@es.gnu.org)
+//   Alejandro Sánchez Acosta (raciel@es.gnu.org)
+//   Andreas Nahr (ClassDevelopment@A-SoftTech.com)
 //
-// (C) Alejandro Sánchez Acosta
+// (C) Alejandro Sánchez Acosta
+// (C) 2003 Andreas Nahr
+//
+
+//
+// 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.
 //
 
 namespace System.ComponentModel {
@@ -12,18 +35,15 @@ namespace System.ComponentModel {
        /// <summary>
        ///   Editor Attribute for classes. 
        /// </summary>
-
-       [AttributeUsage (AttributeTargets.All)]
+       [AttributeUsage (AttributeTargets.All, AllowMultiple = true, Inherited = true)]
        public sealed class EditorAttribute : Attribute {
                
-               string name;    
+               string name;
                string basename;
-               Type baseType;
-               Type nametype;
 
                public EditorAttribute ()
                {
-                       this.name = "";
+                       this.name = string.Empty;
                }
 
                public EditorAttribute (string typeName, string baseTypeName)
@@ -33,15 +53,13 @@ namespace System.ComponentModel {
                }
 
                public EditorAttribute (string typeName, Type baseType)
+                       : this (typeName, baseType.AssemblyQualifiedName)
                {
-                       name = typeName;
-                       this.baseType = baseType;       
                }
 
                public EditorAttribute (Type type, Type baseType)
+                       : this (type.AssemblyQualifiedName, baseType.AssemblyQualifiedName)
                {
-                       nametype = type;
-                       this.baseType = baseType;
                }
 
                public string EditorBaseTypeName {
@@ -67,19 +85,13 @@ namespace System.ComponentModel {
                        if (!(obj is EditorAttribute))
                                return false;
 
-                       return (((EditorAttribute) obj).name == name) &&
-                               (((EditorAttribute) obj).basename == basename) &&
-                               (((EditorAttribute) obj).baseType == baseType) &&
-                               (((EditorAttribute) obj).nametype == nametype);
-
+                       return ((EditorAttribute) obj).EditorBaseTypeName.Equals (basename) &&
+                               ((EditorAttribute) obj).EditorTypeName.Equals (name);
                }
                
                public override int GetHashCode ()
                {
-                        if (name == null)
-                               return 0;
-
-                        return name.GetHashCode ();
+                       return string.Concat(name, basename).GetHashCode ();
                }
        }
 }