LupusNobilis
/
sogo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Monotone-Parent: 96d751786922d33162cb95008bfb6f6460b05db4 

Monotone-Revision: e1d77c8035a84435f5745fe6e47f1fb5c978d808

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2011-03-21T00:38:17
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Wolfgang Sourdeau 2011-03-21 00:38:17 +00:00
parent 071bdd863f
commit b62149d65f
4 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SOPE/NGCards/CardGroup.h
View File

@ -48,6 +48,8 @@
- (void) addChild: (CardElement *) aChild; - (void) addChild: (CardElement *) aChild;
- (void) addChildren: (NSArray *) someChildren; - (void) addChildren: (NSArray *) someChildren;
- (void) removeChild: (CardElement *) aChild;
- (void) removeChildren: (NSArray *) someChildren;
- (NSMutableArray *) children; - (NSMutableArray *) children;
- (CardElement *) firstChildWithTag: (NSString *) aTag; - (CardElement *) firstChildWithTag: (NSString *) aTag;

16
SOPE/NGCards/CardGroup.m
View File

@ -253,6 +253,22 @@ static NGCardsSaxHandler *sax = nil;
[self addChild: currentChild]; [self addChild: currentChild];
} }
- (void) removeChild: (CardElement *) aChild
{
[aChild setParent: nil];
[children removeObject: aChild];
}
- (void) removeChildren: (NSArray *) someChildren
{
CardElement *currentChild;
NSEnumerator *newChildren;
newChildren = [someChildren objectEnumerator];
while ((currentChild = [newChildren nextObject]))
[self removeChild: currentChild];
}
- (NSMutableArray *) children - (NSMutableArray *) children
{ {
return children; return children;

5
SOPE/NGCards/ChangeLog
View File

@ -1,3 +1,8 @@
2011-03-20 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* CardGroup.m (-removeChild:, -removeChildren:): new
self-explanatory methods.
2011-03-15 Wolfgang Sourdeau <wsourdeau@inverse.ca> 2011-03-15 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* NSString+NGCards.m (-asCardAttributeValues): rewritten method * NSString+NGCards.m (-asCardAttributeValues): rewritten method

11
SOPE/NGCards/iCalRepeatableEntityObject.m
View File

@ -54,7 +54,7 @@
- (void) removeAllRecurrenceRules - (void) removeAllRecurrenceRules
{ {
[children removeObjectsInArray: [self childrenWithTag: @"rrule"]]; [self removeChildren: [self recurrenceRules]];
} }
- (void) addToRecurrenceRules: (id) _rrule - (void) addToRecurrenceRules: (id) _rrule
@ -80,7 +80,7 @@
- (void) removeAllExceptionRules - (void) removeAllExceptionRules
{ {
[children removeObjectsInArray: [self childrenWithTag: @"exrule"]]; [self removeChildren: [self exceptionRules]];
} }
- (void) addToExceptionRules: (id) _rrule - (void) addToExceptionRules: (id) _rrule
@ -106,7 +106,7 @@
- (void) removeAllExceptionDates - (void) removeAllExceptionDates
{ {
[children removeObjectsInArray: [self childrenWithTag: @"exdate"]]; [self removeChildren: [self exceptionDates]];
} }
- (void) addToExceptionDates: (NSCalendarDate *) _rdate - (void) addToExceptionDates: (NSCalendarDate *) _rdate
@ -171,8 +171,7 @@
*/ */
- (NSArray *) exceptionDatesWithEventTimeZone: (iCalTimeZone *) theTimeZone - (NSArray *) exceptionDatesWithEventTimeZone: (iCalTimeZone *) theTimeZone
{ {
NSArray *exDates; NSArray *dates, *exDates;
NSMutableArray *dates;
NSEnumerator *dateList; NSEnumerator *dateList;
NSCalendarDate *exDate; NSCalendarDate *exDate;
NSString *dateString; NSString *dateString;
@ -190,7 +189,7 @@
{ {
dateString = [exDates objectAtIndex: i]; dateString = [exDates objectAtIndex: i];
exDate = [theTimeZone computedDateForString: dateString]; exDate = [theTimeZone computedDateForString: dateString];
[dates addObject: exDate]; [(NSMutableArray *) dates addObject: exDate];
} }
} }
} }