2007-05-11 Jonathan Chambers <joncham@gmail.com>

[mono.git] / mcs / class / corlib / System.Reflection / MonoEvent.cs

diff --git a/mcs/class/corlib/System.Reflection/MonoEvent.cs b/mcs/class/corlib/System.Reflection/MonoEvent.cs
old mode 100755 (executable)
new mode 100644 (file)
index 925af97..9ddc79b
--- a/mcs/class/corlib/System.Reflection/MonoEvent.cs
+++ b/mcs/class/corlib/System.Reflection/MonoEvent.cs
@@ -7,19 +7,45 @@
 // (C) 2001 Ximian, Inc.  http://www.ximian.com
 //
 
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.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.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 namespace System.Reflection {
+
        internal struct MonoEventInfo {
-               public Type parent;
+               public Type declaring_type;
+               public Type reflected_type;
                public String name;
                public MethodInfo add_method;
                public MethodInfo remove_method;
                public MethodInfo raise_method;
                public EventAttributes attrs;
+               public MethodInfo[] other_methods;
                
                [MethodImplAttribute(MethodImplOptions.InternalCall)]
                internal static extern void get_event_info (MonoEvent ev, out MonoEventInfo info);
@@ -41,30 +67,73 @@ namespace System.Reflection {
                public override MethodInfo GetAddMethod(bool nonPublic) {
                        MonoEventInfo info;
                        MonoEventInfo.get_event_info (this, out info);
-                               
-                       return info.add_method;
+                       
+                       
+                       if (nonPublic || (info.add_method != null && info.add_method.IsPublic))
+                               return info.add_method;
+                       return null;
                }
+
                public override MethodInfo GetRaiseMethod( bool nonPublic) {
                        MonoEventInfo info;
                        MonoEventInfo.get_event_info (this, out info);
                                
-                       return info.raise_method;
+                       if (nonPublic || (info.raise_method != null && info.raise_method.IsPublic))
+                               return info.raise_method;
+                       return null;
                }
+
                public override MethodInfo GetRemoveMethod( bool nonPublic) {
                        MonoEventInfo info;
                        MonoEventInfo.get_event_info (this, out info);
-                               
-                       return info.remove_method;
+                       
+                       if (nonPublic || (info.remove_method != null && info.remove_method.IsPublic))
+                               return info.remove_method;
+                       return null;
                }
 
+#if NET_2_0
+               public override MethodInfo[] GetOtherMethods (bool nonPublic) {
+                       MonoEventInfo info;
+                       MonoEventInfo.get_event_info (this, out info);
+
+                       if (nonPublic)
+                               return info.other_methods;
+                       int num_public = 0;
+                       foreach (MethodInfo m in info.other_methods) {
+                               if (m.IsPublic)
+                                       num_public++;
+                       }
+                       if (num_public == info.other_methods.Length)
+                               return info.other_methods;
+                       MethodInfo[] res = new MethodInfo [num_public];
+                       num_public = 0;
+                       foreach (MethodInfo m in info.other_methods) {
+                               if (m.IsPublic)
+                                       res [num_public++] = m;
+                       }
+                       return res;
+               }
+#endif
+
                public override Type DeclaringType {
                        get {
                                MonoEventInfo info;
                                MonoEventInfo.get_event_info (this, out info);
                                
-                               return info.parent;
+                               return info.declaring_type;
                        }
                }
+
+               public override Type ReflectedType {
+                       get {
+                               MonoEventInfo info;
+                               MonoEventInfo.get_event_info (this, out info);
+                               
+                               return info.reflected_type;
+                       }
+               }
+
                public override string Name {
                        get {
                                MonoEventInfo info;
@@ -73,5 +142,26 @@ namespace System.Reflection {
                                return info.name;
                        }
                }
+
+               public override string ToString ()
+               {
+                       return EventHandlerType + " " + Name;
+               }
+
+               public override bool IsDefined (Type attributeType, bool inherit)
+               {
+                       return MonoCustomAttrs.IsDefined (this, attributeType, inherit);
+               }
+
+               public override object[] GetCustomAttributes( bool inherit)
+               {
+                       return MonoCustomAttrs.GetCustomAttributes (this, inherit);
+               }
+
+               public override object[] GetCustomAttributes( Type attributeType, bool inherit)
+               {
+                       return MonoCustomAttrs.GetCustomAttributes (this, attributeType, inherit);
+               }
+
        }
 }