2003-08-03 Sebastien Pouliot <spouliot@videotron.ca>

	* EnvironmentPermission.cs: Added IBuiltInPermission.GetTokenIndex.
	Returns 0.
	* FileDialogPermission.cs: Added IBuiltInPermission.GetTokenIndex.
	Returns 1.
	* IsolatedStorageFilePermission.cs: Added IBuiltInPermission.
	GetTokenIndex. Returns 3.
	* PrincipalPermission.cs: Added IBuiltInPermission.GetTokenIndex.
	Returns 8.
	* PublisherIdentityPermission.cs: Added IBuiltInPermission.
	GetTokenIndex. Returns 9.
	* ReflectionPermission.cs: Added IBuiltInPermission.GetTokenIndex.
	Returns 4.
	* RegistryPermission.cs: Added IBuiltInPermission.GetTokenIndex.
	Returns 5.
	* SecurityPermission.cs: Added IBuiltInPermission.GetTokenIndex.
	Returns 6.
	* SiteIdentityPermission.cs: Added IBuiltInPermission.GetTokenIndex.
	Returns 10.
	* StrongNameIdentityPermission.cs: Added [Serializable] and
	IBuiltInPermission.GetTokenIndex. Returns 11.
	* UIPermission.cs: Added IBuiltInPermission.GetTokenIndex. Returns 7.
	* UrlIdentityPermission.cs: Added IBuiltInPermission.GetTokenIndex.
	Returns 12.
	* ZoneIdentityPermission.cs: Added IBuiltInPermission.GetTokenIndex.
	Returns 13.

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

diff --git a/mcs/class/corlib/System.Security.Permissions/ChangeLog b/mcs/class/corlib/System.Security.Permissions/ChangeLog
index cbfd329510ff460a3c615a794026e713d4f9e82e..d3c9baaae95e82e558d4c6504f7fcd6274be1340 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/ChangeLog
+++ b/mcs/class/corlib/System.Security.Permissions/ChangeLog
@@ -2,6 +2,31 @@
 
        * IBuiltInPermission.cs: New. Undocumented interface used by most
        <*>Permission classes.
+       * EnvironmentPermission.cs: Added IBuiltInPermission.GetTokenIndex. 
+       Returns 0.
+       * FileDialogPermission.cs: Added IBuiltInPermission.GetTokenIndex. 
+       Returns 1.
+       * IsolatedStorageFilePermission.cs: Added IBuiltInPermission.
+       GetTokenIndex. Returns 3.
+       * PrincipalPermission.cs: Added IBuiltInPermission.GetTokenIndex. 
+       Returns 8.
+       * PublisherIdentityPermission.cs: Added IBuiltInPermission.
+       GetTokenIndex. Returns 9.
+       * ReflectionPermission.cs: Added IBuiltInPermission.GetTokenIndex. 
+       Returns 4.
+       * RegistryPermission.cs: Added IBuiltInPermission.GetTokenIndex. 
+       Returns 5.
+       * SecurityPermission.cs: Added IBuiltInPermission.GetTokenIndex. 
+       Returns 6. 
+       * SiteIdentityPermission.cs: Added IBuiltInPermission.GetTokenIndex. 
+       Returns 10.
+       * StrongNameIdentityPermission.cs: Added [Serializable] and 
+       IBuiltInPermission.GetTokenIndex. Returns 11.
+       * UIPermission.cs: Added IBuiltInPermission.GetTokenIndex. Returns 7.
+       * UrlIdentityPermission.cs: Added IBuiltInPermission.GetTokenIndex. 
+       Returns 12.
+       * ZoneIdentityPermission.cs: Added IBuiltInPermission.GetTokenIndex. 
+       Returns 13.
 
 2003-07-01  Sebastien Pouliot  <spouliot@videotron.ca>
 

diff --git a/mcs/class/corlib/System.Security.Permissions/EnvironmentPermission.cs b/mcs/class/corlib/System.Security.Permissions/EnvironmentPermission.cs
index 4d03d8334ef10faedd40762e6323643440066ac2..2e0ea8bb10f9689e80b820186ed9f27037dd26bd 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/EnvironmentPermission.cs
+++ b/mcs/class/corlib/System.Security.Permissions/EnvironmentPermission.cs
@@ -17,7 +17,7 @@ using System.Text;
 namespace System.Security.Permissions {
 
        [Serializable]
-       public sealed class EnvironmentPermission : CodeAccessPermission, IUnrestrictedPermission {
+       public sealed class EnvironmentPermission : CodeAccessPermission, IUnrestrictedPermission, IBuiltInPermission {
 
                #region Fields
 
@@ -301,6 +301,12 @@ namespace System.Security.Permissions {
                        return ep;
                }
 
+               // IBuiltInPermission
+               int IBuiltInPermission.GetTokenIndex ()
+               {
+                       return 0;
+               }
+
                #endregion // Methods
        }
 }

diff --git a/mcs/class/corlib/System.Security.Permissions/FileDialogPermission.cs b/mcs/class/corlib/System.Security.Permissions/FileDialogPermission.cs
index 2c98ec8d737fefcc1286f2ea80a9f7b3f04e057f..f33bdaaffac2dbc5246d787afec6ae57f717760b 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/FileDialogPermission.cs
+++ b/mcs/class/corlib/System.Security.Permissions/FileDialogPermission.cs
@@ -12,7 +12,7 @@ using System;
 namespace System.Security.Permissions {
 
        [Serializable]
-       public sealed class FileDialogPermission : CodeAccessPermission, IUnrestrictedPermission {
+       public sealed class FileDialogPermission : CodeAccessPermission, IUnrestrictedPermission, IBuiltInPermission {
 
                private FileDialogPermissionAccess _access;
 
@@ -172,5 +172,11 @@ namespace System.Security.Permissions {
                        ep.Access = _access | o.Access;
                        return ep;
                }
+
+               // IBuiltInPermission
+               int IBuiltInPermission.GetTokenIndex ()
+               {
+                       return 1;
+               }
        }
 }
\ No newline at end of file

diff --git a/mcs/class/corlib/System.Security.Permissions/IsolatedStorageFilePermission.cs b/mcs/class/corlib/System.Security.Permissions/IsolatedStorageFilePermission.cs
index 6d38998bbddcfbecbf5661d783927cd52b460d50..38591ac1db30879bf1388aa6d023d991a0d0a738 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/IsolatedStorageFilePermission.cs
+++ b/mcs/class/corlib/System.Security.Permissions/IsolatedStorageFilePermission.cs
@@ -12,7 +12,7 @@ using System;
 namespace System.Security.Permissions {
 
        [Serializable]
-       public sealed class IsolatedStorageFilePermission : IsolatedStoragePermission {
+       public sealed class IsolatedStorageFilePermission : IsolatedStoragePermission, IBuiltInPermission {
 
                // Constructors
 
@@ -47,5 +47,11 @@ namespace System.Security.Permissions {
                {
                        return null;
                }
+
+               // IBuiltInPermission
+               int IBuiltInPermission.GetTokenIndex ()
+               {
+                       return 3;
+               }
        }
 }
\ No newline at end of file

diff --git a/mcs/class/corlib/System.Security.Permissions/PrincipalPermission.cs b/mcs/class/corlib/System.Security.Permissions/PrincipalPermission.cs
index 8cfaec8068a55ff24d226b43f2a46dcf0511c58f..5e114b48f4c97af705e9782b7b017227b91ff306 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/PrincipalPermission.cs
+++ b/mcs/class/corlib/System.Security.Permissions/PrincipalPermission.cs
@@ -16,7 +16,7 @@ using System.Threading;
 namespace System.Security.Permissions {
 
        [Serializable]
-       public sealed class PrincipalPermission : IPermission, IUnrestrictedPermission {
+       public sealed class PrincipalPermission : IPermission, IUnrestrictedPermission, IBuiltInPermission {
 
                internal class PrincipalInfo {
 
@@ -254,5 +254,11 @@ namespace System.Security.Permissions {
 
                        return union;
                }
+
+               // IBuiltInPermission
+               int IBuiltInPermission.GetTokenIndex ()
+               {
+                       return 8;
+               }
        }
 }
\ No newline at end of file

diff --git a/mcs/class/corlib/System.Security.Permissions/PublisherIdentityPermission.cs b/mcs/class/corlib/System.Security.Permissions/PublisherIdentityPermission.cs
index 68346be73301e72d8498847710be77debde791e8..a78450a8f25bd865cd37e6b41f48e15e5adbd19e 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/PublisherIdentityPermission.cs
+++ b/mcs/class/corlib/System.Security.Permissions/PublisherIdentityPermission.cs
@@ -13,7 +13,7 @@ using System.Security.Cryptography.X509Certificates;
 namespace System.Security.Permissions {
 
        [Serializable]
-       public sealed class PublisherIdentityPermission : CodeAccessPermission {
+       public sealed class PublisherIdentityPermission : CodeAccessPermission, IBuiltInPermission {
        
                private X509Certificate x509;
        
@@ -143,5 +143,11 @@ namespace System.Security.Permissions {
                                return new PublisherIdentityPermission (x509);
                        return null;
                }
+
+               // IBuiltInPermission
+               int IBuiltInPermission.GetTokenIndex ()
+               {
+                       return 9;
+               }
        } 
 }

diff --git a/mcs/class/corlib/System.Security.Permissions/ReflectionPermission.cs b/mcs/class/corlib/System.Security.Permissions/ReflectionPermission.cs
index 20e35c028c803f1a5bbe8b1552d6b849a4ed7b0e..5fca73d668913f0cf8b6ad6f71d8aecbd8ae0198 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/ReflectionPermission.cs
+++ b/mcs/class/corlib/System.Security.Permissions/ReflectionPermission.cs
@@ -14,7 +14,7 @@ using System;
 namespace System.Security.Permissions {
 
        [Serializable]
-       public sealed class ReflectionPermission : CodeAccessPermission, IUnrestrictedPermission {
+       public sealed class ReflectionPermission : CodeAccessPermission, IUnrestrictedPermission, IBuiltInPermission {
 
                #region Fields
 
@@ -182,6 +182,12 @@ namespace System.Security.Permissions {
                        return p;
                }
 
+               // IBuiltInPermission
+               int IBuiltInPermission.GetTokenIndex ()
+               {
+                       return 4;
+               }
+
                #endregion // Methods
        }
 }

diff --git a/mcs/class/corlib/System.Security.Permissions/RegistryPermission.cs b/mcs/class/corlib/System.Security.Permissions/RegistryPermission.cs
index fd92587844d5d7fb2a20d5994596d3cacfc490ef..a926fd83e30611defd8e98a3151fe028835c9f35 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/RegistryPermission.cs
+++ b/mcs/class/corlib/System.Security.Permissions/RegistryPermission.cs
@@ -12,7 +12,7 @@ using System;
 namespace System.Security.Permissions {
 
        [Serializable]
-       public sealed class RegistryPermission : CodeAccessPermission, IUnrestrictedPermission {
+       public sealed class RegistryPermission : CodeAccessPermission, IUnrestrictedPermission, IBuiltInPermission {
 
                private RegistryPermissionAccess _access;
                private string _pathList;
@@ -86,5 +86,11 @@ namespace System.Security.Permissions {
                {
                        return null;
                }
+
+               // IBuiltInPermission
+               int IBuiltInPermission.GetTokenIndex ()
+               {
+                       return 5;
+               }
        }
 }
\ No newline at end of file

diff --git a/mcs/class/corlib/System.Security.Permissions/SecurityPermission.cs b/mcs/class/corlib/System.Security.Permissions/SecurityPermission.cs
index c77229ca4d9d4cf7dd8d8e7633749a2fa0125648..2262c910ee188fe740715354e2c3d01edda7752d 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/SecurityPermission.cs
+++ b/mcs/class/corlib/System.Security.Permissions/SecurityPermission.cs
@@ -16,7 +16,7 @@ namespace System.Security.Permissions {
        
        [Serializable]
        public sealed class SecurityPermission :
-               CodeAccessPermission, IUnrestrictedPermission {
+               CodeAccessPermission, IUnrestrictedPermission, IBuiltInPermission {
 
                [MonoTODO]
                public SecurityPermission (PermissionState state) 
@@ -77,5 +77,11 @@ namespace System.Security.Permissions {
                // private 
                
                private SecurityPermissionFlag flags;
+
+               // IBuiltInPermission
+               int IBuiltInPermission.GetTokenIndex ()
+               {
+                       return 6;
+               }
        }
 }

diff --git a/mcs/class/corlib/System.Security.Permissions/SiteIdentityPermission.cs b/mcs/class/corlib/System.Security.Permissions/SiteIdentityPermission.cs
index e13b7fc4cbea5f91f430e48bb63a50aaf39d8697..f69be4f4b44a8337f47e81c51c05acdc5d556921 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/SiteIdentityPermission.cs
+++ b/mcs/class/corlib/System.Security.Permissions/SiteIdentityPermission.cs
@@ -12,7 +12,7 @@ using System;
 namespace System.Security.Permissions {
 
        [Serializable]
-       public sealed class SiteIdentityPermission : CodeAccessPermission {
+       public sealed class SiteIdentityPermission : CodeAccessPermission, IBuiltInPermission {
 
                private string _site;
 
@@ -69,5 +69,11 @@ namespace System.Security.Permissions {
                {
                        return null;
                }
+
+               // IBuiltInPermission
+               int IBuiltInPermission.GetTokenIndex ()
+               {
+                       return 10;
+               }
        }
 }
\ No newline at end of file

diff --git a/mcs/class/corlib/System.Security.Permissions/StrongNameIdentityPermission.cs b/mcs/class/corlib/System.Security.Permissions/StrongNameIdentityPermission.cs
index 9df8842f1eaf0151b66c6d784026d9ae8df6a425..0fb4bdeff6b1ad344aba4111b6b5023d5f15414c 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/StrongNameIdentityPermission.cs
+++ b/mcs/class/corlib/System.Security.Permissions/StrongNameIdentityPermission.cs
@@ -11,91 +11,97 @@ using System;
 
 namespace System.Security.Permissions {
 
-public sealed class StrongNameIdentityPermission : CodeAccessPermission {
-
-       private StrongNamePublicKeyBlob publickey;
-       private string name;
-       private Version version;
-
-       public StrongNameIdentityPermission (PermissionState state) 
-       {
-               if (state == PermissionState.Unrestricted)
-                       throw new ArgumentException ("state");
-       }
-
-       public StrongNameIdentityPermission (StrongNamePublicKeyBlob blob, string name, Version version) 
-       {
-               if (blob == null)
-                       throw new ArgumentNullException ("blob");
-               if (name == null)
-                       throw new ArgumentNullException ("name");
-               if (version == null)
-                       throw new ArgumentNullException ("version");
-
-               publickey = blob;
-               this.name = name;
-               this.version = version;
-       }
-
-       ~StrongNameIdentityPermission () 
-       {
-       }
-
-       public string Name { 
-               get { return name; }
-               set { name = value; }
-       }
-
-       public StrongNamePublicKeyBlob PublicKey { 
-               get { return publickey; }
-               set {
-                       if (value == null)
-                               throw new ArgumentNullException ("value");
-                       publickey = value;
+       [Serializable]
+       public sealed class StrongNameIdentityPermission : CodeAccessPermission, IBuiltInPermission {
+       
+               private StrongNamePublicKeyBlob publickey;
+               private string name;
+               private Version version;
+       
+               public StrongNameIdentityPermission (PermissionState state) 
+               {
+                       if (state == PermissionState.Unrestricted)
+                               throw new ArgumentException ("state");
                }
-       }
-
-       public Version Version { 
-               get { return version; }
-               set { version = value; }
-       }
-
-       public override IPermission Copy () 
-       {
-               return new StrongNameIdentityPermission (publickey, name, version);
-       }
-
-       [MonoTODO]
-       public override void FromXml (SecurityElement e) 
-       {
-               if (e == null)
-                       throw new ArgumentNullException ("e");
-               throw new NotImplementedException ();
-       }
-
-       [MonoTODO]
-       public override IPermission Intersect (IPermission target) 
-       {
-               throw new NotImplementedException ();
-       }
-
-       [MonoTODO]
-       public override bool IsSubsetOf (IPermission target) 
-       {
-               throw new NotImplementedException ();
-       }
-
-       [MonoTODO]
-       public override SecurityElement ToXml () 
-       {
-               throw new NotImplementedException ();
-       }
-
-       [MonoTODO]
-       public override IPermission Union (IPermission target) 
-       {
-               throw new NotImplementedException ();
-       }
-} 
-
+       
+               public StrongNameIdentityPermission (StrongNamePublicKeyBlob blob, string name, Version version) 
+               {
+                       if (blob == null)
+                               throw new ArgumentNullException ("blob");
+                       if (name == null)
+                               throw new ArgumentNullException ("name");
+                       if (version == null)
+                               throw new ArgumentNullException ("version");
+       
+                       publickey = blob;
+                       this.name = name;
+                       this.version = version;
+               }
+       
+               ~StrongNameIdentityPermission () 
+               {
+               }
+       
+               public string Name { 
+                       get { return name; }
+                       set { name = value; }
+               }
+       
+               public StrongNamePublicKeyBlob PublicKey { 
+                       get { return publickey; }
+                       set {
+                               if (value == null)
+                                       throw new ArgumentNullException ("value");
+                               publickey = value;
+                       }
+               }
+       
+               public Version Version { 
+                       get { return version; }
+                       set { version = value; }
+               }
+       
+               public override IPermission Copy () 
+               {
+                       return new StrongNameIdentityPermission (publickey, name, version);
+               }
+       
+               [MonoTODO]
+               public override void FromXml (SecurityElement e) 
+               {
+                       if (e == null)
+                               throw new ArgumentNullException ("e");
+                       throw new NotImplementedException ();
+               }
+       
+               [MonoTODO]
+               public override IPermission Intersect (IPermission target) 
+               {
+                       throw new NotImplementedException ();
+               }
+       
+               [MonoTODO]
+               public override bool IsSubsetOf (IPermission target) 
+               {
+                       throw new NotImplementedException ();
+               }
+       
+               [MonoTODO]
+               public override SecurityElement ToXml () 
+               {
+                       throw new NotImplementedException ();
+               }
+       
+               [MonoTODO]
+               public override IPermission Union (IPermission target) 
+               {
+                       throw new NotImplementedException ();
+               }
+       
+               // IBuiltInPermission
+               int IBuiltInPermission.GetTokenIndex ()
+               {
+                       return 11;
+               }
+       } 
 }

diff --git a/mcs/class/corlib/System.Security.Permissions/UIPermission.cs b/mcs/class/corlib/System.Security.Permissions/UIPermission.cs
index b43f7a5e28db3f5d241f3ddbdd57058600bd3eb4..2a23d4635d14c9304d71843c56005226080e0be1 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/UIPermission.cs
+++ b/mcs/class/corlib/System.Security.Permissions/UIPermission.cs
@@ -12,7 +12,7 @@ using System;
 namespace System.Security.Permissions {
 
        [Serializable]
-       public sealed class UIPermission : CodeAccessPermission, IUnrestrictedPermission {
+       public sealed class UIPermission : CodeAccessPermission, IUnrestrictedPermission, IBuiltInPermission {
 
                private UIPermissionWindow _window;
                private UIPermissionClipboard _clipboard;
@@ -92,5 +92,11 @@ namespace System.Security.Permissions {
                {
                        return null;
                }
+
+               // IBuiltInPermission
+               int IBuiltInPermission.GetTokenIndex ()
+               {
+                       return 7;
+               }
        }
 }
\ No newline at end of file

diff --git a/mcs/class/corlib/System.Security.Permissions/UrlIdentityPermission.cs b/mcs/class/corlib/System.Security.Permissions/UrlIdentityPermission.cs
index 5db82a40d12fdc2cd5260585b8fd222120ada8f4..d8fd5f45a3e92e8ecbf1764f96023cb6c291a571 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/UrlIdentityPermission.cs
+++ b/mcs/class/corlib/System.Security.Permissions/UrlIdentityPermission.cs
@@ -12,7 +12,7 @@ using System;
 namespace System.Security.Permissions {
 
        [Serializable]
-       public sealed class UrlIdentityPermission : CodeAccessPermission {
+       public sealed class UrlIdentityPermission : CodeAccessPermission, IBuiltInPermission {
 
                private string url;
 
@@ -81,5 +81,11 @@ namespace System.Security.Permissions {
                {
                        return null;
                }
+
+               // IBuiltInPermission
+               int IBuiltInPermission.GetTokenIndex ()
+               {
+                       return 12;
+               }
        }
 }

diff --git a/mcs/class/corlib/System.Security.Permissions/ZoneIdentityPermission.cs b/mcs/class/corlib/System.Security.Permissions/ZoneIdentityPermission.cs
index e8941a828c0ef0bb6773394cead34f83f2256284..861ec73b476352cb56c497297ae20c77d47ecfde 100644 (file)
--- a/mcs/class/corlib/System.Security.Permissions/ZoneIdentityPermission.cs
+++ b/mcs/class/corlib/System.Security.Permissions/ZoneIdentityPermission.cs
@@ -12,7 +12,7 @@ using System.Security;
 namespace System.Security.Permissions {
 
        [Serializable]
-       public sealed class ZoneIdentityPermission : CodeAccessPermission {
+       public sealed class ZoneIdentityPermission : CodeAccessPermission, IBuiltInPermission {
 
                SecurityZone zone;
 
@@ -114,6 +114,12 @@ namespace System.Security.Permissions {
                                zone = value;
                        }
                }
+
+               // IBuiltInPermission
+               int IBuiltInPermission.GetTokenIndex ()
+               {
+                       return 13;
+               }
        }
 }