Merge pull request #820 from brendanzagaeski/master

[mono.git] / mcs / class / System.XML / System.Xml / XmlConvert.cs

diff --git a/mcs/class/System.XML/System.Xml/XmlConvert.cs b/mcs/class/System.XML/System.Xml/XmlConvert.cs
index ae31b62983cb6255af04a748bb4588d88a3b4947..bac049be278329041cd437465060087ed38a8e55 100644 (file)
--- a/mcs/class/System.XML/System.Xml/XmlConvert.cs
+++ b/mcs/class/System.XML/System.Xml/XmlConvert.cs
@@ -140,48 +140,6 @@ namespace System.Xml {
                  "---ddZ",
                };
 
-#if NET_2_0
-               static readonly string [] defaultDateTimeFormats = new string [] {
-                       "yyyy-MM-ddTHH:mm:ss", // dateTime(1)
-                       "yyyy-MM-ddTHH:mm:ss.FFFFFFF", // dateTime(2)
-                       "yyyy-MM-dd", // date
-                       "HH:mm:ss", // time
-                       "yyyy-MM", // gYearMonth
-                       "yyyy", // gYear
-                       "--MM-dd", // gMonthDay
-                       "---dd", // gDay
-                       };
-
-               static readonly string [] roundtripDateTimeFormats;
-               static readonly string [] localDateTimeFormats;
-               static readonly string [] utcDateTimeFormats;
-               static readonly string [] unspecifiedDateTimeFormats;
-
-               static XmlConvert ()
-               {
-                       int l = defaultDateTimeFormats.Length;
-                       roundtripDateTimeFormats = new string [l * 2];
-                       localDateTimeFormats = new string [l * 2];
-                       utcDateTimeFormats = new string [l * 3];
-                       unspecifiedDateTimeFormats = new string [l * 5];
-                       for (int i = 0; i < l; i++) {
-                               string s = defaultDateTimeFormats [i];
-                               var z = s + 'Z';
-                               localDateTimeFormats [i * 2] = s + (s [s.Length - 1] == 's' || s [s.Length - 1] == 'F' ? "zzz" : String.Empty);
-                               localDateTimeFormats [i * 2 + 1] = z;
-                               roundtripDateTimeFormats [i * 2] = s + 'K';
-                               roundtripDateTimeFormats [i * 2 + 1] = z;
-                               utcDateTimeFormats [i * 3] = s;
-                               utcDateTimeFormats [i * 3 + 1] = z;
-                               utcDateTimeFormats [i * 3 + 2] = s + "zzz";
-                               unspecifiedDateTimeFormats [i * 5] = s;
-                               unspecifiedDateTimeFormats [i * 5 + 1] = z;
-                               unspecifiedDateTimeFormats [i * 5 + 2] = localDateTimeFormats [i];
-                               unspecifiedDateTimeFormats [i * 5 + 3] = roundtripDateTimeFormats [i];
-                               unspecifiedDateTimeFormats [i * 5 + 4] = utcDateTimeFormats [i];
-                       }
-               }
-#endif
                static DateTimeStyles _defaultStyle = DateTimeStyles.AllowLeadingWhite | DateTimeStyles.AllowTrailingWhite;
                
                public XmlConvert()
@@ -369,20 +327,15 @@ namespace System.Xml {
 #if NET_2_0
                public static DateTime ToDateTime (string s, XmlDateTimeSerializationMode dateTimeOption)
                {
-                       DateTime dt;
                        switch (dateTimeOption) {
                        case XmlDateTimeSerializationMode.Local:
-                               dt = ToDateTime (s, localDateTimeFormats);
-                               return new DateTime (dt.Ticks, DateTimeKind.Local);
+                return ToDateTime(s, datetimeFormats, _defaultStyle | DateTimeStyles.AssumeLocal).ToLocalTime();
                        case XmlDateTimeSerializationMode.RoundtripKind:
-                               return ToDateTime (s, roundtripDateTimeFormats, _defaultStyle | DateTimeStyles.RoundtripKind);
+                return ToDateTime(s, datetimeFormats, _defaultStyle | DateTimeStyles.RoundtripKind);
                        case XmlDateTimeSerializationMode.Utc:
-                               dt = ToDateTime (s, utcDateTimeFormats);
-                               return new DateTime (dt.Ticks, DateTimeKind.Utc);
-                       case XmlDateTimeSerializationMode.Unspecified:
-                               return ToDateTime (s, unspecifiedDateTimeFormats);
+                return ToDateTime(s, datetimeFormats, _defaultStyle | DateTimeStyles.AssumeUniversal).ToUniversalTime();
                        default:
-                               return ToDateTime (s, defaultDateTimeFormats);
+                               return new DateTime (ToDateTime(s, datetimeFormats, _defaultStyle | DateTimeStyles.RoundtripKind).Ticks, DateTimeKind.Unspecified);
                        }
                }
 #endif
@@ -568,7 +521,7 @@ namespace System.Xml {
                        if (value.Days > 0)
                                builder.Append (value.Days).Append ('D');
                        long ticks = value.Ticks % TimeSpan.TicksPerMillisecond;
-                       if (value.Days > 0 || value.Hours > 0 || value.Minutes > 0 || value.Seconds > 0 || value.Milliseconds > 0 || ticks > 0) {
+                       if (value.Hours > 0 || value.Minutes > 0 || value.Seconds > 0 || value.Milliseconds > 0 || ticks > 0) {
                                builder.Append('T');
                                if (value.Hours > 0)
                                        builder.Append (value.Hours).Append ('H');
@@ -925,50 +878,63 @@ namespace System.Xml {
 
 #endif
 
-#if NET_4_0 || NET_2_1
+#if NET_4_0
                public static bool IsNCNameChar (char ch)
                {
-                       throw new NotImplementedException ();
+                       return XmlChar.IsNCNameChar (ch);
                }
 
                public static bool IsPublicIdChar (char ch)
                {
-                       throw new NotImplementedException ();
+                       return XmlChar.IsPubidChar (ch);
                }
 
                public static bool IsStartNCNameChar (char ch)
                {
-                       throw new NotImplementedException ();
+                       return XmlChar.IsFirstNameChar (ch);
                }
 
                public static bool IsWhitespaceChar (char ch)
                {
-                       throw new NotImplementedException ();
+                       return XmlChar.IsWhitespace (ch);
                }
 
                public static bool IsXmlChar (char ch)
                {
-                       throw new NotImplementedException ();
+                       return XmlChar.IsValid (ch);
                }
 
                public static bool IsXmlSurrogatePair (char lowChar, char highChar)
                {
-                       throw new NotImplementedException ();
+                       return 0xD800 <= lowChar && lowChar <= 0xDBFF && 0xDC00 <= highChar && highChar <= 0xDFFF;
                }
                
                public static string VerifyPublicId (string publicId)
                {
-                       throw new NotImplementedException ();
+                       if (publicId == null)
+                               throw new ArgumentNullException ("publicId");
+                       if (XmlChar.IsPubid (publicId))
+                               return publicId;
+                       throw new XmlException (string.Format ("'{0}' is not a valid PUBLIC ID", publicId));
                }
 
                public static string VerifyWhitespace (string content)
                {
-                       throw new NotImplementedException ();
+                       if (content == null)
+                               throw new ArgumentNullException ("content");
+                       if (XmlChar.IsWhitespace (content))
+                               return content;
+                       throw new XmlException (string.Format ("'{0}' is not whitespace", content));
                }
 
                public static string VerifyXmlChars (string content)
                {
-                       throw new NotImplementedException ();
+                       if (content == null)
+                               throw new ArgumentNullException ("content");
+                       var idx = XmlChar.IndexOfInvalid (content, true);
+                       if (idx < 0)
+                               return content;
+                       throw new XmlException (string.Format ("Invalid XML character was found in the content, at index {0}.", idx));
                }
 #endif
        }