2006-02-17 Chris Toshok <toshok@ximian.com>

	* SqlNotificationRequest.cs: class is sealed, and s/id/userData
	and s/service/options.

	* SqlDataSourceEnumerator.cs: ctor is private (for use with
	Instance property, which is currently not implemented.)  Also,
	remove set_Instance.


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

3 files changed, 30 insertions, 14 deletions

diff --git a/mcs/class/System.Data/System.Data.Sql/ChangeLog b/mcs/class/System.Data/System.Data.Sql/ChangeLog
index 0f0689cd305..8f2b3e72181 100644
--- a/mcs/class/System.Data/System.Data.Sql/ChangeLog
+++ b/mcs/class/System.Data/System.Data.Sql/ChangeLog
@@ -1,3 +1,12 @@
+2006-02-17  Chris Toshok  <toshok@ximian.com>
+
+	* SqlNotificationRequest.cs: class is sealed, and s/id/userData
+	and s/service/options.
+
+	* SqlDataSourceEnumerator.cs: ctor is private (for use with
+	Instance property, which is currently not implemented.)  Also,
+	remove set_Instance.
+
 2005-09-02 Umadevi S <sumadevi@novell.com>
 	* Removed Files
 	SerializationHelper.cs,DataAccessKind.cs,SerializationVersion.cs,Format.cs,
diff --git a/mcs/class/System.Data/System.Data.Sql/SqlDataSourceEnumerator.cs b/mcs/class/System.Data/System.Data.Sql/SqlDataSourceEnumerator.cs
index a1c155dadd8..c3f3e82e22a 100644
--- a/mcs/class/System.Data/System.Data.Sql/SqlDataSourceEnumerator.cs
+++ b/mcs/class/System.Data/System.Data.Sql/SqlDataSourceEnumerator.cs
@@ -38,12 +38,19 @@ using System.Data.Common;
 namespace System.Data.Sql {
 	public sealed class SqlDataSourceEnumerator : DbDataSourceEnumerator
 	{
+		#region Constructors
+
+		private SqlDataSourceEnumerator ()
+		{
+		}
+
+		#endregion // Constructors
+
 		#region Properties
 
 		[MonoTODO]
 		public static SqlDataSourceEnumerator Instance { 
 			get { throw new NotImplementedException (); }
-			set { throw new NotImplementedException (); }
 		}
 
 		#endregion // Properties
diff --git a/mcs/class/System.Data/System.Data.Sql/SqlNotificationRequest.cs b/mcs/class/System.Data/System.Data.Sql/SqlNotificationRequest.cs
index d17f7a7f8ea..4adfd7dcdaf 100644
--- a/mcs/class/System.Data/System.Data.Sql/SqlNotificationRequest.cs
+++ b/mcs/class/System.Data/System.Data.Sql/SqlNotificationRequest.cs
@@ -35,12 +35,12 @@
 using System;
 
 namespace System.Data.Sql {
-	public class SqlNotificationRequest 
+	public sealed class SqlNotificationRequest 
 	{
 		#region Fields
 
-		string id;
-		string service;
+		string userData;
+		string options;
 		int timeout;
 
 		#endregion // Fields
@@ -54,15 +54,15 @@ namespace System.Data.Sql {
 		}
 
 		[MonoTODO]
-		public SqlNotificationRequest (string id, string service, int timeout)
+		public SqlNotificationRequest (string userData, string options, int timeout)
 		{
-			if (service == null)
+			if (options == null)
 				throw new ArgumentNullException ();
 			if (timeout < 0)
 				throw new ArgumentOutOfRangeException ();
 
-			Id = id;
-			Service = service;
+			UserData = userData;
+			Options = options;
 			Timeout = timeout;
 		}
 
@@ -70,14 +70,14 @@ namespace System.Data.Sql {
 
 		#region Properties
 
-		public string Id {
-			get { return id; }
-			set { id = value; }
+		public string UserData {
+			get { return userData; }
+			set { userData = value; }
 		}
 
-		public string Service {
-			get { return service; }
-			set { service = value; }
+		public string Options {
+			get { return options; }
+			set { options = value; }
 		}
 
 		public int Timeout {