Jelajahi Sumber

* SqlConnection.cs: Removed extra destructor, as destructor on
System.ComponentModel.Component already calls Dispose.
* SqlParameter.cs: Removed explicit interface implementation of
IDataParameter.ParameterName.
* OdbcErrorCollection.cs: Removed explicit interface implementation
of IEnumerable.GetEnumerator ().
* OdbcCommand.cs: Removed destructor as the destructor in
System.ComponentModel.Component already calls the Dispose method.
Removed explicit interface implemenation of members that are
implement by public members.
* OdbcDataReader.cs: Removed explicit interface implemenation of
IDataRecord.GetData.
* OleDbErrorCollection.cs: Removed explicit interface implementation
of IEnumerable.GetEnumerator ().
* OleDbParameterCollection.cs: Removed explicit interface
implementation members that are already implementation by public
members.
* DataTable.cs: Renamed initInProgress to fInitInProgress. BeginInit
and EndInit must only be virtual in 2.0 profile. Set eol-style to CRLF.

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

Gert Driesen 19 tahun lalu
induk
melakukan
0a3f08261d

+ 11 - 0
mcs/class/System.Data/System.Data.Odbc/ChangeLog

@@ -1,3 +1,14 @@
+2006-05-31  Gert Driesen  <[email protected]>
+
+	* OdbcErrorCollection.cs: Removed explicit interface implementation 
+	of IEnumerable.GetEnumerator ().
+	* OdbcCommand.cs: Removed destructor as the destructor in
+	System.ComponentModel.Component already calls the Dispose method.
+	Removed explicit interface implemenation of members that are 
+	implement by public members.
+	* OdbcDataReader.cs: Removed explicit interface implemenation of
+	IDataRecord.GetData.
+
 2006-05-24  Senganal T <[email protected]>
        
 	* OdbcColumn.cs :

+ 0 - 5
mcs/class/System.Data/System.Data.Odbc/OdbcCommand.cs

@@ -378,11 +378,6 @@ namespace System.Data.Odbc
 			disposed = true;
 		}
 
-		~OdbcCommand ()
-		{
-			Dispose (false);
-		}
-
 		private IntPtr ReAllocStatment ()
 		{
 			OdbcReturn ret;

+ 0 - 6
mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs

@@ -833,12 +833,6 @@ namespace System.Data.Odbc
 
 #if ONLY_1_1
 
-                [MonoTODO]
-		IDataReader IDataRecord.GetData (int ordinal)
-		{
-			throw new NotImplementedException ();
-		}
-
 		void IDisposable.Dispose ()
 		{
 			Dispose (true);

+ 0 - 5
mcs/class/System.Data/System.Data.Odbc/OdbcErrorCollection.cs

@@ -117,11 +117,6 @@ namespace System.Data.Odbc
 			return _items.GetEnumerator ();
 		}
 
-		IEnumerator IEnumerable.GetEnumerator ()
-		{
-			return GetEnumerator ();
-		}
-
 		#endregion // Methods
 	}
 }

+ 0 - 78
mcs/class/System.Data/System.Data.Odbc/OdbcParameterCollection.cs

@@ -127,10 +127,6 @@ namespace System.Data.Odbc
 
 
 #if ONLY_1_1
-		int ICollection.Count {
-			get { return list.Count; }
-		}
-
 		bool IList.IsFixedSize {
 			get { return false; }
 		}
@@ -226,81 +222,7 @@ namespace System.Data.Odbc
 				
 			}
 		}
-#if ONLY_1_1
-		int IList.Add (object value)
-		{
-			if (!(value is IDataParameter))
-				throw new InvalidCastException ();
-
-
-			list.Add (value);
-			return list.IndexOf (value);
-		}
-
-		void IList.Clear ()
-		{
-			list.Clear ();
-		}
-
-		bool IList.Contains (object value)
-		{
-			return list.Contains (value);
-		}
-
-		bool IDataParameterCollection.Contains (string value)
-		{
-			for (int i = 0; i < list.Count; i++) {
-				IDataParameter parameter;
-
-				parameter = (IDataParameter) list[i];
-				if (parameter.ParameterName == value)
-					return true;
-			}
-
-			return false;
-		}
-
-		void ICollection.CopyTo (Array array, int index)
-		{
-			((OdbcParameter[])(list.ToArray ())).CopyTo (array, index);
-		}
 
-		IEnumerator IEnumerable.GetEnumerator ()
-		{
-			return list.GetEnumerator ();
-		}
-		
-		int IList.IndexOf (object value)
-		{
-			return list.IndexOf (value);
-		}
-
-		int IDataParameterCollection.IndexOf (string name)
-		{
-			return list.IndexOf (((IDataParameterCollection) this)[name]);
-		}
-
-		void IList.Insert (int index, object value)
-	        {
-			list.Insert (index, value);
-		}
-
-		void IList.Remove (object value)
-		{
-			list.Remove (value);
-		}
-
-		void IList.RemoveAt (int index)
-		{
-			list.Remove ((object) list[index]);
-		}
-
-		void IDataParameterCollection.RemoveAt (string name)
-		{
-			list.Remove (((IDataParameterCollection) this)[name]);
-		}
-#endif // ONLY_1_1
-		
 #if ONLY_1_1
 		public void Clear()
                 {

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

@@ -1,3 +1,11 @@
+2006-05-31  Gert Driesen  <[email protected]>
+
+	* OleDbErrorCollection.cs: Removed explicit interface implementation
+	of IEnumerable.GetEnumerator ().
+	* OleDbParameterCollection.cs: Removed explicit interface 
+	implementation members that are already implementation by public
+	members.
+
 2006-02-17  Chris Toshok  <[email protected]>
 
 	* OleDbDataAdapter.cs, OleDbCommand.cs, OleDbParameter.cs,

+ 0 - 5
mcs/class/System.Data/System.Data.OleDb/OleDbErrorCollection.cs

@@ -113,11 +113,6 @@ namespace System.Data.OleDb
 			return items.GetEnumerator ();
 		}
 
-		IEnumerator IEnumerable.GetEnumerator ()
-		{
-			return GetEnumerator ();
-		}
-
 		#endregion // Methods
 	}
 }

+ 0 - 76
mcs/class/System.Data/System.Data.OleDb/OleDbParameterCollection.cs

@@ -89,10 +89,6 @@ namespace System.Data.OleDb
                         }                                                                                           
 		}
 
-		int ICollection.Count {
-			get { return list.Count; }
-		}
-
 		bool IList.IsFixedSize {
 			get { return false; }
 		}
@@ -180,78 +176,6 @@ namespace System.Data.OleDb
 			return Add (new OleDbParameter (name, type, width, src_col));
 		}
 
-		int IList.Add (object value)
-		{
-			if (!(value is IDataParameter))
-				throw new InvalidCastException ();
-
-			list.Add (value);
-			return list.IndexOf (value);
-		}
-
-		void IList.Clear ()
-		{
-			list.Clear ();
-		}
-
-		bool IList.Contains (object value)
-		{
-			return list.Contains (value);
-		}
-
-		bool IDataParameterCollection.Contains (string value)
-		{
-			for (int i = 0; i < list.Count; i++) {
-				IDataParameter parameter;
-
-				parameter = (IDataParameter) list[i];
-				if (parameter.ParameterName == value)
-					return true;
-			}
-
-			return false;
-		}
-
-		void ICollection.CopyTo (Array array, int index)
-		{
-			((OleDbParameter[])(list.ToArray ())).CopyTo (array, index);
-		}
-
-		IEnumerator IEnumerable.GetEnumerator ()
-		{
-			return list.GetEnumerator ();
-		}
-		
-		int IList.IndexOf (object value)
-		{
-			return list.IndexOf (value);
-		}
-
-		int IDataParameterCollection.IndexOf (string name)
-		{
-			return list.IndexOf (((IDataParameterCollection) this)[name]);
-		}
-
-		void IList.Insert (int index, object value)
-	        {
-			list.Insert (index, value);
-		}
-
-		void IList.Remove (object value)
-		{
-			list.Remove (value);
-		}
-
-		void IList.RemoveAt (int index)
-		{
-			list.Remove ((object) list[index]);
-		}
-
-		void IDataParameterCollection.RemoveAt (string name)
-		{
-			list.Remove (((IDataParameterCollection) this)[name]);
-		}
-	
 		public void Clear() {
                        
 			foreach (OleDbParameter p in list)

+ 7 - 0
mcs/class/System.Data/System.Data.SqlClient/ChangeLog

@@ -1,3 +1,10 @@
+2006-05-31  Gert Driesen  <[email protected]>
+
+	* SqlConnection.cs: Removed extra destructor, as destructor on 
+	System.ComponentModel.Component already calls Dispose.
+	* SqlParameter.cs: Removed explicit interface implementation of
+	IDataParameter.ParameterName.
+
 2006-05-26  Senganal T  <[email protected]>
 
 	* SqlParameter.cs :

+ 0 - 5
mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs

@@ -488,11 +488,6 @@ namespace System.Data.SqlClient {
 			GC.SuppressFinalize (this);
 		}
 
-		~SqlConnection ()
-		{
-			Dispose (false);
-		}
-
 		public 
 #if NET_2_0
 		override

+ 0 - 5
mcs/class/System.Data/System.Data.SqlClient/SqlParameter.cs

@@ -234,11 +234,6 @@ namespace System.Data.SqlClient {
 			get { return metaParameter; }
 		}
 
-		string IDataParameter.ParameterName {
-			get { return metaParameter.ParameterName; }
-			set { metaParameter.ParameterName = value; }
-		}
-
 #if ONLY_1_0 || ONLY_1_1
 		[Browsable (false)]
 		[DataSysDescription ("a design-time property used for strongly typed code-generation.")]

+ 5 - 0
mcs/class/System.Data/System.Data/ChangeLog

@@ -1,3 +1,8 @@
+2006-05-31  Gert Driesen  <[email protected]>
+
+	* DataTable.cs: Renamed initInProgress to fInitInProgress. BeginInit
+	and EndInit must only be virtual in 2.0 profile. Set eol-style to CRLF.
+
 2006-05-31  Senganal T  <[email protected]>
 
 	* XmlDataInferenceLoader.cs :

+ 13 - 5
mcs/class/System.Data/System.Data/DataTable.cs

@@ -96,7 +96,7 @@ namespace System.Data {
 		private ArrayList _indexes;
 		private RecordCache _recordCache;
 		private int _defaultValuesRowIndex = -1;
-		protected internal bool initInProgress;
+		protected internal bool fInitInProgress;
 
 		// If CaseSensitive property is changed once it does not anymore follow owner DataSet's 
 		// CaseSensitive property. So when you lost you virginity it's gone for ever
@@ -728,7 +728,11 @@ namespace System.Data {
 		/// on a form or used by another component. The initialization
 		/// occurs at runtime.
 		/// </summary>
-		public virtual void BeginInit () 
+		public 
+#if NET_2_0
+		virtual
+#endif
+		void BeginInit () 
 		{
 			InitInProgress = true;
 		}
@@ -925,15 +929,19 @@ namespace System.Data {
 		/// initialization occurs at runtime.
 		/// </summary>
 		[MonoTODO]
-		public virtual void EndInit () 
+		public
+#if NET_2_0
+		virtual
+#endif
+		void EndInit () 
 		{
 			InitInProgress = false;
 			FinishInit ();
 		}
 
 		internal bool InitInProgress {
-			get { return initInProgress; }
-			set { initInProgress = value; }
+			get { return fInitInProgress; }
+			set { fInitInProgress = value; }
 		}
 
 		internal void FinishInit ()