[System.DirectoryServices] Rename method parameters to match .NET contract

diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryEntries.cs b/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryEntries.cs
index 89cb0579359850e1288ad31c2e7cbcf7aed1d047..7d1a0abbb8b0b59c5e6cb77eeaf6772e895ae62d 100644 (file)
--- a/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryEntries.cs
+++ b/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");

diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryServicesPermission.cs b/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryServicesPermission.cs
index d0d23937e27ba259b0da0292382f6a564f2d4fde..1df7a9ba452cacb19aaa173c82e7f0e3b990403a 100644 (file)
--- a/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryServicesPermission.cs
+++ b/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 {

diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryServicesPermissionEntryCollection.cs b/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryServicesPermissionEntryCollection.cs
index 95c07b65f6ef0df921bb0c45a76bd5c37f0e0753..c413ea6d4064a4a67045fa3aedf7700b807e739d 100644 (file)
--- a/mcs/class/System.DirectoryServices/System.DirectoryServices/DirectoryServicesPermissionEntryCollection.cs
+++ b/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 ()

diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices/PropertyValueCollection.cs b/mcs/class/System.DirectoryServices/System.DirectoryServices/PropertyValueCollection.cs
index b43bd209896f44f4db1e81e210aa2a5bc0bd872b..5b7533e7bd33c98082c381cde572c4b63df00afb 100644 (file)
--- a/mcs/class/System.DirectoryServices/System.DirectoryServices/PropertyValueCollection.cs
+++ b/mcs/class/System.DirectoryServices/System.DirectoryServices/PropertyValueCollection.cs
@@ -85,15 +85,15 @@ namespace System.DirectoryServices
 
                }
 
-               public void AddRange(object[] values)
+               public void AddRange(object[] value)
                {
-                       foreach (object val in values)
+                       foreach (object val in value)
                                Add (val);
                }
 
-               public void AddRange (PropertyValueCollection coll)
+               public void AddRange (PropertyValueCollection value)
                {
-                       foreach (object val in coll)
+                       foreach (object val in value)
                                Add (val);
                }
 
@@ -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]

diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices/ResultPropertyCollection.cs b/mcs/class/System.DirectoryServices/System.DirectoryServices/ResultPropertyCollection.cs
index 2c7460276fdf710a212eb49aeb1692b250ae12d1..df35e219994142cf0aed68823b46ee3a6660dd7f 100644 (file)
--- a/mcs/class/System.DirectoryServices/System.DirectoryServices/ResultPropertyCollection.cs
+++ b/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;
                }
        }
 }

diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices/ResultPropertyValueCollection.cs b/mcs/class/System.DirectoryServices/System.DirectoryServices/ResultPropertyValueCollection.cs
index 05b352889de61595477b4054995e2240ac1c1189..e2703927095c5dd3370cfab0380bc3e3e337b0d4 100644 (file)
--- a/mcs/class/System.DirectoryServices/System.DirectoryServices/ResultPropertyValueCollection.cs
+++ b/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)

diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices/SchemaNameCollection.cs b/mcs/class/System.DirectoryServices/System.DirectoryServices/SchemaNameCollection.cs
index 6b94d89070f3d42acf0e6b630e3f0c304c232c0f..2afb3bc8c6a999ec54ea90fead8de1407cf56bce 100644 (file)
--- a/mcs/class/System.DirectoryServices/System.DirectoryServices/SchemaNameCollection.cs
+++ b/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();
                }