[Dotgnu-pnet-commits] CVS: pnetlib/runtime/System/Globalization GregorianCalendar.cs,1.3,1.4 HebrewCalendar.cs,1.3,1.4 HijriCalendar.cs,1.1,1.2 JapaneseCalendar.cs,1.1,1.2 JulianCalendar.cs,1.2,1.3 KoreanCalendar.cs,1.1,1.2 TaiwanCalendar.cs,1.1,1.2 ThaiBuddhistCalendar.cs,1.1,1.2

[Rhys Weatherley <address@hidden>]

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

Modified Files:
        GregorianCalendar.cs HebrewCalendar.cs HijriCalendar.cs 
        JapaneseCalendar.cs JulianCalendar.cs KoreanCalendar.cs 
        TaiwanCalendar.cs ThaiBuddhistCalendar.cs 
Log Message:


Minor tweaks to a lot of classes to make them more signature compatible
with .NET Framework SDK 1.1.


Index: GregorianCalendar.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Globalization/GregorianCalendar.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** GregorianCalendar.cs        11 Feb 2003 15:23:55 -0000      1.3
--- GregorianCalendar.cs        23 Apr 2003 05:39:49 -0000      1.4
***************
*** 103,106 ****
--- 103,110 ----
                                return time.AddMonths(months);
                        }
+       public override DateTime AddWeeks(DateTime time, int weeks)
+                       {
+                               return base.AddWeeks(time, weeks);
+                       }
        public override DateTime AddYears(DateTime time, int years)
                        {
***************
*** 247,250 ****
--- 251,260 ----
                                return new DateTime(year, month, day, hour,
                                                                        minute, 
second, millisecond);
+                       }
+ 
+       // Convert a two-digit year value into a four-digit year value.
+       public override int ToFourDigitYear(int year)
+                       {
+                               return base.ToFourDigitYear(year);
                        }
  

Index: HebrewCalendar.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Globalization/HebrewCalendar.cs,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** HebrewCalendar.cs   11 Feb 2003 15:23:55 -0000      1.3
--- HebrewCalendar.cs   23 Apr 2003 05:39:49 -0000      1.4
***************
*** 274,277 ****
--- 274,283 ----
                        }
  
+       // Convert a two-digit year value into a four-digit year value.
+       public override int ToFourDigitYear(int year)
+                       {
+                               return base.ToFourDigitYear(year);
+                       }
+ 
  }; // class HebrewCalendar
  

Index: HijriCalendar.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Globalization/HijriCalendar.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** HijriCalendar.cs    21 Apr 2003 23:40:46 -0000      1.1
--- HijriCalendar.cs    23 Apr 2003 05:39:49 -0000      1.2
***************
*** 33,36 ****
--- 33,39 ----
        private const int DefaultTwoDigitMax = 1451;
  
+       // Internal state.
+       private int adjustment;
+ 
        // Constructor.
        [TODO]
***************
*** 51,54 ****
--- 54,72 ----
                        }
  
+       // Get or set the Hijri adjustment value.
+       [TODO]
+       public int HijriAdjustment
+                       {
+                               get
+                               {
+                                       return adjustment;
+                               }
+                               set
+                               {
+                                       // TODO: validate the adjustment value
+                                       adjustment = value;
+                               }
+                       }
+ 
        // Set the last year of a 100-year range for 2-digit processing.
        public override int TwoDigitYearMax
***************
*** 230,233 ****
--- 248,257 ----
                                return new DateTime(year, month, day, hour,
                                                                        minute, 
second, millisecond);
+                       }
+ 
+       // Convert a two-digit year value into a four-digit year value.
+       public override int ToFourDigitYear(int year)
+                       {
+                               return base.ToFourDigitYear(year);
                        }
  

Index: JapaneseCalendar.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Globalization/JapaneseCalendar.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** JapaneseCalendar.cs 21 Apr 2003 23:40:46 -0000      1.1
--- JapaneseCalendar.cs 23 Apr 2003 05:39:49 -0000      1.2
***************
*** 168,171 ****
--- 168,177 ----
                        }
  
+       // Convert a two-digit year value into a four-digit year value.
+       public override int ToFourDigitYear(int year)
+                       {
+                               return variant.ToFourDigitYear(year);
+                       }
+ 
  }; // class JapaneseCalendar
  

Index: JulianCalendar.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Globalization/JulianCalendar.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** JulianCalendar.cs   11 Feb 2003 15:23:55 -0000      1.2
--- JulianCalendar.cs   23 Apr 2003 05:39:49 -0000      1.3
***************
*** 397,400 ****
--- 397,406 ----
                        }
  
+       // Convert a two-digit year value into a four-digit year value.
+       public override int ToFourDigitYear(int year)
+                       {
+                               return base.ToFourDigitYear(year);
+                       }
+ 
  }; // class JulianCalendar
  

Index: KoreanCalendar.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Globalization/KoreanCalendar.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** KoreanCalendar.cs   21 Apr 2003 23:40:46 -0000      1.1
--- KoreanCalendar.cs   23 Apr 2003 05:39:49 -0000      1.2
***************
*** 156,159 ****
--- 156,165 ----
                        }
  
+       // Convert a two-digit year value into a four-digit year value.
+       public override int ToFourDigitYear(int year)
+                       {
+                               return variant.ToFourDigitYear(year);
+                       }
+ 
  }; // class KoreanCalendar
  

Index: TaiwanCalendar.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Globalization/TaiwanCalendar.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** TaiwanCalendar.cs   21 Apr 2003 23:40:46 -0000      1.1
--- TaiwanCalendar.cs   23 Apr 2003 05:39:49 -0000      1.2
***************
*** 28,32 ****
  {
        // The Taiwan era.
!       public const int TaiwanEra = 1;
  
        // Useful constants.
--- 28,32 ----
  {
        // The Taiwan era.
!       private const int TaiwanEra = 1;
  
        // Useful constants.
***************
*** 154,157 ****
--- 154,163 ----
                                return variant.ToDateTime(year, month, day, 
hour, minute,
                                                                                
  second, millisecond, era);
+                       }
+ 
+       // Convert a two-digit year value into a four-digit year value.
+       public override int ToFourDigitYear(int year)
+                       {
+                               return variant.ToFourDigitYear(year);
                        }
  

Index: ThaiBuddhistCalendar.cs
===================================================================
RCS file: 
/cvsroot/dotgnu-pnet/pnetlib/runtime/System/Globalization/ThaiBuddhistCalendar.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** ThaiBuddhistCalendar.cs     21 Apr 2003 23:40:46 -0000      1.1
--- ThaiBuddhistCalendar.cs     23 Apr 2003 05:39:49 -0000      1.2
***************
*** 156,159 ****
--- 156,165 ----
                        }
  
+       // Convert a two-digit year value into a four-digit year value.
+       public override int ToFourDigitYear(int year)
+                       {
+                               return variant.ToFourDigitYear(year);
+                       }
+ 
  }; // class ThaiBuddhistCalendar