2004-03-10 Umadevi S (sumadevi@novell.com)

[mono.git] / mcs / class / System.Data / System.Data / MergeFailedEventArgs.cs

diff --git a/mcs/class/System.Data/System.Data/MergeFailedEventArgs.cs b/mcs/class/System.Data/System.Data/MergeFailedEventArgs.cs
index 09ac5bcf5aa09e8121ef7e9b228d7e1b7b42cc40..e34f1da6a350131c99e8ff87bdcb266227a3d14e 100644 (file)
--- a/mcs/class/System.Data/System.Data/MergeFailedEventArgs.cs
+++ b/mcs/class/System.Data/System.Data/MergeFailedEventArgs.cs
@@ -3,36 +3,44 @@
 //
 // Author:
 //   Miguel de Icaza <miguel@ximian.com>
+//   Tim Coleman (tim@timcoleman.com)
 //
 // (C) Ximian, Inc 2002
+// Copyright (C) Tim Coleman, 2002
 //
 
 using System;
 
-namespace System.Data
-{
-       public class MergeFailedEventArgs : EventArgs {
+namespace System.Data {
+       public class MergeFailedEventArgs : EventArgs 
+       {
+               #region Fields
+
                DataTable data_table;
                string conflict;
-               Exception errors;
-               bool f_continue;
 
-               public FillErrorEventArgs (DataTable dataTable, string conflict)
+               #endregion // Fields
+
+               #region Constructors
+
+               public MergeFailedEventArgs (DataTable dataTable, string conflict)
                {
                        this.data_table = dataTable;
                        this.conflict = conflict;
                }
 
-               public DataTable DataTable {
-                       get {
-                               return data_table;
-                       }
+               #endregion // Constructors
+
+               #region Properties
+
+               public DataTable Table {
+                       get { return data_table; }
                }
 
                public string Conflict {
-                       get {
-                               return conflict;
-                       }
+                       get { return conflict; }
                }
+
+               #endregion // Properties
        }
 }