From f80513f3dfe01d3b05d62f3be232af09742118c3 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 10 Mar 2008 14:17:11 +0000 Subject: [PATCH] Monotone-Parent: 64430bce96a9562bf8914d9e581ba26e9cbf2a9a Monotone-Revision: bc311597c5a4c1c647788bac37a0fdde7698b399 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-03-10T14:17:11 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 10 ++++++++++ SoObjects/SOGo/NSCalendarDate+SOGo.h | 5 +---- SoObjects/SOGo/NSCalendarDate+SOGo.m | 23 ----------------------- UI/Scheduler/UIxCalMonthViewOld.m | 22 ++++++++-------------- 4 files changed, 19 insertions(+), 41 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3aedecfb7..b2af91ff5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,13 @@ +2008-03-10 Wolfgang Sourdeau + + * UI/Scheduler/UIxCalMonthViewOld.m ([UIxCalMonthViewOld + -endDate]): removed useless method. + + * SoObjects/SOGo/NSCalendarDate+SOGo.m + ([-dayOfWeeK:_dayoffsetFromSunday:_offset]): removed useless + method. + ([-sundayOfWeek]): removed useless method. + 2008-03-07 Wolfgang Sourdeau * OGoContentStore/OCSContactFieldExtractor.m diff --git a/SoObjects/SOGo/NSCalendarDate+SOGo.h b/SoObjects/SOGo/NSCalendarDate+SOGo.h index 61ad14f1d..de31ca69a 100644 --- a/SoObjects/SOGo/NSCalendarDate+SOGo.h +++ b/SoObjects/SOGo/NSCalendarDate+SOGo.h @@ -34,11 +34,8 @@ inTimeZone: (NSTimeZone *) timeZone; - (BOOL) isDateInSameMonth: (NSCalendarDate *) _other; -- (NSCalendarDate *) dayOfWeeK: (unsigned) _day - offsetFromSunday: (unsigned) _off; -- (NSCalendarDate *) sundayOfWeek; -- (NSString *) shortDateString; +- (NSString *) shortDateString; - (NSString *) rfc822DateString; + (id) distantFuture; diff --git a/SoObjects/SOGo/NSCalendarDate+SOGo.m b/SoObjects/SOGo/NSCalendarDate+SOGo.m index 7da917186..46ac1f22c 100644 --- a/SoObjects/SOGo/NSCalendarDate+SOGo.m +++ b/SoObjects/SOGo/NSCalendarDate+SOGo.m @@ -83,29 +83,6 @@ static NSString *rfc822Months[] = {@"", @"Jan", @"Feb", @"Mar", @"Apr", ([_other monthOfYear] == [self monthOfYear])); } -- (NSCalendarDate *) dayOfWeeK: (unsigned) _day - offsetFromSunday: (unsigned) _offset -{ - unsigned dayOfWeek, distance; - - /* perform "locale" correction */ - dayOfWeek = (7 + [self dayOfWeek] - _offset) % 7; - - _day = (_day % 7); - if(_day == dayOfWeek) - return self; - - distance = _day - dayOfWeek; - return [self dateByAddingYears:0 months:0 days:distance]; -} - -/* this implies that monday is the start of week! */ - -- (NSCalendarDate *) sundayOfWeek -{ - return [self dayOfWeeK:6 offsetFromSunday:1]; -} - - (NSString *) shortDateString { NSString *str; diff --git a/UI/Scheduler/UIxCalMonthViewOld.m b/UI/Scheduler/UIxCalMonthViewOld.m index 292e98caf..d44de015d 100644 --- a/UI/Scheduler/UIxCalMonthViewOld.m +++ b/UI/Scheduler/UIxCalMonthViewOld.m @@ -7,27 +7,20 @@ @implementation UIxCalMonthViewOld -- (NSCalendarDate *)startOfMonth { +- (NSCalendarDate *) startOfMonth +{ return [[[super startDate] firstDayOfMonth] beginOfDay]; } -- (NSCalendarDate *)startDate { +- (NSCalendarDate *) startDate +{ return [[self startOfMonth] mondayOfWeek]; } -- (NSCalendarDate *)endDate { - NSCalendarDate *date; - - date = [self startOfMonth]; - date = [date dateByAddingYears:0 months:0 days:[date numberOfDaysInMonth] - hours:0 minutes:0 seconds:0]; - date = [[date sundayOfWeek] endOfDay]; - return date; -} - /* URLs */ -- (NSDictionary *)prevMonthQueryParameters { +- (NSDictionary *) prevMonthQueryParameters +{ NSCalendarDate *date; date = [[self startOfMonth] dateByAddingYears:0 months:-1 days:0 @@ -35,7 +28,8 @@ return [self queryParametersBySettingSelectedDate:date]; } -- (NSDictionary *)nextMonthQueryParameters { +- (NSDictionary *)nextMonthQueryParameters +{ NSCalendarDate *date; date = [[self startOfMonth] dateByAddingYears:0 months:1 days:0