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

Timestamp:

4/28/2009 12:13:51 PM (4 years ago)

Author:

lowjoel

Message:

Ran static code analysis on Manager.

-Do not initialise class members to default values (runtime will handle that)
-Deserialisation constructors should be marked protected for unsealed classes
-Classes implementing ICollection should end with Collection (Mainly fixed here is ErasureTargetsCollection?)
-ISerializable.GetObjectData? should be marked virtual
-Use proper camel casing (Prng, Guid, FileName? etc)
-Enumeration values should be Camel casing
-Bitfields should be marked with the [Flags] attribute
-Implement the proper IDisposable pattern - one Dispose() and one Dispose(bool) - the latter doing the clean ups for both Dispose and finalisers
-public variables should instead be properties
-Abstract classes should have protected constructors
-Renamed Schedule.Type to Schedule.ScheduleType? to prevent ambiguity with GetType?()
-There shouldn't be a need to pass reference variables by reference

File:

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

branches/eraser6/Manager/Schedule.cs

@@ -128 +128 @@
                 switch (type)
                 {
-                    case ScheduleUnit.DAILY:
+                    case ScheduleUnit.Daily:
                         if (frequency != 1)
                             result = S._("Once every {0} days", frequency);
@@ -134 +134 @@
                             result = S._("Once every day");
                         break;
-                    case ScheduleUnit.WEEKDAYS:
+                    case ScheduleUnit.Weekdays:
                         result = S._("Every weekday");
                         break;
-                    case ScheduleUnit.WEEKLY:
-                        if ((weeklySchedule & DaysOfWeek.MONDAY) != 0)
+                    case ScheduleUnit.Weekly:
+                        if ((weeklySchedule & DaysOfWeek.Monday) != 0)
                             result = S._("Every Monday, {0}");
-                        if ((weeklySchedule & DaysOfWeek.TUESDAY) != 0)
+                        if ((weeklySchedule & DaysOfWeek.Tuesday) != 0)
                             result += S._("Every Tuesday, {0}");
-                        if ((weeklySchedule & DaysOfWeek.WEDNESDAY) != 0)
+                        if ((weeklySchedule & DaysOfWeek.Wednesday) != 0)
                             result += S._("Every Wednesday, {0}");
-                        if ((weeklySchedule & DaysOfWeek.THURSDAY) != 0)
+                        if ((weeklySchedule & DaysOfWeek.Thursday) != 0)
                             result += S._("Every Thursday, {0}");
-                        if ((weeklySchedule & DaysOfWeek.FRIDAY) != 0)
+                        if ((weeklySchedule & DaysOfWeek.Friday) != 0)
                             result += S._("Every Friday, {0}");
-                        if ((weeklySchedule & DaysOfWeek.SATURDAY) != 0)
+                        if ((weeklySchedule & DaysOfWeek.Saturday) != 0)
                             result += S._("Every Saturday, {0}");
-                        if ((weeklySchedule & DaysOfWeek.SUNDAY) != 0)
+                        if ((weeklySchedule & DaysOfWeek.Sunday) != 0)
                             result += S._("Every Sunday, {0}");
 
@@ -157 +157 @@
                             S._("once every {0} weeks.", frequency));
                         break;
-                    case ScheduleUnit.MONTHLY:
+                    case ScheduleUnit.Monthly:
                         if (frequency == 1)
                             result = S._("On day {0} of every month", monthlySchedule);
@@ -212 +212 @@
             /// Daily schedule type
             /// </summary>
-            DAILY,
+            Daily,
 
             /// <summary>
             /// Weekdays-only schedule type
             /// </summary>
-            WEEKDAYS,
+            Weekdays,
 
             /// <summary>
             /// Weekly schedule type
             /// </summary>
-            WEEKLY,
+            Weekly,
 
             /// <summary>
             /// Monthly schedule type
             /// </summary>
-            MONTHLY
+            Monthly
         }
 
@@ -233 +233 @@
         /// The days of the week, with values usable in a bitfield.
         /// </summary>
+        [Flags]
         public enum DaysOfWeek
         {
-            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
+            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
         }
 
@@ -247 +249 @@
         /// The type of schedule.
         /// </summary>
-        public ScheduleUnit Type
+        public ScheduleUnit ScheduleType
         {
             get { return type; }
@@ -261 +263 @@
             get
             {
-                if (Type != ScheduleUnit.DAILY && Type != ScheduleUnit.WEEKLY &&
-                    Type != ScheduleUnit.MONTHLY)
+                if (ScheduleType != ScheduleUnit.Daily && ScheduleType != ScheduleUnit.Weekly &&
+                    ScheduleType != ScheduleUnit.Monthly)
                     throw new ArgumentException(S._("The ScheduleUnit of the schedule does " +
                         "not require a frequency value, this field would contain garbage."));
@@ -296 +298 @@
             get
             {
-                if (Type != ScheduleUnit.WEEKLY)
+                if (ScheduleType != ScheduleUnit.Weekly)
                     throw new ArgumentException(S._("The ScheduleUnit of the schedule does " +
                         "not require the WeeklySchedule value, this field would contain garbage"));
@@ -320 +322 @@
             get
             {
-                if (Type != ScheduleUnit.MONTHLY)
+                if (ScheduleType != ScheduleUnit.Monthly)
                     throw new ArgumentException(S._("The ScheduleUnit of the schedule does " +
                         "not require the MonthlySchedule value, this field would contain garbage"));
@@ -356 +358 @@
                 nextRun = nextRun.AddSeconds(executionTime.Second - nextRun.Second);
 
-                switch (Type)
+                switch (ScheduleType)
                 {
-                    case ScheduleUnit.DAILY:
+                    case ScheduleUnit.Daily:
                     {
                         //First assume that it is today that we are running the schedule
@@ -370 +372 @@
                         break;
                     }
-                    case ScheduleUnit.WEEKDAYS:
+                    case ScheduleUnit.Weekdays:
                     {
                         while (nextRun < DateTime.Now ||
@@ -378 +380 @@
                         break;
                     }
-                    case ScheduleUnit.WEEKLY:
+                    case ScheduleUnit.Weekly:
                     {
                         if (weeklySchedule == 0)
@@ -405 +407 @@
                         break;
                     }
-                    case ScheduleUnit.MONTHLY:
+                    case ScheduleUnit.Monthly:
                         //Step the number of months since the last run
                         if (LastRun != DateTime.MinValue)
@@ -444 +446 @@
         private bool CanRunOnDay(DateTime date)
         {
-            if (Type != ScheduleUnit.WEEKLY)
+            if (ScheduleType != ScheduleUnit.Weekly)
                 throw new ArgumentException(S._("The ScheduleUnit of the schedule does " +
                     "not use the WeeklyScheduly value, this field would contain garbage"));