Author: kostat
Date: 2007-02-11 11:33:03 -0500 (Sun, 11 Feb 2007)
New Revision: 72621

Modified:
   trunk/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog
   trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlBinary.cs
   trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlBoolean.cs
   trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlByte.cs
   trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlDateTime.cs
   trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlDecimal.cs
   trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlDouble.cs
   trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlGuid.cs
Log:
Added a 2.0 CompareTo override (refactoring)

Modified: trunk/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog  2007-02-11 
16:16:45 UTC (rev 72620)
+++ trunk/mcs/class/System.Data/System.Data.SqlTypes/ChangeLog  2007-02-11 
16:33:03 UTC (rev 72621)
@@ -1,3 +1,8 @@
+2007-02-11  Konstantin Triger <[EMAIL PROTECTED]>
+
+       * SqlDateTime.cs, SqlDecimal.cs, SqlByte.cs, SqlDouble.cs, 
SqlBoolean.cs,
+               SqlBinary.cs, SqlGuid.cs: Added a 2.0 CompareTo override 
(refactoring).
+
 2007-02-11  Vladimir Krasnov  <[EMAIL PROTECTED]>
 
        * SqlDateTime.cs: changed MaxValue and MinValue initialization, it was

Modified: trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlBinary.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlBinary.cs       
2007-02-11 16:16:45 UTC (rev 72620)
+++ trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlBinary.cs       
2007-02-11 16:33:03 UTC (rev 72621)
@@ -112,17 +112,24 @@
                #endregion
 
                #region Methods
-
-               public int CompareTo (object value) 
+               public int CompareTo (object value)
                {
                        if (value == null)
                                return 1;
-                       else if (!(value is SqlBinary))
+                       if (!(value is SqlBinary))
                                throw new ArgumentException (Locale.GetText 
("Value is not a System.Data.SqlTypes.SqlBinary"));
-                       else if (((SqlBinary)value).IsNull)
+
+                       return CompareTo ((SqlBinary) value);
+               }
+#if NET_2_0
+               public
+#endif
+               int CompareTo (SqlBinary value) 
+               {
+                       if (value.IsNull)
                                return 1;
                        else
-                               return Compare (this, (SqlBinary)value);
+                               return Compare (this, value);
                }
 
                public static SqlBinary Concat (SqlBinary x, SqlBinary y) 

Modified: trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlBoolean.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlBoolean.cs      
2007-02-11 16:16:45 UTC (rev 72620)
+++ trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlBoolean.cs      
2007-02-11 16:33:03 UTC (rev 72621)
@@ -127,16 +127,24 @@
                        return (x & y);
                }
 
-               public int CompareTo (object value) 
+               public int CompareTo (object value)
                {
                        if (value == null)
                                return 1;
-                       else if (!(value is SqlBoolean))
+                       if (!(value is SqlBoolean))
                                throw new ArgumentException (Locale.GetText 
("Value is not a System.Data.SqlTypes.SqlBoolean"));
-                       else if (((SqlBoolean)value).IsNull)
+
+                       return CompareTo ((SqlBoolean) value);
+               }
+#if NET_2_0
+               public
+#endif
+               int CompareTo (SqlBoolean value) 
+               {
+                       if (value.IsNull)
                                return 1;
                        else
-                               return this.value.CompareTo 
(((SqlBoolean)value).ByteValue);
+                               return this.value.CompareTo (value.ByteValue);
                }
 
                public override bool Equals(object value) 

Modified: trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlByte.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlByte.cs 2007-02-11 
16:16:45 UTC (rev 72620)
+++ trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlByte.cs 2007-02-11 
16:33:03 UTC (rev 72621)
@@ -99,12 +99,20 @@
                {
                        if (value == null)
                                return 1;
-                       else if (!(value is SqlByte))
+                       if (!(value is SqlByte))
                                throw new ArgumentException (Locale.GetText 
("Value is not a System.Data.SqlTypes.SqlByte"));
-                       else if (((SqlByte)value).IsNull)
+
+                       return CompareTo ((SqlByte) value);
+               }
+#if NET_2_0
+               public
+#endif
+               int CompareTo (SqlByte value)
+               {
+                       if (value.IsNull)
                                return 1;
                        else
-                               return this.value.CompareTo 
(((SqlByte)value).Value);
+                               return this.value.CompareTo (value.Value);
                }
 
                public static SqlByte Divide (SqlByte x, SqlByte y)

Modified: trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlDateTime.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlDateTime.cs     
2007-02-11 16:16:45 UTC (rev 72620)
+++ trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlDateTime.cs     
2007-02-11 16:33:03 UTC (rev 72621)
@@ -200,12 +200,20 @@
                {
                        if (value == null)
                                return 1;
-                       else if (!(value is SqlDateTime))
+                       if (!(value is SqlDateTime))
                                throw new ArgumentException (Locale.GetText 
("Value is not a System.Data.SqlTypes.SqlDateTime"));
-                       else if (((SqlDateTime)value).IsNull)
+
+                       return CompareTo ((SqlDateTime) value);
+               }
+#if NET_2_0
+               public
+#endif
+               int CompareTo (SqlDateTime value)
+               {
+                       if (value.IsNull)
                                return 1;
                        else
-                               return this.value.CompareTo 
(((SqlDateTime)value).Value);
+                               return this.value.CompareTo (value.Value);
                }
 
                public override bool Equals (object value)

Modified: trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlDecimal.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlDecimal.cs      
2007-02-11 16:16:45 UTC (rev 72620)
+++ trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlDecimal.cs      
2007-02-11 16:33:03 UTC (rev 72621)
@@ -291,12 +291,20 @@
                {
                        if (value == null)
                                return 1;
-                       else if (!(value is SqlDecimal))
+                       if (!(value is SqlDecimal))
                                throw new ArgumentException (Locale.GetText 
("Value is not a System.Data.SqlTypes.SqlDecimal"));
-                       else if (((SqlDecimal)value).IsNull)
+
+                       return CompareTo ((SqlDecimal) value);
+               }
+#if NET_2_0
+               public
+#endif
+               int CompareTo (SqlDecimal value)
+               {
+                       if (value.IsNull)
                                return 1;
                        else
-                               return this.Value.CompareTo 
(((SqlDecimal)value).Value);
+                               return this.Value.CompareTo (value.Value);
                }
 
                public static SqlDecimal ConvertToPrecScale (SqlDecimal n, int 
precision, int scale)

Modified: trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlDouble.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlDouble.cs       
2007-02-11 16:16:45 UTC (rev 72620)
+++ trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlDouble.cs       
2007-02-11 16:33:03 UTC (rev 72621)
@@ -93,17 +93,25 @@
                {
                        return (x + y);
                }
-
+               
                public int CompareTo (object value)
                {
                        if (value == null)
                                return 1;
-                       else if (!(value is SqlDouble))
+                       if (!(value is SqlDouble))
                                throw new ArgumentException (Locale.GetText 
("Value is not a System.Data.SqlTypes.SqlDouble"));
-                       else if (((SqlDouble)value).IsNull)
+
+                       return CompareTo ((SqlDouble) value);
+               }
+#if NET_2_0
+               public
+#endif
+               int CompareTo (SqlDouble value)
+               {
+                       if (value.IsNull)
                                return 1;
                        else
-                               return this.value.CompareTo 
(((SqlDouble)value).Value);
+                               return this.value.CompareTo (value.Value);
                }
 
                public static SqlDouble Divide (SqlDouble x, SqlDouble y)

Modified: trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlGuid.cs
===================================================================
--- trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlGuid.cs 2007-02-11 
16:16:45 UTC (rev 72620)
+++ trunk/mcs/class/System.Data/System.Data.SqlTypes/SqlGuid.cs 2007-02-11 
16:33:03 UTC (rev 72621)
@@ -124,9 +124,17 @@
                {
                        if (value == null)
                                return 1;
-                       else if (!(value is SqlGuid))
+                       if (!(value is SqlGuid))
                                throw new ArgumentException (Locale.GetText 
("Value is not a System.Data.SqlTypes.SqlGuid"));
-                       else if (((SqlGuid)value).IsNull)
+
+                       return CompareTo ((SqlGuid) value);
+               }
+#if NET_2_0
+               public
+#endif
+               int CompareTo (SqlGuid value)
+               {
+                       if (value.IsNull)
                                return 1;
                        else
                                 // LAMESPEC : ms.net implementation actually 
compares all the 16 bytes.
@@ -147,7 +155,7 @@
                                        return 0;
                                }
                                 */
-                                return this.value.CompareTo 
(((SqlGuid)value).Value);
+                                return this.value.CompareTo (value.Value);
                                
                }
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to