X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Fclass%2FSystem.Data%2FSystem.Data.SqlClient%2FSqlClientPermission.cs;h=7b141315d9e47dcba39ed46d2ce39fce13b17bed;hb=cb091188403237aa3eb87f39a09f00f642750cc2;hp=28ee5e1b5a3b0a546e088981b310bf6185c5c2f1;hpb=9efe5974b762c83324f42645c5af8afdc34d4ce4;p=mono.git

diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlClientPermission.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlClientPermission.cs
index 28ee5e1b5a3..7b141315d9e 100644
--- a/mcs/class/System.Data/System.Data.SqlClient/SqlClientPermission.cs
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlClientPermission.cs
@@ -1,83 +1,96 @@
 //
 // System.Data.SqlClient.SqlClientPermission.cs
 //
-// Author:
-//   Rodrigo Moya (rodrigo@ximian.com)
-//   Daniel Morgan (danmorg@sc.rr.com)
-//   Tim Coleman (tim@timcoleman.com)
+// Authors:
+//	Rodrigo Moya (rodrigo@ximian.com)
+//	Daniel Morgan (danmorg@sc.rr.com)
+//	Tim Coleman (tim@timcoleman.com)
+//	Sebastien Pouliot  <sebastien@ximian.com>
 //
 // (C) Ximian, Inc 2002
 // Copyright (C) Tim Coleman, 2002
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+// 
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-using System;
-using System.Data;
+using System.Collections;
 using System.Data.Common;
 using System.Security;
 using System.Security.Permissions;
 
 namespace System.Data.SqlClient {
+
 	[Serializable]
-	public sealed class SqlClientPermission : DBDataPermission 
-	{
-		[MonoTODO]
-		public SqlClientPermission () 
+	public sealed class SqlClientPermission : DBDataPermission {
+
+		#region Fields
+		#endregion // Fields
+
+		#region Constructors
+
+		[Obsolete ("Use SqlClientPermission(PermissionState.None)", true)]
+		public SqlClientPermission ()
+			: this (PermissionState.None)
 		{
-			// FIXME: do constructor
 		}
 
-		[MonoTODO]
 		public SqlClientPermission (PermissionState state) 
+			: base (state)
 		{
-			// FIXME: do constructor
 		}
 
-		[MonoTODO]
+		[Obsolete ("Use SqlClientPermission(PermissionState.None)", true)]
 		public SqlClientPermission (PermissionState state, bool allowBlankPassword) 
-		{ 
-			throw new NotImplementedException ();
-		}
-
-		[MonoTODO]
-		public override IPermission Copy () 
+			: base (state)
 		{
-			throw new NotImplementedException ();
+			AllowBlankPassword = allowBlankPassword;
 		}
 
-		[MonoTODO]
-		public override void FromXml (SecurityElement securityElement) 
+		// required for Copy method
+		internal SqlClientPermission (DBDataPermission permission)
+			: base (permission)
 		{
-			throw new NotImplementedException ();
 		}
 
-		[MonoTODO]
-		public override IPermission Intersect (IPermission target)  
+		// easier (and common) permission creation from attribute class
+		internal SqlClientPermission (DBDataPermissionAttribute attribute)
+			: base (attribute)
 		{
-			throw new NotImplementedException ();
 		}
 
-		[MonoTODO]
-		public override bool IsSubsetOf (IPermission target) 
-		{
-			throw new NotImplementedException ();
-		}
+		#endregion // Constructors
 
-		[MonoTODO]
-		public override string ToString () 
-		{
-			throw new NotImplementedException ();
-		}
+		#region Methods
 
-		[MonoTODO]
-		public override SecurityElement ToXml () 
+		public override IPermission Copy ()
 		{
-			throw new NotImplementedException ();
+			return new SqlClientPermission (this);
 		}
 
-		[MonoTODO]
-		public override IPermission Union (IPermission target) 
+#if NET_1_1
+		public override void Add (string connectionString, string restrictions, KeyRestrictionBehavior behavior)
 		{
-			throw new NotImplementedException ();
+			base.Add (connectionString, restrictions, behavior);
 		}
+#endif
+		#endregion // Methods
 	}
 }