Removal of NET_1_1 defines and some NET_2_0; Both defines are true these days in...

[mono.git] / mcs / class / System.Data / System.Data.Odbc / OdbcPermission.cs

diff --git a/mcs/class/System.Data/System.Data.Odbc/OdbcPermission.cs b/mcs/class/System.Data/System.Data.Odbc/OdbcPermission.cs
index 6f766dcfcace8ea5a07eb3455b1718ace9a6435f..a198de6bb2c3174b4ed9740b7e52a6fdf24053f5 100644 (file)
--- a/mcs/class/System.Data/System.Data.Odbc/OdbcPermission.cs
+++ b/mcs/class/System.Data/System.Data.Odbc/OdbcPermission.cs
@@ -31,16 +31,14 @@ using System.Data.Common;
 using System.Security;
 using System.Security.Permissions;
 
-namespace System.Data.Odbc {
-
+namespace System.Data.Odbc
+{
        [Serializable]
-       public sealed class OdbcPermission : DBDataPermission {
-
+       public sealed class OdbcPermission : DBDataPermission
+       {
                #region Constructors
 
-#if NET_1_1
                [Obsolete ("use OdbcPermission(PermissionState.None)", true)]
-#endif
                public OdbcPermission ()
                        : base (PermissionState.None)
                {
@@ -51,12 +49,11 @@ namespace System.Data.Odbc {
                {
                }
 
-#if NET_1_1
                [Obsolete ("use OdbcPermission(PermissionState.None)", true)]
-#endif
                public OdbcPermission (PermissionState state, bool allowBlankPassword)
-                       : base (state, allowBlankPassword)
+                       : base (state)
                {
+                       AllowBlankPassword = allowBlankPassword;
                }
 
                // required for Copy method
@@ -65,9 +62,12 @@ namespace System.Data.Odbc {
                {
                }
 
-               #endregion
+               // easier (and common) permission creation from attribute class
+               internal OdbcPermission (DBDataPermissionAttribute attribute)
+                       : base (attribute)
+               {
+               }
 
-               #region Properties
                #endregion
 
                #region Methods
@@ -77,20 +77,11 @@ namespace System.Data.Odbc {
                        return new OdbcPermission (this);
                }
 
-#if NET_2_0
-               [MonoTODO ("unimplemented (and unused in Mono)")]
-               protected override void AddConnectionString (string connectionString, string restrictions, 
-                       KeyRestrictionBehavior behavior, Hashtable synonyms, bool useFirstKeyValue)
-               {
-                       throw new NotImplementedException ();
-               }
-#else
-               // no more part of Fx 2.0 - useless ? or replaced with AddConnectionString ?
                public override void Add (string connectionString, string restrictions, KeyRestrictionBehavior behavior)
                {
                        base.Add (connectionString, restrictions, behavior);
                }
-#endif
+
                #endregion
        }
 }