[prev in list] [next in list] [prev in thread] [next in thread]
List: mono-patches
Subject: [Mono-patches] r61328 - in trunk/mcs/class/System.Data: System.Data
From: "Gert Driesen (gert.driesen () pandora ! be)"
Date: 2006-05-31 13:55:23
Message-ID: 20060531135523.AA5D29472C () mono-cvs ! ximian ! com
[Download RAW message or body]
Author: gert
Date: 2006-05-31 09:55:23 -0400 (Wed, 31 May 2006)
New Revision: 61328
Modified:
trunk/mcs/class/System.Data/System.Data.Odbc/ChangeLog
trunk/mcs/class/System.Data/System.Data.Odbc/OdbcCommand.cs
trunk/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
trunk/mcs/class/System.Data/System.Data.Odbc/OdbcErrorCollection.cs
trunk/mcs/class/System.Data/System.Data.Odbc/OdbcParameterCollection.cs
trunk/mcs/class/System.Data/System.Data.OleDb/ChangeLog
trunk/mcs/class/System.Data/System.Data.OleDb/OleDbErrorCollection.cs
trunk/mcs/class/System.Data/System.Data.OleDb/OleDbParameterCollection.cs
trunk/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
trunk/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs
trunk/mcs/class/System.Data/System.Data.SqlClient/SqlParameter.cs
trunk/mcs/class/System.Data/System.Data/ChangeLog
trunk/mcs/class/System.Data/System.Data/DataTable.cs
Log:
* 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.
Modified: trunk/mcs/class/System.Data/System.Data/ChangeLog
===================================================================
--- trunk/mcs/class/System.Data/System.Data/ChangeLog 2006-05-31 13:54:56 UTC (rev \
61327)
+++ trunk/mcs/class/System.Data/System.Data/ChangeLog 2006-05-31 13:55:23 UTC (rev \
61328) @@ -1,3 +1,8 @@
+2006-05-31 Gert Driesen <drieseng@users.sourceforge.net>
+
+ * 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 <tsenganal@novell.com>
* XmlDataInferenceLoader.cs :
Modified: trunk/mcs/class/System.Data/System.Data/DataTable.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data/DataTable.cs 2006-05-31 13:54:56 UTC (rev \
61327)
+++ trunk/mcs/class/System.Data/System.Data/DataTable.cs 2006-05-31 13:55:23 UTC (rev \
61328) @@ -96,7 +96,7 @@
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 @@
/// 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 @@
/// 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 ()
Property changes on: trunk/mcs/class/System.Data/System.Data/DataTable.cs
___________________________________________________________________
Name: svn:eol-style
+ CRLF
Modified: trunk/mcs/class/System.Data/System.Data.Odbc/ChangeLog
===================================================================
--- trunk/mcs/class/System.Data/System.Data.Odbc/ChangeLog 2006-05-31 13:54:56 UTC \
(rev 61327)
+++ trunk/mcs/class/System.Data/System.Data.Odbc/ChangeLog 2006-05-31 13:55:23 UTC \
(rev 61328) @@ -1,3 +1,14 @@
+2006-05-31 Gert Driesen <drieseng@users.sourceforge.net>
+
+ * 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 <tsenganal@novell.com>
* OdbcColumn.cs :
Modified: trunk/mcs/class/System.Data/System.Data.Odbc/OdbcCommand.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.Odbc/OdbcCommand.cs 2006-05-31 13:54:56 \
UTC (rev 61327)
+++ trunk/mcs/class/System.Data/System.Data.Odbc/OdbcCommand.cs 2006-05-31 13:55:23 \
UTC (rev 61328) @@ -378,11 +378,6 @@
disposed = true;
}
- ~OdbcCommand ()
- {
- Dispose (false);
- }
-
private IntPtr ReAllocStatment ()
{
OdbcReturn ret;
Modified: trunk/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs 2006-05-31 \
13:54:56 UTC (rev 61327)
+++ trunk/mcs/class/System.Data/System.Data.Odbc/OdbcDataReader.cs 2006-05-31 \
13:55:23 UTC (rev 61328) @@ -833,12 +833,6 @@
#if ONLY_1_1
- [MonoTODO]
- IDataReader IDataRecord.GetData (int ordinal)
- {
- throw new NotImplementedException ();
- }
-
void IDisposable.Dispose ()
{
Dispose (true);
Modified: trunk/mcs/class/System.Data/System.Data.Odbc/OdbcErrorCollection.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.Odbc/OdbcErrorCollection.cs 2006-05-31 \
13:54:56 UTC (rev 61327)
+++ trunk/mcs/class/System.Data/System.Data.Odbc/OdbcErrorCollection.cs 2006-05-31 \
13:55:23 UTC (rev 61328) @@ -117,11 +117,6 @@
return _items.GetEnumerator ();
}
- IEnumerator IEnumerable.GetEnumerator ()
- {
- return GetEnumerator ();
- }
-
#endregion // Methods
}
}
Modified: trunk/mcs/class/System.Data/System.Data.Odbc/OdbcParameterCollection.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.Odbc/OdbcParameterCollection.cs 2006-05-31 \
13:54:56 UTC (rev 61327)
+++ trunk/mcs/class/System.Data/System.Data.Odbc/OdbcParameterCollection.cs 2006-05-31 \
13:55:23 UTC (rev 61328) @@ -127,10 +127,6 @@
#if ONLY_1_1
- int ICollection.Count {
- get { return list.Count; }
- }
-
bool IList.IsFixedSize {
get { return false; }
}
@@ -226,81 +222,7 @@
}
}
-#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()
{
Modified: trunk/mcs/class/System.Data/System.Data.OleDb/ChangeLog
===================================================================
--- trunk/mcs/class/System.Data/System.Data.OleDb/ChangeLog 2006-05-31 13:54:56 UTC \
(rev 61327)
+++ trunk/mcs/class/System.Data/System.Data.OleDb/ChangeLog 2006-05-31 13:55:23 UTC \
(rev 61328) @@ -1,3 +1,11 @@
+2006-05-31 Gert Driesen <drieseng@users.sourceforge.net>
+
+ * 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 <toshok@ximian.com>
* OleDbDataAdapter.cs, OleDbCommand.cs, OleDbParameter.cs,
Modified: trunk/mcs/class/System.Data/System.Data.OleDb/OleDbErrorCollection.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.OleDb/OleDbErrorCollection.cs 2006-05-31 \
13:54:56 UTC (rev 61327)
+++ trunk/mcs/class/System.Data/System.Data.OleDb/OleDbErrorCollection.cs 2006-05-31 \
13:55:23 UTC (rev 61328) @@ -113,11 +113,6 @@
return items.GetEnumerator ();
}
- IEnumerator IEnumerable.GetEnumerator ()
- {
- return GetEnumerator ();
- }
-
#endregion // Methods
}
}
Modified: trunk/mcs/class/System.Data/System.Data.OleDb/OleDbParameterCollection.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.OleDb/OleDbParameterCollection.cs 2006-05-31 \
13:54:56 UTC (rev 61327)
+++ trunk/mcs/class/System.Data/System.Data.OleDb/OleDbParameterCollection.cs 2006-05-31 \
13:55:23 UTC (rev 61328) @@ -89,10 +89,6 @@
} \
}
- int ICollection.Count {
- get { return list.Count; }
- }
-
bool IList.IsFixedSize {
get { return false; }
}
@@ -180,78 +176,6 @@
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)
Modified: trunk/mcs/class/System.Data/System.Data.SqlClient/ChangeLog
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlClient/ChangeLog 2006-05-31 13:54:56 \
UTC (rev 61327)
+++ trunk/mcs/class/System.Data/System.Data.SqlClient/ChangeLog 2006-05-31 13:55:23 \
UTC (rev 61328) @@ -1,3 +1,10 @@
+2006-05-31 Gert Driesen <drieseng@users.sourceforge.net>
+
+ * 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 <tsenganal@novell.com>
* SqlParameter.cs :
Modified: trunk/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs 2006-05-31 \
13:54:56 UTC (rev 61327)
+++ trunk/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs 2006-05-31 \
13:55:23 UTC (rev 61328) @@ -488,11 +488,6 @@
GC.SuppressFinalize (this);
}
- ~SqlConnection ()
- {
- Dispose (false);
- }
-
public
#if NET_2_0
override
Modified: trunk/mcs/class/System.Data/System.Data.SqlClient/SqlParameter.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlClient/SqlParameter.cs 2006-05-31 \
13:54:56 UTC (rev 61327)
+++ trunk/mcs/class/System.Data/System.Data.SqlClient/SqlParameter.cs 2006-05-31 \
13:55:23 UTC (rev 61328) @@ -234,11 +234,6 @@
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.")]
_______________________________________________
Mono-patches maillist - Mono-patches@lists.ximian.com
http://lists.ximian.com/mailman/listinfo/mono-patches
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic