[prev in list] [next in list] [prev in thread] [next in thread] 

List:       mono-patches
Subject:    [Mono-patches] r81104 - trunk/mcs/class/System/System.ComponentModel
From:       "Gert Driesen (gert.driesen () pandora ! be)"
Date:       2007-06-30 13:33:25
Message-ID: 20070630133325.CCDEC9472C () mono-cvs ! ximian ! com
[Download RAW message or body]

Author: gert
Date: 2007-06-30 09:33:25 -0400 (Sat, 30 Jun 2007)
New Revision: 81104

Modified:
   trunk/mcs/class/System/System.ComponentModel/ChangeLog
   trunk/mcs/class/System/System.ComponentModel/PropertyDescriptorCollection.cs
   trunk/mcs/class/System/System.ComponentModel/TypeDescriptor.cs
Log:
* PropertyDescriptorCollection.cs: Added missing explicit interface
implementation of IEnumerable.GetEnumerator.
* TypeDescriptor.cs: Params modifier applies to 1.0 profile as well.
Spaces to tabs.


Modified: trunk/mcs/class/System/System.ComponentModel/ChangeLog
===================================================================
--- trunk/mcs/class/System/System.ComponentModel/ChangeLog	2007-06-30 13:22:34 UTC \
                (rev 81103)
+++ trunk/mcs/class/System/System.ComponentModel/ChangeLog	2007-06-30 13:33:25 UTC \
(rev 81104) @@ -1,3 +1,10 @@
+2007-06-30  Gert Driesen  <drieseng@users.sourceforge.net>
+
+	* PropertyDescriptorCollection.cs: Added missing explicit interface
+	implementation of IEnumerable.GetEnumerator.
+	* TypeDescriptor.cs: Params modifier applies to 1.0 profile as well.
+	Spaces to tabs.
+
 2007-05-31  Atsushi Enomoto  <atsushi@ximian.com>
 
 	* LookupBindingPropertiesAttribute.cs:

Modified: trunk/mcs/class/System/System.ComponentModel/PropertyDescriptorCollection.cs
 ===================================================================
--- trunk/mcs/class/System/System.ComponentModel/PropertyDescriptorCollection.cs	2007-06-30 \
                13:22:34 UTC (rev 81103)
+++ trunk/mcs/class/System/System.ComponentModel/PropertyDescriptorCollection.cs	2007-06-30 \
13:33:25 UTC (rev 81104) @@ -155,6 +155,11 @@
 			return properties.GetEnumerator ();
 		}
 
+		IEnumerator IEnumerable.GetEnumerator ()
+		{
+			return GetEnumerator ();
+		}
+
 		[MonoTODO]
 		IDictionaryEnumerator IDictionary.GetEnumerator ()
 		{

Modified: trunk/mcs/class/System/System.ComponentModel/TypeDescriptor.cs
===================================================================
--- trunk/mcs/class/System/System.ComponentModel/TypeDescriptor.cs	2007-06-30 \
                13:22:34 UTC (rev 81103)
+++ trunk/mcs/class/System/System.ComponentModel/TypeDescriptor.cs	2007-06-30 \
13:33:25 UTC (rev 81104) @@ -121,11 +121,7 @@
 	public static EventDescriptor CreateEvent (Type componentType,
 						   string name,
 						   Type type,
-#if NET_2_0
 						   params Attribute [] attributes)
-#else
-						   Attribute [] attributes)
-#endif
 	{
 		return new ReflectionEventDescriptor (componentType, name, type, attributes);
 	}
@@ -133,11 +129,7 @@
 	[ReflectionPermission (SecurityAction.LinkDemand, TypeInformation = true, \
MemberAccess = true)]  public static EventDescriptor CreateEvent (Type componentType,
 						   EventDescriptor oldEventDescriptor,
-#if NET_2_0
 						   params Attribute [] attributes)
-#else
-						   Attribute [] attributes)
-#endif
 	{
 		return new ReflectionEventDescriptor (componentType, oldEventDescriptor, \
attributes);  }
@@ -146,11 +138,7 @@
 	public static PropertyDescriptor CreateProperty (Type componentType,
 							 string name,
 							 Type type,
-#if NET_2_0
 							 params Attribute [] attributes)
-#else
-							 Attribute [] attributes)
-#endif
 	{
 		return new ReflectionPropertyDescriptor (componentType, name, type, attributes);
 	}
@@ -158,11 +146,7 @@
 	[ReflectionPermission (SecurityAction.LinkDemand, TypeInformation = true, \
MemberAccess = true)]  public static PropertyDescriptor CreateProperty (Type \
componentType,  PropertyDescriptor oldPropertyDescriptor,
-#if NET_2_0
 							 params Attribute [] attributes)
-#else
-							 Attribute [] attributes)
-#endif
 	{
 		return new ReflectionPropertyDescriptor (componentType, oldPropertyDescriptor, \
attributes);  }
@@ -186,10 +170,10 @@
 	public static AttributeCollection GetAttributes (object component, bool \
noCustomTypeDesc)  {
 		if (component == null)
-		    return AttributeCollection.Empty;
+			return AttributeCollection.Empty;
 
 		if (noCustomTypeDesc == false && component is ICustomTypeDescriptor) {
-		    return ((ICustomTypeDescriptor) component).GetAttributes ();
+			return ((ICustomTypeDescriptor) component).GetAttributes ();
 		} else {
 			IComponent com = component as IComponent;
 			if (com != null && com.Site != null)
@@ -210,17 +194,17 @@
 	public static string GetClassName (object component, bool noCustomTypeDesc)
 	{
 		if (component == null)
-		    throw new ArgumentNullException ("component", "component cannot be null");
+			throw new ArgumentNullException ("component", "component cannot be null");
 
 		if (noCustomTypeDesc == false && component is ICustomTypeDescriptor) {
-		    String res = ((ICustomTypeDescriptor) component).GetClassName ();
+			String res = ((ICustomTypeDescriptor) component).GetClassName ();
 			if (res == null)
 				res = ((ICustomTypeDescriptor) component).GetComponentName ();
 			if (res == null)
 				res = component.GetType ().FullName;
 			return res;
 		} else {
-		    return component.GetType ().FullName;
+			return component.GetType ().FullName;
 		}
 	}
 
@@ -235,10 +219,10 @@
 	public static string GetComponentName (object component, bool noCustomTypeDesc)
 	{
 		if (component == null)
-		    throw new ArgumentNullException ("component", "component cannot be null");
+			throw new ArgumentNullException ("component", "component cannot be null");
 
 		if (noCustomTypeDesc == false && component is ICustomTypeDescriptor) {
-		    return ((ICustomTypeDescriptor) component).GetComponentName ();
+			return ((ICustomTypeDescriptor) component).GetComponentName ();
 		} else {
 			IComponent c = component as IComponent;
 			if (c != null && c.Site != null)

_______________________________________________
Mono-patches maillist  -  Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches


[prev in list] [next in list] [prev in thread] [next in thread]