Merge pull request #726 from pruiz/xamarin-bug-13708

[mono.git] / mcs / class / corlib / System.Globalization / KoreanCalendar.cs

diff --git a/mcs/class/corlib/System.Globalization/KoreanCalendar.cs b/mcs/class/corlib/System.Globalization/KoreanCalendar.cs
index 46faa8d75e1df3b380d59e94bf0761bd03a035a0..80f266c36069a93816e4af60806fd525e91eb310 100644 (file)
--- a/mcs/class/corlib/System.Globalization/KoreanCalendar.cs
+++ b/mcs/class/corlib/System.Globalization/KoreanCalendar.cs
@@ -1,4 +1,4 @@
-// KoreanCalendar.cs
+// System.Globalization.KoreanCalendar.cs
 //
 // (C) Ulrich Kunitz 2002
 //
@@ -41,10 +41,8 @@ using System.Runtime.InteropServices;
 /// </para>
 /// </remarks>
 [Serializable]
-#if NET_2_0
 [ComVisible (true)]
-#endif
-[MonoTODO ("Serialization format not compatible with .NET")]
+[MonoLimitation ("Serialization format not compatible with .NET")]
 public class KoreanCalendar : Calendar {
        /// <summary>
        /// Static protected field storing the
@@ -324,13 +322,11 @@ public class KoreanCalendar : Calendar {
                return era;
        }
 
-#if NET_2_0
        [ComVisible (false)]
        public override int GetLeapMonth (int year, int era)
        {
                return 0;
        }
-#endif
 
        /// <summary>
        /// Overridden. Gives the number of the month of the specified
@@ -364,13 +360,11 @@ public class KoreanCalendar : Calendar {
                return 12;
        }
 
-#if NET_2_0
        [ComVisible (false)]
-       public override int GetWeekOfYear (DateTime date, CalendarWeekRule rule, DayOfWeek firstDayOfWeek)
+       public override int GetWeekOfYear (DateTime time, CalendarWeekRule rule, DayOfWeek firstDayOfWeek)
        {
-               return base.GetWeekOfYear (date, rule, firstDayOfWeek);
+               return base.GetWeekOfYear (time, rule, firstDayOfWeek);
        }
-#endif
 
        /// <summary>
        /// Overridden. Gives the number of the year of the specified
@@ -488,13 +482,13 @@ public class KoreanCalendar : Calendar {
        /// is out of range.
        /// </exception>
        public override DateTime ToDateTime(int year, int month, int day,
-               int hour, int minute, int second, int milliseconds,
+               int hour, int minute, int second, int millisecond,
                int era)
        {
                int gregorianYear = M_CheckYMDEG(year, month, day, ref era);
-               M_CheckHMSM(hour, minute, second, milliseconds);
+               M_CheckHMSM(hour, minute, second, millisecond);
                return CCGregorianCalendar.ToDateTime(gregorianYear,
-                       month, day, hour, minute, second, milliseconds);
+                       month, day, hour, minute, second, millisecond);
        }
 
        public override int ToFourDigitYear(int year)
@@ -502,13 +496,14 @@ public class KoreanCalendar : Calendar {
                return base.ToFourDigitYear (year);
        }
        
-#if NET_2_0
+#if !NET_2_1
        [ComVisible (false)]
        public override CalendarAlgorithmType AlgorithmType {
                get {
                        return CalendarAlgorithmType.SolarCalendar;
                }
        }
+#endif
 
        static DateTime KoreanMin = new DateTime (1, 1, 1, 0, 0, 0);
        static DateTime KoreanMax = new DateTime (9999, 12, 31, 11, 59, 59);
@@ -526,7 +521,6 @@ public class KoreanCalendar : Calendar {
                        return KoreanMax;
                }
        }
-#endif
        
 } // class KoreanCalendar