[Skim-app-commit] SF.net SVN: skim-app:[7393] trunk/PDFSelection_SKExtensions.m

[<ho...@us...>]

Revision: 7393
          http://skim-app.svn.sourceforge.net/skim-app/?rev=7393&view=rev
Author:   hofman
Date:     2011-07-26 17:27:44 +0000 (Tue, 26 Jul 2011)

Log Message:
-----------
reorganize selection inspection methods

Modified Paths:
--------------
    trunk/PDFSelection_SKExtensions.m

Modified: trunk/PDFSelection_SKExtensions.m
===================================================================
--- trunk/PDFSelection_SKExtensions.m	2011-07-26 14:04:07 UTC (rev 7392)
+++ trunk/PDFSelection_SKExtensions.m	2011-07-26 17:27:44 UTC (rev 7393)
@@ -161,99 +161,44 @@
     return NSNotFound;
 }
 
-- (PDFPage *)safeFirstPage {
+- (PDFPage *)safePage:(PDFPage *)page {
     if ([self respondsToSelector:@selector(numberOfTextRangesOnPage:)] && [self respondsToSelector:@selector(rangeAtIndex:onPage:)]) {
-        for (PDFPage *page in [self pages]) {
-            NSInteger i, count = [self numberOfTextRangesOnPage:page];
-            for (i = 0; i < count; i++) {
-                if ([self rangeAtIndex:i onPage:page].length > 0)
-                    return page;
-            }
-        }
-    } else if ([self respondsToSelector:@selector(indexOfCharactersOnPage:)]) {
-        for (PDFPage *page in [self pages]) {
-            NSIndexSet *indexes = [self indexOfCharactersOnPage:page];
-            if (indexes && [indexes firstIndex] != NSNotFound)
+        NSInteger i, count = [self numberOfTextRangesOnPage:page];
+        for (i = 0; i < count; i++) {
+            if ([self rangeAtIndex:i onPage:page].length > 0)
                 return page;
         }
+    } else if ([self respondsToSelector:@selector(indexOfCharactersOnPage:)]) {
+        NSIndexSet *indexes = [self indexOfCharactersOnPage:page];
+        if (indexes && [indexes firstIndex] != NSNotFound)
+            return page;
     } else if ([self respondsToSelector:@selector(numberOfRangesOnPage:)] && [self respondsToSelector:@selector(rangeAtIndex:onPage:)]) {
-        for (PDFPage *page in [self pages]) {
-            NSInteger i, count = [self numberOfRangesOnPage:page];
-            for (i = 0; i < count; i++) {
-                if ([self rangeAtIndex:i onPage:page].length > 0)
-                    return page;
-            }
-        }
-    } else {
-        for (PDFPage *page in [self pages]) {
-            if (NSIsEmptyRect([self boundsForPage:page]) == NO)
+        NSInteger i, count = [self numberOfRangesOnPage:page];
+        for (i = 0; i < count; i++) {
+            if ([self rangeAtIndex:i onPage:page].length > 0)
                 return page;
         }
+    } else {
+        if (NSIsEmptyRect([self boundsForPage:page]) == NO)
+            return page;
     }
     return nil;
 }
 
+- (PDFPage *)safeFirstPage {
+    for (PDFPage *page in [self pages])
+        return [self safePage:page];
+    return nil;
+}
+
 - (PDFPage *)safeLastPage {
-    if ([self respondsToSelector:@selector(numberOfTextRangesOnPage:)] && [self respondsToSelector:@selector(rangeAtIndex:onPage:)]) {
-        for (PDFPage *page in [[self pages] reverseObjectEnumerator]) {
-            NSInteger i, count = [self numberOfTextRangesOnPage:page];
-            for (i = 0; i < count; i++) {
-                if ([self rangeAtIndex:i onPage:page].length > 0)
-                    return page;
-            }
-        }
-    } else if ([self respondsToSelector:@selector(indexOfCharactersOnPage:)]) {
-        for (PDFPage *page in [[self pages] reverseObjectEnumerator]) {
-            NSIndexSet *indexes = [self indexOfCharactersOnPage:page];
-            if (indexes && [indexes firstIndex] != NSNotFound)
-                return page;
-        }
-    } else if ([self respondsToSelector:@selector(numberOfRangesOnPage:)] && [self respondsToSelector:@selector(rangeAtIndex:onPage:)]) {
-        for (PDFPage *page in [[self pages] reverseObjectEnumerator]) {
-            NSInteger i, count = [self numberOfRangesOnPage:page];
-            for (i = 0; i < count; i++) {
-                if ([self rangeAtIndex:i onPage:page].length > 0)
-                    return page;
-            }
-        }
-    } else {
-        for (PDFPage *page in [[self pages] reverseObjectEnumerator]) {
-            if (NSIsEmptyRect([self boundsForPage:page]) == NO)
-                return page;
-        }
-    }
+    for (PDFPage *page in [[self pages] reverseObjectEnumerator])
+        return [self safePage:page];
     return nil;
 }
 
 - (BOOL)hasCharacters {
-    if ([self respondsToSelector:@selector(numberOfTextRangesOnPage:)] && [self respondsToSelector:@selector(rangeAtIndex:onPage:)]) {
-        for (PDFPage *page in [self pages]) {
-            NSInteger i, count = [self numberOfTextRangesOnPage:page];
-            for (i = 0; i < count; i++) {
-                if ([self rangeAtIndex:i onPage:page].length > 0)
-                    return YES;
-            }
-        }
-        return NO;
-    } else if ([self respondsToSelector:@selector(indexOfCharactersOnPage:)]) {
-        for (PDFPage *page in [self pages]) {
-            NSIndexSet *indexes = [self indexOfCharactersOnPage:page];
-            if (indexes && [indexes firstIndex] != NSNotFound)
-                return YES;
-        }
-        return NO;
-    } else if ([self respondsToSelector:@selector(numberOfRangesOnPage:)] && [self respondsToSelector:@selector(rangeAtIndex:onPage:)]) {
-        for (PDFPage *page in [self pages]) {
-            NSInteger i, count = [self numberOfRangesOnPage:page];
-            for (i = 0; i < count; i++) {
-                if ([self rangeAtIndex:i onPage:page].length > 0)
-                    return YES;
-            }
-        }
-        return NO;
-    } else {
-        return [[self string] length] > 0;
-    }
+    return [self safeFirstPage] != nil;
 }
 
 static inline NSRange rangeOfSubstringOfStringAtIndex(NSString *string, NSArray *substrings, NSUInteger anIndex) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.