|
| From: | Rhys Weatherley <address@hidden> |
| Subject: | [Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Private DateTimeFormatter.cs,1.1,1.2 |
| Date: | Thu, 28 Nov 2002 19:58:40 -0500 |
Update of /cvsroot/dotgnu-pnet/pnetlib/runtime/System/Private
In directory subversions:/tmp/cvs-serv19254/runtime/System/Private
Modified Files:
DateTimeFormatter.cs
Log Message:
Fix errors and warnings shown up by csc.
Index: DateTimeFormatter.cs
===================================================================
RCS file:
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Private/DateTimeFormatter.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** DateTimeFormatter.cs 28 Nov 2002 23:27:25 -0000 1.1
--- DateTimeFormatter.cs 29 Nov 2002 00:58:38 -0000 1.2
***************
*** 43,47 ****
return d.Day.ToString();
}
! break;
case 2:
{
--- 43,48 ----
return d.Day.ToString();
}
! // Not reached
!
case 2:
{
***************
*** 49,63 ****
else return d.Day.ToString();
}
! break;
case 3:
{
return
info.GetAbbreviatedDayName((DayOfWeek)d.DayOfWeek);
}
! break;
case 4:
{
return
info.GetDayName((DayOfWeek)(d.DayOfWeek));
}
! break;
}
throw new FormatException("Invalid format string");
--- 50,66 ----
else return d.Day.ToString();
}
! // Not reached
!
case 3:
{
return
info.GetAbbreviatedDayName((DayOfWeek)d.DayOfWeek);
}
! // Not reached
!
case 4:
{
return
info.GetDayName((DayOfWeek)(d.DayOfWeek));
}
! // Not reached
}
throw new FormatException("Invalid format string");
***************
*** 76,80 ****
return d.Month.ToString();
}
! break;
case 2:
{
--- 79,84 ----
return d.Month.ToString();
}
! // Not reached
!
case 2:
{
***************
*** 82,96 ****
else return d.Month.ToString();
}
! break;
case 3:
{
return
info.GetAbbreviatedMonthName(d.Month);
}
! break;
case 4:
{
return info.GetMonthName(d.Month);
}
! break;
}
throw new FormatException("Invalid format string");
--- 86,102 ----
else return d.Month.ToString();
}
! // Not reached
!
case 3:
{
return
info.GetAbbreviatedMonthName(d.Month);
}
! // Not reached
!
case 4:
{
return info.GetMonthName(d.Month);
}
! // Not reached
}
throw new FormatException("Invalid format string");
***************
*** 108,112 ****
case 1:
{
! int century;
for(int i = 0; 0 < d.Year - i; i=i+1000)
{
--- 114,118 ----
case 1:
{
! int century=0;
for(int i = 0; 0 < d.Year - i; i=i+1000)
{
***************
*** 117,124 ****
return (d.Year-century).ToString();
}
! break;
case 2:
{
! int century;
for(int i = 0; 0 < d.Year - i; i=i+1000)
{
--- 123,131 ----
return (d.Year-century).ToString();
}
! // Not reached
!
case 2:
{
! int century=0;
for(int i = 0; 0 < d.Year - i; i=i+1000)
{
***************
*** 128,132 ****
return (d.Year-century).ToString();
}
! break;
case 4:
{
--- 135,140 ----
return (d.Year-century).ToString();
}
! // Not reached
!
case 4:
{
***************
*** 134,138 ****
return
(d.Year.ToString()).Substring(d.Year.ToString().Length-4);
}
! break;
}
throw new FormatException("Invalid format string");
--- 142,146 ----
return
(d.Year.ToString()).Substring(d.Year.ToString().Length-4);
}
! // Not reached
}
throw new FormatException("Invalid format string");
***************
*** 151,155 ****
return (d.Second).ToString();
}
! break;
case 2:
{
--- 159,164 ----
return (d.Second).ToString();
}
! // Not reached
!
case 2:
{
***************
*** 157,161 ****
return d.Second.ToString();
}
! break;
}
throw new FormatException("Invalid format string");
--- 166,170 ----
return d.Second.ToString();
}
! // Not reached
}
throw new FormatException("Invalid format string");
***************
*** 174,178 ****
return (d.Minute).ToString();
}
! break;
case 2:
{
--- 183,188 ----
return (d.Minute).ToString();
}
! // Not reached
!
case 2:
{
***************
*** 180,184 ****
return d.Minute.ToString();
}
! break;
}
throw new FormatException("Invalid format string");
--- 190,194 ----
return d.Minute.ToString();
}
! // Not reached
}
throw new FormatException("Invalid format string");
***************
*** 197,201 ****
return (d.Hour % 12).ToString();
}
! break;
case 2:
{
--- 207,212 ----
return (d.Hour % 12).ToString();
}
! // Not reached
!
case 2:
{
***************
*** 204,208 ****
return hr.ToString();
}
! break;
}
throw new FormatException("Invalid format string");
--- 215,219 ----
return hr.ToString();
}
! // Not reached
}
throw new FormatException("Invalid format string");
***************
*** 221,225 ****
return (d.Hour).ToString();
}
! break;
case 2:
{
--- 232,237 ----
return (d.Hour).ToString();
}
! // Not reached
!
case 2:
{
***************
*** 228,232 ****
return d.Hour.ToString();
}
! break;
}
throw new FormatException("Invalid format string");
--- 240,244 ----
return d.Hour.ToString();
}
! // Not reached
}
throw new FormatException("Invalid format string");
***************
*** 247,251 ****
}
! break;
case 2:
{
--- 259,264 ----
}
! // Not reached
!
case 2:
{
***************
*** 253,257 ****
return info.PMDesignator;
}
! break;
}
throw new FormatException("Invalid format string");
--- 266,270 ----
return info.PMDesignator;
}
! // Not reached
}
throw new FormatException("Invalid format string");
***************
*** 297,301 ****
return info.GetEraName(d.Year);
}
! break;
}
throw new FormatException("Invalid format string");
--- 310,314 ----
return info.GetEraName(d.Year);
}
! // Not reached
}
throw new FormatException("Invalid format string");
***************
*** 314,318 ****
return info.DateSeparator;
}
! break;
}
throw new FormatException("Invalid format string");
--- 327,331 ----
return info.DateSeparator;
}
! // Not reached
}
throw new FormatException("Invalid format string");
***************
*** 331,335 ****
return info.TimeSeparator;
}
! break;
}
throw new FormatException("Invalid format string");
--- 344,348 ----
return info.TimeSeparator;
}
! // Not reached
}
throw new FormatException("Invalid format string");
***************
*** 361,432 ****
return "MM/dd/yyyy\n";
}
! break;
case 'D':
{
return "dddd, MMMM dd, yyyy\n";
}
! break;
case 'f':
{
return "dddd, MMMM dd, yyyy HH:mm\n";
}
! break;
case 'F':
{
return "dddd, MMMM dd, yyyy HH:mm:ss\n";
}
! break;
case 'g':
{
return "MM/dd/yyyy HH:mm\n";
}
! break;
case 'G':
{
return "MM/dd/yyyy HH:mm:ss\n";
}
! break;
case 'm':
{
return "MMMM dd\n";
}
! break;
case 'M':
{
return "MMMM dd\n";
}
! break;
case 't':
{
return "HH:mm\n";
}
! break;
case 'T':
{
return "HH:mm:ss\n";
}
! break;
case 'U':
{
return "dddd, MMMM dd, yyyy HH:mm:ss\n";
}
! break;
case 'y':
{
return "yyyy MMMM\n";
}
! break;
case 'Y':
{
return "yyyy MMMM\n";
}
! break;
default:
{
return "\n";
}
! break;
}
- return format;
}
public static String Format(DateTime date,
--- 374,457 ----
return "MM/dd/yyyy\n";
}
! // Not reached
!
case 'D':
{
return "dddd, MMMM dd, yyyy\n";
}
! // Not reached
!
case 'f':
{
return "dddd, MMMM dd, yyyy HH:mm\n";
}
! // Not reached
!
case 'F':
{
return "dddd, MMMM dd, yyyy HH:mm:ss\n";
}
! // Not reached
!
case 'g':
{
return "MM/dd/yyyy HH:mm\n";
}
! // Not reached
!
case 'G':
{
return "MM/dd/yyyy HH:mm:ss\n";
}
! // Not reached
!
case 'm':
{
return "MMMM dd\n";
}
! // Not reached
!
case 'M':
{
return "MMMM dd\n";
}
! // Not reached
!
case 't':
{
return "HH:mm\n";
}
! // Not reached
!
case 'T':
{
return "HH:mm:ss\n";
}
! // Not reached
!
case 'U':
{
return "dddd, MMMM dd, yyyy HH:mm:ss\n";
}
! // Not reached
!
case 'y':
{
return "yyyy MMMM\n";
}
! // Not reached
!
case 'Y':
{
return "yyyy MMMM\n";
}
! // Not reached
!
default:
{
return "\n";
}
! // Not reached
}
}
public static String Format(DateTime date,
| [Prev in Thread] | Current Thread | [Next in Thread] |