added -isNotEmpty to NSData

[sope] / sope-core / NGExtensions / NGCalendarDateRange.m

diff --git a/sope-core/NGExtensions/NGCalendarDateRange.m b/sope-core/NGExtensions/NGCalendarDateRange.m
index baed5ff5ad76cc223382990aebd873692ffed82b..3e491fa70308539ca69bbb296716eee1d3b5722f 100644 (file)
--- a/sope-core/NGExtensions/NGCalendarDateRange.m
+++ b/sope-core/NGExtensions/NGCalendarDateRange.m
@@ -125,9 +125,16 @@
   return [NGCalendarDateRange calendarDateRangeWithStartDate:a endDate:b];
 }
 
-- (BOOL)containsDate:(NSCalendarDate *)date {
-  return ([self->startDate earlierDate:date] == self->startDate && 
-         [self->endDate compare:date] == NSOrderedDescending) ? YES : NO;
+- (BOOL)containsDate:(NSCalendarDate *)_date {
+  NSComparisonResult result;
+  
+  result = [self->startDate compare:_date];
+  if (!((result == NSOrderedSame) || (result == NSOrderedAscending)))
+    return NO;
+  result = [self->endDate compare:_date];
+  if (result == NSOrderedAscending)
+    return NO;
+  return YES;
 }
 
 - (BOOL)containsDateRange:(NGCalendarDateRange *)_range {
@@ -189,6 +196,7 @@
 
 @end /* NGCalendarDateRange */
 
+
 @implementation NSArray(NGCalendarDateRanges)
 
 - (NSArray *)arrayByCreatingDateRangesFromObjectsWithStartDateKey:(NSString *)s