Imported Upstream version 5.2.0.175

Former-commit-id: bb0468d0f257ff100aa895eb5fe583fb5dfbf900

mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryEntries.cs

@@ -215,9 +215,9 @@ namespace System.DirectoryServices
 		/// <param name="filter">relative distinguised name of the child
 		/// </param>
 		/// <returns>Child entry with the specified name </returns>
-		public DirectoryEntry Find(string filter)
+		public DirectoryEntry Find(string name)
 		{
-			DirectoryEntry child=CheckEntry(filter);
+			DirectoryEntry child=CheckEntry(name);
 			return child;
 		}
 
@@ -229,12 +229,12 @@ namespace System.DirectoryServices
 		/// <param name="otype"> Type of the child i.e strutcuralObjectClass
 		/// name of the child </param>
 		/// <returns>Child entry with the specified name and type</returns>
-		public DirectoryEntry Find(string filter, string otype)
+		public DirectoryEntry Find(string name, string schemaClassName)
 		{
-			DirectoryEntry child=CheckEntry(filter);
+			DirectoryEntry child=CheckEntry(name);
 
 			if( child != null)			{
-				if(child.Properties["objectclass"].ContainsCaselessStringValue(otype))
+				if(child.Properties["objectclass"].ContainsCaselessStringValue(schemaClassName))
 					return child;
 				else
 					throw new SystemException("An unknown directory object was requested");

mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryServicesPermission.cs

@@ -45,11 +45,11 @@ namespace System.DirectoryServices {
 			SetUp ();
 		}
 
-		public DirectoryServicesPermission (DirectoryServicesPermissionEntry[] entries)
+		public DirectoryServicesPermission (DirectoryServicesPermissionEntry[] permissionAccessEntries)
 		{
 			SetUp ();
 			innerCollection = new DirectoryServicesPermissionEntryCollection (this);
-			innerCollection.AddRange (entries);
+			innerCollection.AddRange (permissionAccessEntries);
 		}
 
  		public DirectoryServicesPermission (PermissionState state)
@@ -58,11 +58,11 @@ namespace System.DirectoryServices {
 			SetUp ();
 		}
 
-		public DirectoryServicesPermission (DirectoryServicesPermissionAccess access, string path)
+		public DirectoryServicesPermission (DirectoryServicesPermissionAccess permissionAccess, string path)
 		{
 			SetUp ();
 			innerCollection = new DirectoryServicesPermissionEntryCollection (this);
-			innerCollection.Add (new DirectoryServicesPermissionEntry (access, path));
+			innerCollection.Add (new DirectoryServicesPermissionEntry (permissionAccess, path));
 		}
 
 		public DirectoryServicesPermissionEntryCollection PermissionEntries {

mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryServicesPermissionEntryCollection.cs

@@ -61,47 +61,47 @@ namespace System.DirectoryServices {
 			set { List[index] = value; }
 		}
 
-		public int Add (DirectoryServicesPermissionEntry entry)
+		public int Add (DirectoryServicesPermissionEntry value)
 		{
-			return List.Add (entry);
+			return List.Add (value);
 		}
 
-		public void AddRange (DirectoryServicesPermissionEntry[] entries)
+		public void AddRange (DirectoryServicesPermissionEntry[] value)
 		{
-			foreach (DirectoryServicesPermissionEntry entry in entries)
+			foreach (DirectoryServicesPermissionEntry entry in value)
 				Add (entry);
 		}
 
-		public void AddRange (DirectoryServicesPermissionEntryCollection entries)
+		public void AddRange (DirectoryServicesPermissionEntryCollection value)
 		{
-			foreach (DirectoryServicesPermissionEntry entry in entries)
+			foreach (DirectoryServicesPermissionEntry entry in value)
 				Add (entry);
 		}
 
-		public void CopyTo (DirectoryServicesPermissionEntry[] copy_to, int index)
+		public void CopyTo (DirectoryServicesPermissionEntry[] array, int index)
 		{
 			foreach (DirectoryServicesPermissionEntry entry in List)
-				copy_to[index++] = entry;
+				array[index++] = entry;
 		}
 
-		public bool Contains (DirectoryServicesPermissionEntry entry)
+		public bool Contains (DirectoryServicesPermissionEntry value)
 		{
-			return List.Contains (entry);
+			return List.Contains (value);
 		}
 
-		public int IndexOf (DirectoryServicesPermissionEntry entry)
+		public int IndexOf (DirectoryServicesPermissionEntry value)
 		{
-			return List.IndexOf (entry);
+			return List.IndexOf (value);
 		}
 
-		public void Insert (int pos, DirectoryServicesPermissionEntry entry)
+		public void Insert (int index, DirectoryServicesPermissionEntry value)
 		{
-			List.Insert (pos, entry);
+			List.Insert (index, value);
 		}
 
-		public void Remove (DirectoryServicesPermissionEntry entry)
+		public void Remove (DirectoryServicesPermissionEntry value)
 		{
-			List.Remove (entry);
+			List.Remove (value);
 		}
 
 		protected override void OnClear ()

mcs/class/System.DirectoryServices/System.DirectoryServices/PropertyValueCollection.cs

@@ -85,16 +85,16 @@ namespace System.DirectoryServices
 
 		}
 
-		public void AddRange(object[] values)
+		public void AddRange(object[] value)
 		{
-			foreach (object value in values)
-				Add (value);
+			foreach (object val in value)
+				Add (val);
 		}
 
-		public void AddRange (PropertyValueCollection coll)
+		public void AddRange (PropertyValueCollection value)
 		{
-			foreach (object value in coll)
-				Add (value);
+			foreach (object val in value)
+				Add (val);
 		}
 
 		public int IndexOf( object value )  
@@ -132,10 +132,10 @@ namespace System.DirectoryServices
 			return false;
 		}
 
-		public void CopyTo (object[] copy_to, int index)
+		public void CopyTo (object[] array, int index)
 		{
 			foreach (object o in List)
-				copy_to[index++] = o;
+				array[index++] = o;
 		}
 
 		[MonoTODO]

mcs/class/System.DirectoryServices/System.DirectoryServices/ResultPropertyCollection.cs

@@ -58,10 +58,10 @@ namespace System.DirectoryServices
 			
 		}
 
-		public ResultPropertyValueCollection this[string key]
+		public ResultPropertyValueCollection this[string name]
 		{
 			get {
-				return (ResultPropertyValueCollection) this.Dictionary[key.ToLower()];
+				return (ResultPropertyValueCollection) this.Dictionary[name.ToLower()];
 			}
 //			set { this.Dictionary[key] = value; } 
 		}
@@ -72,9 +72,9 @@ namespace System.DirectoryServices
 		} 
 		
 		//see if collection contains an entry corresponding to key
-		public bool Contains(string key)
+		public bool Contains(string propertyName)
 		{
-			return this.Dictionary.Contains(key.ToLower());
+			return this.Dictionary.Contains(propertyName.ToLower());
 		}
 		
 		public ICollection PropertyNames 
@@ -93,10 +93,10 @@ namespace System.DirectoryServices
 			}
 		}
 
-		public void CopyTo (ResultPropertyValueCollection[] copy_to, int index)
+		public void CopyTo (ResultPropertyValueCollection[] array, int index)
 		{
 			foreach (ResultPropertyValueCollection vals in Values)
-				copy_to[index++] = vals;
+				array[index++] = vals;
 		}
 	}
 }

mcs/class/System.DirectoryServices/System.DirectoryServices/ResultPropertyValueCollection.cs

@@ -74,9 +74,9 @@ namespace System.DirectoryServices
 			return InnerList.Contains (value);
 		}
 
-		public void CopyTo (object[] array, int index)
+		public void CopyTo (object[] values, int index)
 		{
-			InnerList.CopyTo (array, index);
+			InnerList.CopyTo (values, index);
 		}
 
 		public int IndexOf (object value)

mcs/class/System.DirectoryServices/System.DirectoryServices/SchemaNameCollection.cs

@@ -158,19 +158,19 @@ namespace System.DirectoryServices
 		}
 
 		[MonoTODO]
-		public void AddRange (SchemaNameCollection coll)
+		public void AddRange (SchemaNameCollection value)
 		{
 			throw new NotImplementedException();
 		}
 
 		[MonoTODO]
-		public void AddRange (string[] coll)
+		public void AddRange (string[] value)
 		{
 			throw new NotImplementedException();
 		}
 
 		[MonoTODO]
-		public bool Contains (string s)
+		public bool Contains (string value)
 		{
 			throw new NotImplementedException();
 		}
@@ -182,25 +182,25 @@ namespace System.DirectoryServices
 		}
 
 		[MonoTODO]
-		public void CopyTo (string[] copy_to, int pos)
+		public void CopyTo (string[] stringArray, int index)
 		{
 			throw new NotImplementedException();
 		}
 
 		[MonoTODO]
-		public int IndexOf (string s)
+		public int IndexOf (string value)
 		{
 			throw new NotImplementedException();
 		}
 
 		[MonoTODO]
-		public void Insert (int pos, string s)
+		public void Insert (int index, string value)
 		{
 			throw new NotImplementedException();
 		}
 
 		[MonoTODO]
-		public void Remove (string s)
+		public void Remove (string value)
 		{
 			throw new NotImplementedException();
 		}