2002-05-01 Rodrigo Moya <[email protected]>

	* System.Data.SqlClient/SqlClientPermission.cs: added missing
	'using's.

	* System.Data/MergeFailedEventArgs.cs: new class, contributed
	by John Dugaw <[email protected]>.

	* System.Data.build: excluded new files from build.

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

mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlClientPermission.cs

@@ -11,6 +11,7 @@
 using System;
 using System.Data;
 using System.Data.Common;
+using System.Security.Permissions;
 
 namespace System.Data.SqlClient {
 

mcs/class/Mono.Data.PostgreSqlClient/PgSqlClientPermission.cs

@@ -11,6 +11,7 @@
 using System;
 using System.Data;
 using System.Data.Common;
+using System.Security.Permissions;
 
 namespace System.Data.SqlClient {
 

mcs/class/System.Data/ChangeLog

@@ -1,3 +1,13 @@
+2002-05-01  Rodrigo Moya <[email protected]>
+
+	* System.Data.SqlClient/SqlClientPermission.cs: added missing
+	'using's.
+
+	* System.Data/MergeFailedEventArgs.cs: new class, contributed
+	by John Dugaw <[email protected]>.
+
+	* System.Data.build: excluded new files from build.
+
 2002-04-29  Daniel Morgan <[email protected]>
 
 	* Test/ReadPostgresData.cs: added - Uses the 

mcs/class/System.Data/System.Data.SqlClient/SqlClientPermission.cs

@@ -11,6 +11,7 @@
 using System;
 using System.Data;
 using System.Data.Common;
+using System.Security.Permissions;
 
 namespace System.Data.SqlClient {
 

mcs/class/System.Data/System.Data.build

@@ -29,6 +29,7 @@
 				<excludes name="System.Data/DataViewManager.cs"/>
 				<excludes name="System.Data/DataViewSetting.cs"/>
 				<excludes name="System.Data/DataSet.cs"/>
+				<excludes name="System.Data/MergeFailedEventArgs.cs"/>
 				<excludes name="Test/**"/>
 				<excludes name="System.Data.Common/*"/>
 				<excludes name="System.Data.SqlClient/SqlDataAdapter.cs"/>

mcs/class/System.Data/System.Data/MergeFailedEventArgs.cs

@@ -0,0 +1,90 @@
+//
+// System.Data.MergeFailedEventArgs.cs
+//
+// Authors:
+//   John Dugaw <[email protected]>
+//   Rodrigo Moya <[email protected]>
+//
+// (C) John Dugaw
+//
+
+using System;
+using System.Data;
+
+namespace System.Data
+{
+	public class MergeFailedEventArgs : EventArgs
+	{
+		private DataTable table;
+		private string conflict;
+
+		public MergeFailedEventArgs ( DataTable newTable, string newConflict) {
+			table = newTable;
+			conflict = newConflict;
+		}
+
+		public string Conflict {
+			get {
+				return conflict;
+			}
+			/* TODO
+			 * set included as some versions of mcs fail without them 
+			 * must be removed before going live
+			 */
+			set {
+				System.Console.WriteLine("ERROR: <instance> System.Data.MerFailedEventArgs.Conflict is a read only property!\n");
+			}
+
+		}
+		
+		public DataTable Table {
+			get {
+				return table;
+			}
+			/* TODO
+			 * set included as some versions of mcs fail without them 
+			 *    should be removed
+			 */
+			set {
+				System.Console.WriteLine("ERROR: <instance> System.Data.MergeFailedEventArgs.Table is a read only property!\n");
+			}
+		}
+
+		[Serializable]
+		[ClassInterface(ClassInterfaceType.AutoDual)]
+		public override bool Equals (MergeFailedEventsArgs eq) {
+			throw new NotImplementedException ();
+		}
+
+		[Serializable]
+		[ClassInterface(ClassInterfaceType.AutoDual)]
+		public static override bool Equals(MergeFailedEventArgs a, MergeFailedEventArgs b) {
+			throw new NotImplementedException ();
+		}
+
+		/* TODO
+		 * These can be uncommented and should be implemented or removed
+		 * before production.
+		 [Serializable]
+		 [ClassInterface(ClassInterfaceType.AutoDual)]
+		 public override int GetHashCode() {
+		 System.Console.WriteLine("<instance> System.Data.MergeFailedEventArgs.GetHashCode() called");
+		 }
+
+		 [Serializable]
+		 [ClassInterface(ClassInterfaceType.AutoDual)]
+		 public override Type GetType()
+		 {
+		 System.Console.WriteLine("<instance> System.Data.MergeFailedEventArgs.GetType() called");
+		 }
+		*/
+
+		public override string ToString() {
+			throw new NotImplementedException ();
+		}
+
+		protected object MemberwiseClone() {
+			throw new NotImplementedException ();
+		}
+   }
+} // end namespace declaration