2008-07-02 Andreas Nahr <ClassDevelopment@A-SoftTech.com>

	* SecurityPermission.cs:
	* RegistryPermission.cs:
	* PrincipalPermission.cs:
	* KeyContainerPermissionAccessEntry.cs:
	* KeyContainerPermission.cs:
	* GacIdentityPermission.cs: Fix parameter names

svn path=/trunk/mcs/; revision=107105

7 files changed, 42 insertions, 33 deletions

diff --git a/mcs/class/corlib/System.Security.Permissions/ChangeLog b/mcs/class/corlib/System.Security.Permissions/ChangeLog
index c9404a5a71b..a6babe13006 100644
--- a/mcs/class/corlib/System.Security.Permissions/ChangeLog
+++ b/mcs/class/corlib/System.Security.Permissions/ChangeLog
@@ -1,3 +1,12 @@
+2008-07-02  Andreas Nahr  <ClassDevelopment@A-SoftTech.com>
+
+	* SecurityPermission.cs:
+	* RegistryPermission.cs:
+	* PrincipalPermission.cs:
+	* KeyContainerPermissionAccessEntry.cs:
+	* KeyContainerPermission.cs:
+	* GacIdentityPermission.cs: Fix parameter names
+
 2006-08-21  Sebastien Pouliot  <sebastien@ximian.com>
 
 	* FileIOPermission.cs: Fix union of paths (#79118). Implement subpaths
diff --git a/mcs/class/corlib/System.Security.Permissions/GacIdentityPermission.cs b/mcs/class/corlib/System.Security.Permissions/GacIdentityPermission.cs
index 7604ef5a34d..36792ffda04 100644
--- a/mcs/class/corlib/System.Security.Permissions/GacIdentityPermission.cs
+++ b/mcs/class/corlib/System.Security.Permissions/GacIdentityPermission.cs
@@ -1,5 +1,5 @@
 //
-// System.Security.Permissions.GacIdentityPermission
+// System.Security.Permissions.GacIdentityPermission.cs
 //
 // Author:
 //	Sebastien Pouliot  <sebastien@ximian.com>
@@ -75,10 +75,10 @@ namespace System.Security.Permissions {
 			return Copy ();
 		}
 
-		public override void FromXml (SecurityElement esd)
+		public override void FromXml (SecurityElement securityElement)
 		{
 			// General validation in CodeAccessPermission
-			CheckSecurityElement (esd, "esd", version, version);
+			CheckSecurityElement (securityElement, "securityElement", version, version);
 			// Note: we do not (yet) care about the return value 
 			// as we only accept version 1 (min/max values)
 		}
diff --git a/mcs/class/corlib/System.Security.Permissions/KeyContainerPermission.cs b/mcs/class/corlib/System.Security.Permissions/KeyContainerPermission.cs
index f944f36c228..b3d9b15ea34 100644
--- a/mcs/class/corlib/System.Security.Permissions/KeyContainerPermission.cs
+++ b/mcs/class/corlib/System.Security.Permissions/KeyContainerPermission.cs
@@ -1,5 +1,5 @@
 //
-// System.Security.Permissions.KeyContainerPermission class
+// System.Security.Permissions.KeyContainerPermission.cs
 //
 // Author
 //	Sebastien Pouliot  <sebastien@ximian.com>
@@ -89,20 +89,20 @@ namespace System.Security.Permissions {
 		}
 
 		[MonoTODO ("(2.0) missing support for AccessEntries")]
-		public override void FromXml (SecurityElement esd) 
+		public override void FromXml (SecurityElement securityElement) 
 		{
 			// General validation in CodeAccessPermission
-			CheckSecurityElement (esd, "esd", version, version);
+			CheckSecurityElement (securityElement, "securityElement", version, version);
 			// Note: we do not (yet) care about the return value 
 			// as we only accept version 1 (min/max values)
 
-			if (IsUnrestricted (esd)) {
+			if (IsUnrestricted (securityElement)) {
 				_flags = KeyContainerPermissionFlags.AllFlags;
 			}
 			else {
 				// ???
 				_flags = (KeyContainerPermissionFlags) Enum.Parse (
-					typeof (KeyContainerPermissionFlags), esd.Attribute ("Flags"));
+					typeof (KeyContainerPermissionFlags), securityElement.Attribute ("Flags"));
 			}
 		}
 
diff --git a/mcs/class/corlib/System.Security.Permissions/KeyContainerPermissionAccessEntry.cs b/mcs/class/corlib/System.Security.Permissions/KeyContainerPermissionAccessEntry.cs
index 67468829ac6..7bbce55f03a 100644
--- a/mcs/class/corlib/System.Security.Permissions/KeyContainerPermissionAccessEntry.cs
+++ b/mcs/class/corlib/System.Security.Permissions/KeyContainerPermissionAccessEntry.cs
@@ -1,5 +1,5 @@
 //
-// System.Security.Permissions.KeyContainerPermissionAccessEntry class
+// System.Security.Permissions.KeyContainerPermissionAccessEntry.cs
 //
 // Author
 //	Sebastien Pouliot  <sebastien@ximian.com>
@@ -46,15 +46,15 @@ namespace System.Security.Permissions {
 		private int _type;
 
 
-		public KeyContainerPermissionAccessEntry (CspParameters csp, KeyContainerPermissionFlags flags)
+		public KeyContainerPermissionAccessEntry (CspParameters parameters, KeyContainerPermissionFlags flags)
 		{
-			if (csp == null)
-				throw new ArgumentNullException ("csp");
+			if (parameters == null)
+				throw new ArgumentNullException ("parameters");
 
-			ProviderName = csp.ProviderName;
-			ProviderType = csp.ProviderType;
-			KeyContainerName = csp.KeyContainerName;
-			KeySpec = csp.KeyNumber;
+			ProviderName = parameters.ProviderName;
+			ProviderType = parameters.ProviderType;
+			KeyContainerName = parameters.KeyContainerName;
+			KeySpec = parameters.KeyNumber;
 			Flags = flags;
 		}
 
@@ -113,11 +113,11 @@ namespace System.Security.Permissions {
 		}
 
 
-		public override bool Equals (object obj)
+		public override bool Equals (object o)
 		{
-			if (obj == null)
+			if (o == null)
 				return false;
-			KeyContainerPermissionAccessEntry kcpae = (obj as KeyContainerPermissionAccessEntry);
+			KeyContainerPermissionAccessEntry kcpae = (o as KeyContainerPermissionAccessEntry);
 			if (kcpae == null)
 				return false;
 			if (_flags != kcpae._flags)
diff --git a/mcs/class/corlib/System.Security.Permissions/PrincipalPermission.cs b/mcs/class/corlib/System.Security.Permissions/PrincipalPermission.cs
index e340d0a3259..87a2254c997 100644
--- a/mcs/class/corlib/System.Security.Permissions/PrincipalPermission.cs
+++ b/mcs/class/corlib/System.Security.Permissions/PrincipalPermission.cs
@@ -132,17 +132,17 @@ namespace System.Security.Permissions {
 			}
 		}
 
-		public void FromXml (SecurityElement esd) 
+		public void FromXml (SecurityElement elem) 
 		{
 			// General validation in CodeAccessPermission
-			CheckSecurityElement (esd, "esd", version, version);
+			CheckSecurityElement (elem, "elem", version, version);
 			// Note: we do not (yet) care about the return value 
 			// as we only accept version 1 (min/max values)
 
 			principals.Clear ();
 			// Children is null, not empty, when no child is present
-			if (esd.Children != null) {
-				foreach (SecurityElement se in esd.Children) {
+			if (elem.Children != null) {
+				foreach (SecurityElement se in elem.Children) {
 					if (se.Tag != "Identity")
 						throw new ArgumentException ("not IPermission/Identity");
 					string name = se.Attribute ("ID");
@@ -258,9 +258,9 @@ namespace System.Security.Permissions {
 			return se;
 		}
 
-		public IPermission Union (IPermission target)
+		public IPermission Union (IPermission other)
 		{
-			PrincipalPermission pp = Cast (target);
+			PrincipalPermission pp = Cast (other);
 			if (pp == null)
 				return Copy ();
 
diff --git a/mcs/class/corlib/System.Security.Permissions/RegistryPermission.cs b/mcs/class/corlib/System.Security.Permissions/RegistryPermission.cs
index 5471a4601e9..62e42fc2429 100644
--- a/mcs/class/corlib/System.Security.Permissions/RegistryPermission.cs
+++ b/mcs/class/corlib/System.Security.Permissions/RegistryPermission.cs
@@ -306,9 +306,9 @@ namespace System.Security.Permissions {
 			return se;
 		}
 
-		public override IPermission Union (IPermission target)
+		public override IPermission Union (IPermission other)
 		{
-			RegistryPermission rp = Cast (target);
+			RegistryPermission rp = Cast (other);
 			if (rp == null)
 				return Copy ();
 
diff --git a/mcs/class/corlib/System.Security.Permissions/SecurityPermission.cs b/mcs/class/corlib/System.Security.Permissions/SecurityPermission.cs
index 4240ccb938d..7d6ecbb4dd1 100644
--- a/mcs/class/corlib/System.Security.Permissions/SecurityPermission.cs
+++ b/mcs/class/corlib/System.Security.Permissions/SecurityPermission.cs
@@ -56,10 +56,10 @@ namespace System.Security.Permissions {
 				flags = SecurityPermissionFlag.NoFlags;
 		}
 
-		public SecurityPermission (SecurityPermissionFlag flags) 
+		public SecurityPermission (SecurityPermissionFlag flag) 
 		{
 			// reuse validation by the Flags property
-			Flags = flags;
+			Flags = flag;
 		}
 
 		public SecurityPermissionFlag Flags {
@@ -132,18 +132,18 @@ namespace System.Security.Permissions {
 			return ((flags & ~sp.flags) == 0);
 		}
 
-		public override void FromXml (SecurityElement e) 
+		public override void FromXml (SecurityElement esd) 
 		{
 			// General validation in CodeAccessPermission
-			CheckSecurityElement (e, "e", version, version);
+			CheckSecurityElement (esd, "esd", version, version);
 			// Note: we do not (yet) care about the return value 
 			// as we only accept version 1 (min/max values)
 
-			if (IsUnrestricted (e)) {
+			if (IsUnrestricted (esd)) {
 				flags = SecurityPermissionFlag.AllFlags;
 			}
 			else {
-				string f = e.Attribute ("Flags");
+				string f = esd.Attribute ("Flags");
 				if (f == null) {
 					flags = SecurityPermissionFlag.NoFlags;
 				}