Author: gert
Date: 2007-07-01 08:48:34 -0400 (Sun, 01 Jul 2007)
New Revision: 81142
Modified:
trunk/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs
trunk/mcs/class/System.Data/System.Data.OleDb/OleDbError.cs
trunk/mcs/class/System.Data/System.Data.OleDb/OleDbErrorCollection.cs
trunk/mcs/class/System.Data/System.Data.OleDb/OleDbException.cs
trunk/mcs/class/System.Data/System.Data.OleDb/OleDbInfoMessageEventArgs.cs
Log:
* OleDbCommand.cs: Code formatting.
* OleDbError.cs: Code formatting.
* OleDbErrorCollection.cs: Code formatting.
* OleDbException.cs: Code formatting.
* OleDbInfoMessageEventArgs.cs: Code formatting.
Modified: trunk/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs
2007-07-01 12:36:38 UTC (rev 81141)
+++ trunk/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs
2007-07-01 12:48:34 UTC (rev 81142)
@@ -71,15 +71,15 @@
#region Constructors
public OleDbCommand ()
- {
+ {
commandText = String.Empty;
timeout = 30; // default timeout per .NET
commandType = CommandType.Text;
- connection = null;
+ connection ;
parameters = new OleDbParameterCollection ();
- transaction = null;
- designTimeVisible = false;
- dataReader = null;
+ transaction;
+ designTimeVisible;
+ dataReader;
behavior = CommandBehavior.Default;
gdaCommand = IntPtr.Zero;
}
@@ -109,15 +109,15 @@
[DataCategory ("Data")]
[DefaultValue ("")]
#if !NET_2_0
- [DataSysDescriptionAttribute ("Command text to execute.")]
+ [DataSysDescriptionAttribute ("Command text to execute.")]
#endif
- [EditorAttribute
("Microsoft.VSDesigner.Data.ADO.Design.OleDbCommandTextEditor, "+
Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+
Consts.AssemblySystem_Drawing )]
+ [EditorAttribute
("Microsoft.VSDesigner.Data.ADO.Design.OleDbCommandTextEditor, "+
Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+
Consts.AssemblySystem_Drawing)]
[RefreshPropertiesAttribute (RefreshProperties.All)]
public
#if NET_2_0
override
#endif
- string CommandText
+ string CommandText
{
get {
return commandText;
@@ -154,7 +154,7 @@
#if NET_2_0
override
#endif
- CommandType CommandType {
+ CommandType CommandType {
get {
return commandType;
}
@@ -169,7 +169,7 @@
#endif
[DefaultValue (null)]
[EditorAttribute
("Microsoft.VSDesigner.Data.Design.DbConnectionEditor, "+
Consts.AssemblyMicrosoft_VSDesigner, "System.Drawing.Design.UITypeEditor, "+
Consts.AssemblySystem_Drawing )]
- public new OleDbConnection Connection {
+ public new OleDbConnection Connection {
get {
return connection;
}
@@ -185,7 +185,7 @@
#if NET_2_0
override
#endif
- bool DesignTimeVisible {
+ bool DesignTimeVisible {
get {
return designTimeVisible;
}
@@ -204,7 +204,7 @@
return parameters;
}
}
-
+
[BrowsableAttribute (false)]
#if !NET_2_0
[DataSysDescriptionAttribute ("The transaction used by the
command.")]
@@ -228,7 +228,7 @@
#if NET_2_0
override
#endif
- UpdateRowSource UpdatedRowSource {
+ UpdateRowSource UpdatedRowSource {
[MonoTODO]
get {
throw new NotImplementedException ();
@@ -319,6 +319,7 @@
//libgda.gda_command_set_transaction
}
+
public
#if NET_2_0
override
@@ -416,7 +417,7 @@
[MonoTODO]
object ICloneable.Clone ()
{
- throw new NotImplementedException ();
+ throw new NotImplementedException ();
}
[MonoTODO]
@@ -426,7 +427,7 @@
#endif
void Prepare ()
{
- throw new NotImplementedException ();
+ throw new NotImplementedException ();
}
public void ResetCommandTimeout ()
@@ -438,13 +439,13 @@
[MonoTODO]
protected override DbParameter CreateDbParameter ()
{
- throw new NotImplementedException ();
+ throw new NotImplementedException ();
}
[MonoTODO]
protected override DbDataReader ExecuteDbDataReader
(CommandBehavior behavior)
{
- throw new NotImplementedException ();
+ throw new NotImplementedException ();
}
[MonoTODO]
Modified: trunk/mcs/class/System.Data/System.Data.OleDb/OleDbError.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.OleDb/OleDbError.cs 2007-07-01
12:36:38 UTC (rev 81141)
+++ trunk/mcs/class/System.Data/System.Data.OleDb/OleDbError.cs 2007-07-01
12:48:34 UTC (rev 81142)
@@ -91,12 +91,10 @@
public override string ToString ()
{
string toStr;
- String stackTrace;
- stackTrace = " <Stack Trace>";
- // FIXME: generate the correct SQL error string
+ String stackTrace = " <Stack Trace>";
+ // FIXME: generate the correct SQL error string
toStr = "OleDbError:" + message + stackTrace;
return toStr;
-
}
#endregion
Modified: trunk/mcs/class/System.Data/System.Data.OleDb/OleDbErrorCollection.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.OleDb/OleDbErrorCollection.cs
2007-07-01 12:36:38 UTC (rev 81141)
+++ trunk/mcs/class/System.Data/System.Data.OleDb/OleDbErrorCollection.cs
2007-07-01 12:48:34 UTC (rev 81142)
@@ -93,19 +93,17 @@
public void CopyTo (Array array, int index)
{
- if (array == null)
- throw new ArgumentNullException("array");
-
- if ((index < array.GetLowerBound (0)) || (index >
array.GetUpperBound (0)))
- throw new ArgumentOutOfRangeException("index");
-
- // is the check for IsFixedSize required?
- if ((array.IsFixedSize) || (index + this.Count >
array.GetUpperBound (0)))
- throw new ArgumentException("array");
+ if (array == null)
+ throw new ArgumentNullException("array");
- ((OleDbError[]) (items.ToArray ())).CopyTo (array,
index);
+ if ((index < array.GetLowerBound (0)) || (index >
array.GetUpperBound (0)))
+ throw new ArgumentOutOfRangeException("index");
+ // is the check for IsFixedSize required?
+ if ((array.IsFixedSize) || (index + this.Count >
array.GetUpperBound (0)))
+ throw new ArgumentException("array");
+ ((OleDbError[]) (items.ToArray ())).CopyTo (array,
index);
}
public IEnumerator GetEnumerator ()
Modified: trunk/mcs/class/System.Data/System.Data.OleDb/OleDbException.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.OleDb/OleDbException.cs
2007-07-01 12:36:38 UTC (rev 81141)
+++ trunk/mcs/class/System.Data/System.Data.OleDb/OleDbException.cs
2007-07-01 12:48:34 UTC (rev 81142)
@@ -45,7 +45,7 @@
public sealed class OleDbException : ExternalException
{
private OleDbConnection connection;
-
+
#region Constructors
internal OleDbException (OleDbConnection cnc)
@@ -56,8 +56,9 @@
#endregion // Constructors
#region Properties
+
[TypeConverterAttribute (typeof
(OleDbException.ErrorCodeConverter))]
- public override int ErrorCode {
+ public override int ErrorCode {
get {
GdaList glist;
IntPtr errors;
@@ -97,7 +98,7 @@
}
}
- public override string Message {
+ public override string Message {
get {
GdaList glist;
IntPtr errors;
@@ -119,7 +120,7 @@
}
}
- public override string Source {
+ public override string Source {
get {
GdaList glist;
IntPtr errors;
Modified:
trunk/mcs/class/System.Data/System.Data.OleDb/OleDbInfoMessageEventArgs.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.OleDb/OleDbInfoMessageEventArgs.cs
2007-07-01 12:36:38 UTC (rev 81141)
+++ trunk/mcs/class/System.Data/System.Data.OleDb/OleDbInfoMessageEventArgs.cs
2007-07-01 12:48:34 UTC (rev 81142)
@@ -37,13 +37,14 @@
namespace System.Data.OleDb
{
- public sealed class OleDbInfoMessageEventArgs : EventArgs
- {
- #region Constructors
-
- internal OleDbInfoMessageEventArgs() {
- }
-
+ public sealed class OleDbInfoMessageEventArgs : EventArgs
+ {
+ #region Constructors
+
+ internal OleDbInfoMessageEventArgs ()
+ {
+ }
+
#endregion Constructors
#region Properties
Property changes on:
trunk/mcs/class/System.Data/System.Data.OleDb/OleDbInfoMessageEventArgs.cs
___________________________________________________________________
Name: svn:eol-style
+ native
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
