Revision: 28341
http://sourceforge.net/p/bibdesk/svn/28341
Author: hofman
Date: 2023-09-13 16:23:42 +0000 (Wed, 13 Sep 2023)
Log Message:
-----------
no need for separate method to add periods to date
Modified Paths:
--------------
trunk/bibdesk/NSDate_BDSKExtensions.h
trunk/bibdesk/NSDate_BDSKExtensions.m
Modified: trunk/bibdesk/NSDate_BDSKExtensions.h
===================================================================
--- trunk/bibdesk/NSDate_BDSKExtensions.h 2023-09-13 14:38:03 UTC (rev
28340)
+++ trunk/bibdesk/NSDate_BDSKExtensions.h 2023-09-13 16:23:42 UTC (rev
28341)
@@ -72,7 +72,6 @@
- (NSString *)standardDescription;
- (NSDate *)startOfPeriod:(BDSKPeriod)period;
-- (NSDate *)dateByAddingAmount:(NSInteger)offset ofPeriod:(BDSKPeriod)period;
- (NSDate *)startOfPeriod:(BDSKPeriod)period byAdding:(NSInteger)offset;
@end
Modified: trunk/bibdesk/NSDate_BDSKExtensions.m
===================================================================
--- trunk/bibdesk/NSDate_BDSKExtensions.m 2023-09-13 14:38:03 UTC (rev
28340)
+++ trunk/bibdesk/NSDate_BDSKExtensions.m 2023-09-13 16:23:42 UTC (rev
28341)
@@ -305,38 +305,36 @@
return date;
}
-- (NSDate *)dateByAddingAmount:(NSInteger)offset ofPeriod:(BDSKPeriod)period {
- NSDateComponents *components = [[NSDateComponents alloc] init];
- [components setDay:0];
- [components setMonth:0];
- [components setYear:0];
- switch (period) {
- case BDSKPeriodDay:
- [components setDay:offset];
- break;
- case BDSKPeriodWeek:
- [components setWeekday:0];
- [components setWeekOfYear:offset];
- [components setDay:NSUndefinedDateComponent];
- [components setMonth:NSUndefinedDateComponent];
- break;
- case BDSKPeriodMonth:
- [components setMonth:offset];
- break;
- case BDSKPeriodYear:
- [components setYear:offset];
- break;
- default:
- NSLog(@"Unknown period %ld", (long)period);
- break;
+- (NSDate *)startOfPeriod:(BDSKPeriod)period byAdding:(NSInteger)offset {
+ NSDate *date = self;
+ if (offset != 0) {
+ NSDateComponents *components = [[NSDateComponents alloc] init];
+ [components setDay:0];
+ [components setMonth:0];
+ [components setYear:0];
+ switch (period) {
+ case BDSKPeriodDay:
+ [components setDay:offset];
+ break;
+ case BDSKPeriodWeek:
+ [components setWeekday:0];
+ [components setWeekOfYear:offset];
+ [components setDay:NSUndefinedDateComponent];
+ [components setMonth:NSUndefinedDateComponent];
+ break;
+ case BDSKPeriodMonth:
+ [components setMonth:offset];
+ break;
+ case BDSKPeriodYear:
+ [components setYear:offset];
+ break;
+ default:
+ NSLog(@"Unknown period %ld", (long)period);
+ break;
+ }
+ date = [[NSCalendar currentCalendar] dateByAddingComponents:components
toDate:self options:0];
+ [components release];
}
- NSDate *date = [[NSCalendar currentCalendar]
dateByAddingComponents:components toDate:self options:0];
- [components release];
- return date;
-}
-
-- (NSDate *)startOfPeriod:(BDSKPeriod)period byAdding:(NSInteger)offset {
- NSDate *date = offset == 0 ? self : [self dateByAddingAmount:offset
ofPeriod:period];
return [date startOfPeriod:period];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
