From: Gert Driesen <drieseng@users.sourceforge.net>
Date: Sun, 16 Oct 2005 08:49:57 +0000 (-0000)
Subject: * OracleException.cs: Pass message to base ctor, thereby avoiding
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;ds=sidebyside;h=6c0159f843d338965f92c7fbc92045594e963955;p=mono.git

* OracleException.cs: Pass message to base ctor, thereby avoiding
need to override Message property (and fixing API mismatch). Fixed
serialization by also adding code to si.
* OracleCommandBuilder.cs: Removed usage of DataSysDescription to
fix API mismatches.

svn path=/trunk/mcs/; revision=51762
---

diff --git a/mcs/class/System.Data.OracleClient/ChangeLog b/mcs/class/System.Data.OracleClient/ChangeLog
index a5fd5f27496..c173ae77851 100644
--- a/mcs/class/System.Data.OracleClient/ChangeLog
+++ b/mcs/class/System.Data.OracleClient/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-16  Gert Driesen <drieseng@users.sourceforge.net>
+
+	* OracleException.cs: Pass message to base ctor, thereby avoiding
+	need to override Message property (and fixing API mismatch). Fixed
+	serialization by also adding code to si.
+	* OracleCommandBuilder.cs: Removed usage of DataSysDescription to
+	fix API mismatches.
+
 2005-08-10  Daniel Morgan <danielmorgan@verizon.net>
 
 	* System.Data.OracleClient/OracleCommandBuilder.cs: update 
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommandBuilder.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommandBuilder.cs
index 6f6348d4086..8d70e807844 100644
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommandBuilder.cs
+++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleCommandBuilder.cs
@@ -85,7 +85,7 @@ namespace System.Data.OracleClient {
 
 		#region Properties
 
-		[DataSysDescription ("The DataAdapter for which to automatically generate OracleCommands")]
+		//[DataSysDescription ("The DataAdapter for which to automatically generate OracleCommands")]
 		[DefaultValue (null)]
 		public new OracleDataAdapter DataAdapter {
 			get { return adapter; }
@@ -105,7 +105,7 @@ namespace System.Data.OracleClient {
 		}
 
 		[Browsable (false)]
-		[DataSysDescription ("The character used in a text command as the opening quote for quoting identifiers that contain special characters.")]
+		//[DataSysDescription ("The character used in a text command as the opening quote for quoting identifiers that contain special characters.")]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public 
 #if NET_2_0
@@ -121,7 +121,7 @@ namespace System.Data.OracleClient {
 		}
 
 		[Browsable (false)]
-		[DataSysDescription ("The character used in a text command as the closing quote for quoting identifiers that contain special characters.")]
+		//[DataSysDescription ("The character used in a text command as the closing quote for quoting identifiers that contain special characters.")]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
 		public 
 #if NET_2_0
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleException.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleException.cs
index 3571948baf2..683151c85b2 100644
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleException.cs
+++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleException.cs
@@ -25,23 +25,20 @@ namespace System.Data.OracleClient {
 	{
 		#region Fields
 
-		int code;
-		string message;
+		private int code;
 
 		#endregion // Fields
 
 		#region Constructors
 
-		internal OracleException (int code, string message)
+		internal OracleException (int code, string message) : base (message)
 		{
 			this.code = code;
-			this.message = message;
 		}
 
 		private OracleException (SerializationInfo si, StreamingContext sc) : base(si, sc)
 		{
-			message = si.GetString ("message");
-			code = si.GetInt32 ("source");
+			code = si.GetInt32 ("code");
 		}
 
 		#endregion // Constructors
@@ -52,10 +49,16 @@ namespace System.Data.OracleClient {
 			get { return code; }
 		}
 
-		public override string Message {
-			get { return message; }
+		#endregion // Properties
+
+		#region Override implementation of Exception
+
+		public override void GetObjectData (SerializationInfo si, StreamingContext context)
+		{
+			si.AddValue ("code", code, typeof(int));
+			base.GetObjectData (si, context);
 		}
 
-		#endregion // Properties
+		#endregion Override implementation of Exception
 	}
 }
diff --git a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleParameterCollection.cs b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleParameterCollection.cs
index aaaeeb53527..0d31af7dd9d 100644
--- a/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleParameterCollection.cs
+++ b/mcs/class/System.Data.OracleClient/System.Data.OracleClient/OracleParameterCollection.cs
@@ -25,7 +25,7 @@ using System.Reflection;
 
 namespace System.Data.OracleClient {
 	[ListBindable (false)]
-	[Editor ("Microsoft.VSDesigner.Data.Oracle.Design.DBParametersEditor, " + Consts.AssemblyMicrosoft_VSDesigner, typeof(UITypeEditor))]
+	[Editor ("Microsoft.VSDesigner.Data.Design.DBParametersEditor, " + Consts.AssemblyMicrosoft_VSDesigner, typeof(UITypeEditor))]
 	public sealed class OracleParameterCollection : MarshalByRefObject, IDataParameterCollection, IList, ICollection, IEnumerable
 	{
 		#region Fields