diff --git a/SOPE/NGCards/CardGroup.m b/SOPE/NGCards/CardGroup.m index d4e92de7a..d1c8c2482 100644 --- a/SOPE/NGCards/CardGroup.m +++ b/SOPE/NGCards/CardGroup.m @@ -24,7 +24,6 @@ #import #import #import - #import #import @@ -70,9 +69,7 @@ static NGCardsSaxHandler *sax = nil; + (NSArray *) parseFromSource: (id) source { static id cardParser; - NSMutableArray *cardGroups; - NSEnumerator *cards; - CardGroup *currentCard; + NSArray *cardGroups; cardGroups = nil; @@ -83,18 +80,9 @@ static NGCardsSaxHandler *sax = nil; if (parser) { - cardGroups = [NSMutableArray new]; - [cardGroups autorelease]; - [parser parseFromSource: source]; - cards = [[sax cards] objectEnumerator]; - - currentCard = [cards nextObject]; - while (currentCard) - { - [cardGroups addObject: currentCard]; - currentCard = [cards nextObject]; - } + + cardGroups = [sax cards]; } } diff --git a/SOPE/NGCards/ChangeLog b/SOPE/NGCards/ChangeLog index 2445bcb24..d5eb29030 100644 --- a/SOPE/NGCards/ChangeLog +++ b/SOPE/NGCards/ChangeLog @@ -1,3 +1,8 @@ +2008-07-04 Wolfgang Sourdeau + + * CardGroup.m ([CardGroup +parseFromSource:source]): directly + return the result from [sax cards] instead of creating a new array. + 2008-07-03 Wolfgang Sourdeau * iCalEvent.m ([iCalEvent -endDate]): if no DTEND is specified,