Revision: 6606
http://skim-app.svn.sourceforge.net/skim-app/?rev=6606&view=rev
Author: hofman
Date: 2010-07-05 09:24:03 +0000 (Mon, 05 Jul 2010)
Log Message:
-----------
define some macros and static sets for string literals
Modified Paths:
--------------
trunk/PDFSelection_SKExtensions.m
Modified: trunk/PDFSelection_SKExtensions.m
===================================================================
--- trunk/PDFSelection_SKExtensions.m 2010-07-04 21:23:25 UTC (rev 6605)
+++ trunk/PDFSelection_SKExtensions.m 2010-07-05 09:24:03 UTC (rev 6606)
@@ -261,6 +261,10 @@
return range;
}
+#define TEXT_KEY @"text"
+#define RANGES_KEY @"ranges"
+#define CONTAINER_KEY @"container"
+
static NSArray
*characterRangesAndContainersForSpecifier(NSScriptObjectSpecifier *specifier,
BOOL continuous, BOOL continuousContainers) {
if ([specifier isKindOfClass:[NSScriptObjectSpecifier class]] == NO)
return nil;
@@ -268,7 +272,11 @@
NSMutableArray *rangeDicts = [NSMutableArray array];
NSString *key = [specifier key];
- if ([key isEqualToString:@"characters"] || [key isEqualToString:@"words"]
|| [key isEqualToString:@"paragraphs"] || [key
isEqualToString:@"attributeRuns"]) {
+ static NSSet *richTextElementKeys = nil;
+ if (richTextElementKeys == nil)
+ richTextElementKeys = [[NSSet alloc] initWithObjects:@"characters",
@"words", @"paragraphs", @"attributeRuns", nil];
+
+ if ([richTextElementKeys containsObject:key]) {
// get the richText specifier and textStorage
NSArray *dicts = characterRangesAndContainersForSpecifier([specifier
containerSpecifier], continuousContainers, continuousContainers);
@@ -276,8 +284,8 @@
return nil;
for (NSMutableDictionary *dict in dicts) {
- NSTextStorage *containerText = [dict objectForKey:@"text"];
- NSPointerArray *textRanges = [dict objectForKey:@"ranges"];
+ NSTextStorage *containerText = [dict objectForKey:TEXT_KEY];
+ NSPointerArray *textRanges = [dict objectForKey:RANGES_KEY];
NSUInteger ri, numRanges = [textRanges count];
NSPointerArray *ranges = [[NSPointerArray alloc]
initForRangePointers];
@@ -401,7 +409,7 @@
}
if ([ranges count]) {
- [dict setObject:ranges forKey:@"ranges"];
+ [dict setObject:ranges forKey:RANGES_KEY];
[rangeDicts addObject:dict];
}
[ranges release];
@@ -433,7 +441,7 @@
NSPointerArray *ranges = [[NSPointerArray alloc]
initForRangePointers];
NSRange range = NSMakeRange(0, [containerText length]);
[ranges addPointer:&range];
- NSMutableDictionary *dict = [[NSMutableDictionary alloc]
initWithObjectsAndKeys:ranges, @"ranges", containerText, @"text", container,
@"container", nil];
+ NSMutableDictionary *dict = [[NSMutableDictionary alloc]
initWithObjectsAndKeys:ranges, RANGES_KEY, containerText, TEXT_KEY, container,
CONTAINER_KEY, nil];
[rangeDicts addObject:dict];
[dict release];
[ranges release];
@@ -457,7 +465,10 @@
NSScriptObjectSpecifier *spec = [specifier objectAtIndex:0];
if ([spec isKindOfClass:[NSPropertySpecifier class]]) {
NSString *key = [spec key];
- if ([[NSSet setWithObjects:@"characters", @"words", @"paragraphs",
@"attributeRuns", @"richText", @"pages", nil] containsObject:key] == NO) {
+ static NSSet *selectionKeys = nil;
+ if (selectionKeys == nil)
+ selectionKeys = [[NSSet alloc] initWithObjects:@"characters",
@"words", @"paragraphs", @"attributeRuns", @"richText", @"pages", nil];
+ if ([selectionKeys containsObject:key] == NO) {
// this allows to use selection properties directly
specifier = [spec objectsByEvaluatingSpecifier];
if ([specifier isKindOfClass:[NSArray class]] == NO)
@@ -476,8 +487,8 @@
PDFDocument *doc = nil;
for (NSDictionary *dict in dicts) {
- id container = [dict objectForKey:@"container"];
- NSPointerArray *ranges = [dict objectForKey:@"ranges"];
+ id container = [dict objectForKey:CONTAINER_KEY];
+ NSPointerArray *ranges = [dict objectForKey:RANGES_KEY];
NSUInteger i, numRanges = [ranges count];
if ([container isKindOfClass:[SKMainDocument class]] && (doc ==
nil || [doc isEqual:[container pdfDocument]])) {
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 Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit