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

revert the broken change that even fails on .NET 2.0.

svn path=/trunk/mcs/; revision=90445
Atsushi Eno 18 лет назад
Родитель
Сommit
a477ee03e7

+ 0 - 6
mcs/class/System.XML/System.Xml/ChangeLog

@@ -1,9 +1,3 @@
-2007-11-29  Konstantin Triger <[email protected]>
-
-	* XmlConvert.cs : Correctly handle
-		ToDateTime(XmlDateTimeSerializationMode.Unspecified)/ToString(DateTime)
-		for local time.
-
 2007-11-09  Atsushi Enomoto  <[email protected]>
 
 	* XmlConvert.cs : ToDateTime(XmlDateTimeSerializationMode) should

+ 1 - 6
mcs/class/System.XML/System.Xml/XmlConvert.cs

@@ -134,7 +134,6 @@ namespace System.Xml {
 		static readonly string [] roundtripDateTimeFormats;
 		static readonly string [] localDateTimeFormats;
 		static readonly string [] utcDateTimeFormats;
-		static readonly string [] unspecifiedDateTimeFormats;
 
 		static XmlConvert ()
 		{
@@ -142,14 +141,11 @@ namespace System.Xml {
 			roundtripDateTimeFormats = new string [l];
 			localDateTimeFormats = new string [l];
 			utcDateTimeFormats = new string [l];
-			unspecifiedDateTimeFormats = new string [l*2];
 			for (int i = 0; i < l; i++) {
 				string s = defaultDateTimeFormats [i];
 				localDateTimeFormats [i] = s + "zzz";
 				roundtripDateTimeFormats [i] = s + 'K';
 				utcDateTimeFormats [i] = s + 'Z';
-				unspecifiedDateTimeFormats [i*2] = s;
-				unspecifiedDateTimeFormats [i*2 + 1] = localDateTimeFormats [i];
 			}
 		}
 #endif
@@ -341,7 +337,6 @@ namespace System.Xml {
 				dt = ToDateTime (value, utcDateTimeFormats);
 				return dt == DateTime.MinValue || dt == DateTime.MaxValue ? dt : dt.ToUniversalTime ();
 			case XmlDateTimeSerializationMode.Unspecified:
-				return ToDateTime (value, unspecifiedDateTimeFormats);
 			default:
 				return ToDateTime (value, defaultDateTimeFormats);
 			}
@@ -572,7 +567,7 @@ namespace System.Xml {
 				break;
 			case XmlDateTimeSerializationMode.Unspecified:
 				return value.ToString (
-					value.Kind == DateTimeKind.Local ? "yyyy-MM-ddTHH:mm:ss.FFFFFFFzzz" : "yyyy-MM-ddTHH:mm:ss.FFFFFFF",
+					"yyyy-MM-ddTHH:mm:ss.FFFFFFF",
 					CultureInfo.InvariantCulture);
 				break;
 			}

+ 0 - 10
mcs/class/System.XML/Test/System.Xml/XmlConvertTests.cs

@@ -619,16 +619,6 @@ namespace MonoTests.System.Xml
 			AssertType.AreEqual ('Z', s [s.Length -1], "#2-1");
 			AssertType.AreEqual (DateTimeKind.Utc, XmlConvert.ToDateTime (s, XmlDateTimeSerializationMode.RoundtripKind).Kind, "#2-2");
 		}
-		
-		[Test]
-		public void XmlDateTimeSerializationModeUnspecified ()
-		{
-			AssertEquals ("#1", 27, XmlConvert.ToString (new DateTime (DateTime.MaxValue.Ticks, DateTimeKind.Utc), XmlDateTimeSerializationMode.Unspecified).Length);
-			AssertEquals ("#2", 27+6, XmlConvert.ToString (new DateTime (DateTime.MaxValue.Ticks, DateTimeKind.Local), XmlDateTimeSerializationMode.Unspecified).Length);
-			DateTime dt1 = XmlConvert.ToDateTime ("0001-02-03T10:20:30.0000+09:00", XmlDateTimeSerializationMode.Unspecified);
-			DateTime dt2 = XmlConvert.ToDateTime ("0001-02-03T10:20:30.0000", XmlDateTimeSerializationMode.Unspecified);
-			AssertEquals ("#3", false, dt1 == dt2);
-		}
 
 		[Test]
 		public void XmlDateTimeSerializationModeSeveralFormats ()