[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Globalization DateTimeFormatInfo.cs,1.7,1.8

[Rhys Weatherley <address@hidden>]

Update of /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Globalization
In directory subversions:/tmp/cvs-serv13879/runtime/System/Globalization

Modified Files:
        DateTimeFormatInfo.cs 
Log Message:


Handle different formatting characters for date/time format lists.


Index: DateTimeFormatInfo.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Globalization/DateTimeFormatInfo.cs,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** DateTimeFormatInfo.cs       30 Mar 2003 00:59:34 -0000      1.7
--- DateTimeFormatInfo.cs       30 Mar 2003 01:13:00 -0000      1.8
***************
*** 79,110 ****
        private static readonly String[] invAbbrevEraNames = {"AD"};
  
!       // Invariant date time pattern list.
        private static readonly String[] invDateTimePatterns =
!                       {"MM/dd/yyyy",
!                        "dddd, dd MMMM yyyy",
!                        "dddd, dd MMMM yyyy HH:mm",
!                        "dddd, dd MMMM yyyy hh:mm tt",
!                        "dddd, dd MMMM yyyy H:mm",
!                        "dddd, dd MMMM yyyy h:mm tt",
!                        "dddd, dd MMMM yyyy HH:mm:ss",
!                        "MM/dd/yyyy HH:mm",
!                        "MM/dd/yyyy hh:mm tt",
!                        "MM/dd/yyyy H:mm",
!                        "MM/dd/yyyy h:mm tt",
!                        "MM/dd/yyyy HH:mm:ss",
!                        "MMMM dd",
!                        "MMMM dd",
!                        "ddd, dd MMM yyyy HH':'mm':'ss 'GMT'",
!                        "ddd, dd MMM yyyy HH':'mm':'ss 'GMT'",
!                        "yyyy'-'MM'-'dd'T'HH':'mm':'ss",
!                        "HH:mm",
!                        "hh:mm tt",
!                        "H:mm",
!                        "h:mm tt",
!                        "HH:mm:ss",
!                        "yyyy'-'MM'-'dd HH':'mm':'ss'Z'",
!                        "dddd, dd MMMM yyyy HH:mm:ss",
!                        "yyyy MMMM",
!                        "yyyy MMMM"};
  
        // Constructor.
--- 79,111 ----
        private static readonly String[] invAbbrevEraNames = {"AD"};
  
!       // Invariant date time pattern list.  Each string begins
!       // with a format character followed by a colon.
        private static readonly String[] invDateTimePatterns =
!                       {"d:MM/dd/yyyy",
!                        "D:dddd, dd MMMM yyyy",
!                        "f:dddd, dd MMMM yyyy HH:mm",
!                        "f:dddd, dd MMMM yyyy hh:mm tt",
!                        "f:dddd, dd MMMM yyyy H:mm",
!                        "f:dddd, dd MMMM yyyy h:mm tt",
!                        "F:dddd, dd MMMM yyyy HH:mm:ss",
!                        "g:MM/dd/yyyy HH:mm",
!                        "g:MM/dd/yyyy hh:mm tt",
!                        "g:MM/dd/yyyy H:mm",
!                        "g:MM/dd/yyyy h:mm tt",
!                        "G:MM/dd/yyyy HH:mm:ss",
!                        "m:MMMM dd",
!                        "M:MMMM dd",
!                        "r:ddd, dd MMM yyyy HH':'mm':'ss 'GMT'",
!                        "R:ddd, dd MMM yyyy HH':'mm':'ss 'GMT'",
!                        "s:yyyy'-'MM'-'dd'T'HH':'mm':'ss",
!                        "t:HH:mm",
!                        "t:hh:mm tt",
!                        "t:H:mm",
!                        "t:h:mm tt",
!                        "T:HH:mm:ss",
!                        "u:yyyy'-'MM'-'dd HH':'mm':'ss'Z'",
!                        "U:dddd, dd MMMM yyyy HH:mm:ss",
!                        "y:yyyy MMMM",
!                        "Y:yyyy MMMM"};
  
        // Constructor.
***************
*** 367,377 ****
        public String[] GetAllDateTimePatterns()
                        {
!                               return (String[])(dateTimePatterns.Clone());
                        }
-       [TODO]
        public String[] GetAllDateTimePatterns(char format)
                        {
!                               // TODO
!                               return new String [0];
                        }
  
--- 368,405 ----
        public String[] GetAllDateTimePatterns()
                        {
!                               String[] patterns = new String 
[dateTimePatterns.Length];
!                               int posn;
!                               for(posn = 0; posn < dateTimePatterns.Length; 
++posn)
!                               {
!                                       patterns[posn] = 
dateTimePatterns[posn].Substring(2);
!                               }
!                               return patterns;
                        }
        public String[] GetAllDateTimePatterns(char format)
                        {
!                               String[] patterns;
!                               int posn, len;
!                               len = 0;
!                               for(posn = 0; posn < dateTimePatterns.Length; 
++posn)
!                               {
!                                       if(dateTimePatterns[posn][0] == format)
!                                       {
!                                               ++len;
!                                       }
!                               }
!                               if(len == 0)
!                               {
!                                       throw new 
ArgumentException(_("Arg_DateTimeFormatChar"));
!                               }
!                               patterns = new String [len];
!                               len = 0;
!                               for(posn = 0; posn < dateTimePatterns.Length; 
++posn)
!                               {
!                                       if(dateTimePatterns[posn][0] == format)
!                                       {
!                                               patterns[len++] = 
dateTimePatterns[posn].Substring(2);
!                                       }
!                               }
!                               return patterns;
                        }
  
***************
*** 869,872 ****
--- 897,916 ----
                                abbrevEraNames = abbrevNames;
                        }
+ 
+ #if !ECMA_COMPAT
+ 
+       // Set the date/time pattern list - this should not be used by
+       // applications.  It exists to support I18N plugins.
+       public void I18NSetDateTimePatterns(String[] patterns)
+                       {
+                               if(patterns == null)
+                               {
+                                       throw new 
ArgumentNullException("patterns");
+                               }
+                               CheckForNulls(patterns);
+                               dateTimePatterns = patterns;
+                       }
+ 
+ #endif // !ECMA_COMPAT
  
  }; // class DateTimeFormatInfo