Просмотр исходного кода

2007-07-22 Nagappan A <[email protected]>

	* OleDbDataReader.cs: Fixed compilation warning.

	* OleDbParameterCollection.cs: Fixed compilation warning.

	* OleDbTransaction.cs: Fixed compilation warning.

	* OleDbCommandBuilder.cs: Fixed compilation warning.


svn path=/trunk/mcs/; revision=82425
Nagappan Alagappan 18 лет назад
Родитель
Сommit
9bb7daaf32

+ 10 - 0
mcs/class/System.Data/System.Data.OleDb/ChangeLog

@@ -1,3 +1,13 @@
+2007-07-22  Nagappan A  <[email protected]>
+
+	* OleDbDataReader.cs: Fixed compilation warning.
+
+	* OleDbParameterCollection.cs: Fixed compilation warning.
+
+	* OleDbTransaction.cs: Fixed compilation warning.
+
+	* OleDbCommandBuilder.cs: Fixed compilation warning.
+
 2007-07-02  Gert Driesen  <[email protected]>
 
 	* OleDbConnection.cs: Derive from DbConnection on 2.0 profile, and

+ 7 - 7
mcs/class/System.Data/System.Data.OleDb/OleDbCommandBuilder.cs

@@ -82,7 +82,7 @@ namespace System.Data.OleDb
 		[DataSysDescriptionAttribute ("The DataAdapter for which to automatically generate OleDbCommands")]
 #endif
 		[DefaultValue (null)]
-		public OleDbDataAdapter DataAdapter {
+		public new OleDbDataAdapter DataAdapter {
 			get {
 				return adapter;
 			}
@@ -143,28 +143,28 @@ namespace System.Data.OleDb
 #endif
 
 		[MonoTODO]
-		public OleDbCommand GetDeleteCommand ()
+		public new OleDbCommand GetDeleteCommand ()
 		{
 			throw new NotImplementedException ();
 		}
 
 #if NET_2_0
 		[MonoTODO]
-		public OleDbCommand GetDeleteCommand (bool useColumnsForParameterNames)
+		public new OleDbCommand GetDeleteCommand (bool useColumnsForParameterNames)
 		{
 			throw new NotImplementedException ();
 		}
 #endif
 
 		[MonoTODO]
-		public OleDbCommand GetInsertCommand ()
+		public new OleDbCommand GetInsertCommand ()
 		{
 			throw new NotImplementedException ();
 		}
 
 #if NET_2_0
 		[MonoTODO]
-		public OleDbCommand GetInsertCommand (bool useColumnsForParameterNames)
+		public new OleDbCommand GetInsertCommand (bool useColumnsForParameterNames)
 		{
 			throw new NotImplementedException ();
 		}
@@ -188,14 +188,14 @@ namespace System.Data.OleDb
 #endif
 
 		[MonoTODO]
-		public OleDbCommand GetUpdateCommand ()
+		public new OleDbCommand GetUpdateCommand ()
 		{
 			throw new NotImplementedException ();
 		}
 
 #if NET_2_0
 		[MonoTODO]
-		public OleDbCommand GetUpdateCommand (bool useColumnsForParameterNames)
+		public new OleDbCommand GetUpdateCommand (bool useColumnsForParameterNames)
 		{
 			throw new NotImplementedException ();
 		}

+ 9 - 5
mcs/class/System.Data/System.Data.OleDb/OleDbConnection.cs

@@ -78,11 +78,15 @@ namespace System.Data.OleDb
 		
 		[DataCategory ("Data")]
 		[DefaultValue ("")]
-#if !NET_2_0
+#if NET_1_0 || ONLY_1_1
 		[DataSysDescriptionAttribute ("Information used to connect to a Data Source.")]
 #endif
 		[EditorAttribute ("Microsoft.VSDesigner.Data.ADO.Design.OleDbConnectionStringEditor, "+ Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+ Consts.AssemblySystem_Drawing )]
-		[RecommendedAsConfigurableAttribute (true)]
+#if NET_2_0
+		[SettingsBindableAttribute (true)]
+#else
+		[RecommendedAsConfigurable (true)]
+#endif
 		[RefreshPropertiesAttribute (RefreshProperties.All)]
 		public
 #if NET_2_0
@@ -218,7 +222,7 @@ namespace System.Data.OleDb
 	
 		#region Methods
 	
-		public OleDbTransaction BeginTransaction ()
+		public new OleDbTransaction BeginTransaction ()
 		{
 			if (gdaConnection != IntPtr.Zero)
 				return new OleDbTransaction (this);
@@ -226,7 +230,7 @@ namespace System.Data.OleDb
 			return null;
 		}
 
-		public OleDbTransaction BeginTransaction (IsolationLevel level)
+		public new OleDbTransaction BeginTransaction (IsolationLevel level)
 		{
 			if (gdaConnection != IntPtr.Zero)
 				return new OleDbTransaction (this, level);
@@ -288,7 +292,7 @@ namespace System.Data.OleDb
 			}
 		}
 
-		public OleDbCommand CreateCommand ()
+		public new OleDbCommand CreateCommand ()
 		{
 			if (State == ConnectionState.Open)
 				return new OleDbCommand (null, this);

+ 2 - 2
mcs/class/System.Data/System.Data.OleDb/OleDbDataReader.cs

@@ -291,7 +291,7 @@ namespace System.Data.OleDb
 #if NET_2_0
 		[EditorBrowsable (EditorBrowsableState.Advanced)]
 #endif
-		public OleDbDataReader GetData (int ordinal)
+		public new OleDbDataReader GetData (int ordinal)
 		{
 			throw new NotImplementedException ();
 		}
@@ -832,7 +832,7 @@ namespace System.Data.OleDb
 
 		#region Destructors
 
-		private void Dispose (bool disposing)
+		private new void Dispose (bool disposing)
 		{
 			if (!this.disposed) {
 				if (disposing) {

+ 2 - 2
mcs/class/System.Data/System.Data.OleDb/OleDbParameterCollection.cs

@@ -80,14 +80,14 @@ namespace System.Data.OleDb
 		
 		[Browsable (false)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-		public OleDbParameter this[int index] {
+		public new OleDbParameter this[int index] {
 			get { return (OleDbParameter) list[index]; }
 			set { list[index] = value; }
 		}
 
 		[Browsable (false)]
 		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]
-		public OleDbParameter this[string parameterName] {
+		public new OleDbParameter this[string parameterName] {
 			get {
 				foreach (OleDbParameter p in list)
 					if (p.ParameterName.Equals (parameterName))

+ 1 - 1
mcs/class/System.Data/System.Data.OleDb/OleDbTransaction.cs

@@ -97,7 +97,7 @@ namespace System.Data.OleDb
 
 		#region Properties
 
-		public OleDbConnection Connection {
+		public new OleDbConnection Connection {
 			get {
 				return connection;
 			}