Changeset 957 for branches/eraser6/Manager/Schedule.cs

Timestamp:

5/1/2009 5:24:05 AM (4 years ago)

Author:

lowjoel

Message:

No publicly accessible nested types

File:

• branches/eraser6/Manager/Schedule.cs (modified) (15 diffs)

branches/eraser6/Manager/Schedule.cs

@@ -133 +133 @@
                 switch (type)
                 {
-                    case ScheduleUnit.Daily:
+                    case RecurringScheduleUnit.Daily:
                         if (frequency != 1)
                             result = S._("Once every {0} days", frequency);
@@ -139 +139 @@
                             result = S._("Once every day");
                         break;
-                    case ScheduleUnit.Weekdays:
+                    case RecurringScheduleUnit.Weekdays:
                         result = S._("Every weekday");
                         break;
-                    case ScheduleUnit.Weekly:
+                    case RecurringScheduleUnit.Weekly:
                         if ((weeklySchedule & DaysOfWeek.Monday) != 0)
                             result = S._("Every Monday, {0}");
@@ -163 +163 @@
                                 S._("once every {0} weeks.", frequency));
                         break;
-                    case ScheduleUnit.Monthly:
+                    case RecurringScheduleUnit.Monthly:
                         if (frequency == 1)
                             result = S._("On day {0} of every month", monthlySchedule);
@@ -180 +180 @@
         protected RecurringSchedule(SerializationInfo info, StreamingContext context)
         {
-            type = (ScheduleUnit)info.GetValue("Type", typeof(ScheduleUnit));
+            type = (RecurringScheduleUnit)info.GetValue("Type", typeof(RecurringScheduleUnit));
             frequency = (int)info.GetValue("Frequency", typeof(int));
             executionTime = (DateTime)info.GetValue("ExecutionTime", typeof(DateTime));
@@ -211 +211 @@
 
         /// <summary>
-        /// The types of schedule
-        /// </summary>
-        public enum ScheduleUnit
-        {
-            /// <summary>
-            /// Daily schedule type
-            /// </summary>
-            Daily,
-
-            /// <summary>
-            /// Weekdays-only schedule type
-            /// </summary>
-            Weekdays,
-
-            /// <summary>
-            /// Weekly schedule type
-            /// </summary>
-            Weekly,
-
-            /// <summary>
-            /// Monthly schedule type
-            /// </summary>
-            Monthly
-        }
-
-        /// <summary>
-        /// The days of the week, with values usable in a bitfield.
-        /// </summary>
-        [Flags]
-        [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1714:FlagsEnumsShouldHavePluralNames")]
-        public enum DaysOfWeek
-        {
-            None = 0,
-            Sunday = 1 << DayOfWeek.Sunday,
-            Monday = 1 << DayOfWeek.Monday,
-            Tuesday = 1 << DayOfWeek.Tuesday,
-            Wednesday = 1 << DayOfWeek.Wednesday,
-            Thursday = 1 << DayOfWeek.Thursday,
-            Friday = 1 << DayOfWeek.Friday,
-            Saturday = 1 << DayOfWeek.Saturday
-        }
-
-        /// <summary>
         /// The type of schedule.
         /// </summary>
-        public ScheduleUnit ScheduleType
+        public RecurringScheduleUnit ScheduleType
         {
             get { return type; }
@@ -270 +227 @@
             get
             {
-                if (ScheduleType != ScheduleUnit.Daily && ScheduleType != ScheduleUnit.Weekly &&
-                    ScheduleType != ScheduleUnit.Monthly)
+                if (ScheduleType != RecurringScheduleUnit.Daily && ScheduleType != RecurringScheduleUnit.Weekly &&
+                    ScheduleType != RecurringScheduleUnit.Monthly)
                     throw new InvalidOperationException(S._("The ScheduleUnit of the schedule " +
                         "does not require a frequency value, this field would contain garbage."));
@@ -305 +262 @@
             get
             {
-                if (ScheduleType != ScheduleUnit.Weekly)
+                if (ScheduleType != RecurringScheduleUnit.Weekly)
                     throw new InvalidOperationException(S._("The ScheduleUnit of the schedule " +
                         "does not require the WeeklySchedule value, this field would contain garbage"));
@@ -329 +286 @@
             get
             {
-                if (ScheduleType != ScheduleUnit.Monthly)
+                if (ScheduleType != RecurringScheduleUnit.Monthly)
                     throw new InvalidOperationException(S._("The ScheduleUnit of the schedule does " +
                         "not require the MonthlySchedule value, this field would contain garbage"));
@@ -367 +324 @@
                 switch (ScheduleType)
                 {
-                    case ScheduleUnit.Daily:
+                    case RecurringScheduleUnit.Daily:
                     {
                         //First assume that it is today that we are running the schedule
@@ -379 +336 @@
                         break;
                     }
-                    case ScheduleUnit.Weekdays:
+                    case RecurringScheduleUnit.Weekdays:
                     {
                         while (nextRun < DateTime.Now ||
@@ -387 +344 @@
                         break;
                     }
-                    case ScheduleUnit.Weekly:
+                    case RecurringScheduleUnit.Weekly:
                     {
                         if (weeklySchedule == 0)
@@ -414 +371 @@
                         break;
                     }
-                    case ScheduleUnit.Monthly:
+                    case RecurringScheduleUnit.Monthly:
                         //Step the number of months since the last run
                         if (LastRun != DateTime.MinValue)
@@ -453 +410 @@
         private bool CanRunOnDay(DateTime date)
         {
-            if (ScheduleType != ScheduleUnit.Weekly)
+            if (ScheduleType != RecurringScheduleUnit.Weekly)
                 throw new ArgumentException(S._("The ScheduleUnit of the schedule does " +
                     "not use the WeeklySchedule value, this field would contain garbage"));
@@ -469 +426 @@
         }
 
-        private ScheduleUnit type;
+        private RecurringScheduleUnit type;
         private int frequency;
         private DateTime executionTime;
@@ -478 +435 @@
         private DateTime nextRun;
     }
+
+    /// <summary>
+    /// The types of schedule
+    /// </summary>
+    public enum RecurringScheduleUnit
+    {
+        /// <summary>
+        /// Daily schedule type
+        /// </summary>
+        Daily,
+
+        /// <summary>
+        /// Weekdays-only schedule type
+        /// </summary>
+        Weekdays,
+
+        /// <summary>
+        /// Weekly schedule type
+        /// </summary>
+        Weekly,
+
+        /// <summary>
+        /// Monthly schedule type
+        /// </summary>
+        Monthly
+    }
+
+    /// <summary>
+    /// The days of the week, with values usable in a bitfield.
+    /// </summary>
+    [Flags]
+    [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1714:FlagsEnumsShouldHavePluralNames")]
+    public enum DaysOfWeek
+    {
+        None = 0,
+        Sunday = 1 << DayOfWeek.Sunday,
+        Monday = 1 << DayOfWeek.Monday,
+        Tuesday = 1 << DayOfWeek.Tuesday,
+        Wednesday = 1 << DayOfWeek.Wednesday,
+        Thursday = 1 << DayOfWeek.Thursday,
+        Friday = 1 << DayOfWeek.Friday,
+        Saturday = 1 << DayOfWeek.Saturday
+    }
 }