* OdbcParameterTest.cs: Fixed compilation on 1.0 profile.

[mono.git] / mcs / class / System.Data / System.Data.Common / DbTransaction.cs

diff --git a/mcs/class/System.Data/System.Data.Common/DbTransaction.cs b/mcs/class/System.Data/System.Data.Common/DbTransaction.cs
index 7dc0155fa5cada210ab6d24ae88b5ef9ba9f70b6..ecd803de560ba9e6dbcc2ac8e05b92c7ce8641eb 100644 (file)
--- a/mcs/class/System.Data/System.Data.Common/DbTransaction.cs
+++ b/mcs/class/System.Data/System.Data.Common/DbTransaction.cs
@@ -1,4 +1,4 @@
-//
+
 // System.Data.Common.DbTransaction.cs
 //
 // Author:
@@ -6,15 +6,36 @@
 //
 // Copyright (C) Tim Coleman, 2003
 //
+// 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.
+//
 
-#if NET_1_2
+#if NET_2_0 || TARGET_JVM
 
-namespace System.Data.Common {
+namespace System.Data.Common
+{
        public abstract class DbTransaction : MarshalByRefObject, IDbTransaction, IDisposable
        {
                #region Constructors
 
-               [MonoTODO]
                protected DbTransaction ()
                {
                }
@@ -27,24 +48,37 @@ namespace System.Data.Common {
                        get { return DbConnection; }
                }
 
-               protected abstract DbConnection DbConnection { get; }
+               protected abstract DbConnection DbConnection {
+                       get;
+               }
 
                IDbConnection IDbTransaction.Connection {
                        get { return (IDbConnection) Connection; }
                }
 
-               public abstract IsolationLevel IsolationLevel { get; }
+               public abstract IsolationLevel IsolationLevel {
+                       get;
+               }
 
                #endregion // Properties
 
                #region Methods
 
                public abstract void Commit ();
-               public abstract void Dispose ();
+
                public abstract void Rollback ();
 
+               public void Dispose ()
+               {
+                       Dispose (true);
+               }
+
+               protected virtual void Dispose (bool disposing)
+               {
+               }
+
                #endregion // Methods
        }
 }
 
-#endif // NET_1_2
+#endif