Revision: 2869
http://skim-app.svn.sourceforge.net/skim-app/?rev=2869&view=rev
Author: hofman
Date: 2007-09-09 14:16:16 -0700 (Sun, 09 Sep 2007)
Log Message:
-----------
Simplify some code using convenience methods.
Modified Paths:
--------------
trunk/SKFDFParser.m
Modified: trunk/SKFDFParser.m
===================================================================
--- trunk/SKFDFParser.m 2007-09-09 21:04:19 UTC (rev 2868)
+++ trunk/SKFDFParser.m 2007-09-09 21:16:16 UTC (rev 2869)
@@ -192,29 +192,21 @@
- (NSArray *)noteDictionaries {
NSMutableArray *array = nil;
NSDictionary *trailer;
- SKIndirectObject *root;
- NSDictionary *rootDict;
+ NSDictionary *root;
NSDictionary *fdfDict;
NSArray *annots;
- if ((trailer = [fdfDictionary objectForKey:@"trailer"]) &&
- ([trailer isKindOfClass:[NSDictionary class]]) &&
- (root = [trailer objectForKey:@"Root"]) &&
- ([root isKindOfClass:[SKIndirectObject class]]) &&
- (rootDict = [fdfDictionary objectForKey:root]) &&
- ([rootDict isKindOfClass:[NSDictionary class]]) &&
- (fdfDict = [rootDict objectForKey:@"FDF"]) &&
- ([fdfDict isKindOfClass:[NSDictionary class]]) &&
- (annots = [fdfDict objectForKey:@"Annots"]) &&
- ([annots isKindOfClass:[NSArray class]])) {
+ if ((trailer = [self dictionaryValue:[fdfDictionary
objectForKey:@"trailer"]]) &&
+ (root = [self dictionaryValue:[trailer objectForKey:@"Root"]]) &&
+ (fdfDict = [self dictionaryValue:[root objectForKey:@"FDF"]]) &&
+ (annots = [self arrayValue:[fdfDict objectForKey:@"Annots"]])) {
NSEnumerator *annotEnum = [annots objectEnumerator];
NSDictionary *dict;
- array = [NSMutableArray array];
+ array = [NSMutableArray arrayWithCapacity:[annots count]];
while (dict = [annotEnum nextObject]) {
- if ((dict = [self dictionaryValue:dict]) &&
- (dict = [self noteDictionary:dict]))
+ if (dict = [self noteDictionary:[self dictionaryValue:dict]])
[array addObject:dict];
}
}
@@ -249,7 +241,7 @@
NSSet *validTypes = [NSSet setWithObjects:@"FreeText", @"Note", @"Circle",
@"Square", @"Highlight", @"Underline", @"StrikeOut", @"Line", nil];
NSEnumerator *keyEnum = [dict keyEnumerator];
NSString *key;
- BOOL success = YES;
+ BOOL success = dict != nil;
while (success && (key = [keyEnum nextObject])) {
id value = [dict valueForKey:key];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
