Monotone-Parent: b63f19817044870bee75b439abf67bc6b7e8ceca
Monotone-Revision: b4655ce05ca4a96336269d9d01dd4866945c8841 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2008-07-04T18:23:11 Monotone-Branch: ca.inverse.sogomaint-2.0.2
parent
b3487bdc71
commit
8fdb386bd1
|
@ -24,7 +24,6 @@
|
||||||
#import <Foundation/NSDictionary.h>
|
#import <Foundation/NSDictionary.h>
|
||||||
#import <Foundation/NSEnumerator.h>
|
#import <Foundation/NSEnumerator.h>
|
||||||
#import <Foundation/NSString.h>
|
#import <Foundation/NSString.h>
|
||||||
|
|
||||||
#import <SaxObjC/SaxXMLReader.h>
|
#import <SaxObjC/SaxXMLReader.h>
|
||||||
#import <SaxObjC/SaxXMLReaderFactory.h>
|
#import <SaxObjC/SaxXMLReaderFactory.h>
|
||||||
|
|
||||||
|
@ -70,9 +69,7 @@ static NGCardsSaxHandler *sax = nil;
|
||||||
+ (NSArray *) parseFromSource: (id) source
|
+ (NSArray *) parseFromSource: (id) source
|
||||||
{
|
{
|
||||||
static id <NSObject,SaxXMLReader> cardParser;
|
static id <NSObject,SaxXMLReader> cardParser;
|
||||||
NSMutableArray *cardGroups;
|
NSArray *cardGroups;
|
||||||
NSEnumerator *cards;
|
|
||||||
CardGroup *currentCard;
|
|
||||||
|
|
||||||
cardGroups = nil;
|
cardGroups = nil;
|
||||||
|
|
||||||
|
@ -83,18 +80,9 @@ static NGCardsSaxHandler *sax = nil;
|
||||||
|
|
||||||
if (parser)
|
if (parser)
|
||||||
{
|
{
|
||||||
cardGroups = [NSMutableArray new];
|
|
||||||
[cardGroups autorelease];
|
|
||||||
|
|
||||||
[parser parseFromSource: source];
|
[parser parseFromSource: source];
|
||||||
cards = [[sax cards] objectEnumerator];
|
|
||||||
|
cardGroups = [sax cards];
|
||||||
currentCard = [cards nextObject];
|
|
||||||
while (currentCard)
|
|
||||||
{
|
|
||||||
[cardGroups addObject: currentCard];
|
|
||||||
currentCard = [cards nextObject];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,8 @@
|
||||||
|
2008-07-04 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
|
* CardGroup.m ([CardGroup +parseFromSource:source]): directly
|
||||||
|
return the result from [sax cards] instead of creating a new array.
|
||||||
|
|
||||||
2008-07-03 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
2008-07-03 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||||
|
|
||||||
* iCalEvent.m ([iCalEvent -endDate]): if no DTEND is specified,
|
* iCalEvent.m ([iCalEvent -endDate]): if no DTEND is specified,
|
||||||
|
|
Loading…
Reference in New Issue