[Skim-app-commit] SF.net SVN: skim-app:[12638] trunk

[hofman--- via Skim-app-commit]

Revision: 12638
          http://sourceforge.net/p/skim-app/code/12638
Author:   hofman
Date:     2021-12-19 09:52:54 +0000 (Sun, 19 Dec 2021)
Log Message:
-----------
Rename objectSpecifier to objectSpecifiers for PDFSelection

Modified Paths:
--------------
    trunk/PDFAnnotationMarkup_SKExtensions.m
    trunk/PDFSelection_SKExtensions.h
    trunk/PDFSelection_SKExtensions.m
    trunk/SKJoinCommand.m
    trunk/SKMainDocument.m
    trunk/SKPreferencesCommand.m

Modified: trunk/PDFAnnotationMarkup_SKExtensions.m
===================================================================
--- trunk/PDFAnnotationMarkup_SKExtensions.m    2021-12-18 22:37:09 UTC (rev 
12637)
+++ trunk/PDFAnnotationMarkup_SKExtensions.m    2021-12-19 09:52:54 UTC (rev 
12638)
@@ -428,7 +428,7 @@
 
 - (id)selectionSpecifier {
     PDFSelection *sel = [self selection];
-    return [sel hasCharacters] ? [sel objectSpecifier] : [NSArray array];
+    return [sel hasCharacters] ? [sel objectSpecifiers] : [NSArray array];
 }
 
 - (NSArray *)scriptingPointLists {

Modified: trunk/PDFSelection_SKExtensions.h
===================================================================
--- trunk/PDFSelection_SKExtensions.h   2021-12-18 22:37:09 UTC (rev 12637)
+++ trunk/PDFSelection_SKExtensions.h   2021-12-19 09:52:54 UTC (rev 12638)
@@ -62,6 +62,6 @@
 
 + (id)selectionWithSpecifier:(id)specifier;
 + (id)selectionWithSpecifier:(id)specifier onPage:(PDFPage *)aPage;
-- (id)objectSpecifier;
+- (id)objectSpecifiers;
 
 @end

Modified: trunk/PDFSelection_SKExtensions.m
===================================================================
--- trunk/PDFSelection_SKExtensions.m   2021-12-18 22:37:09 UTC (rev 12637)
+++ trunk/PDFSelection_SKExtensions.m   2021-12-19 09:52:54 UTC (rev 12638)
@@ -587,7 +587,7 @@
     return range;
 }
 
-- (id)objectSpecifier {
+- (id)objectSpecifiers {
     NSMutableArray *ranges = [NSMutableArray array];
     for (PDFPage *page in [self pages]) {
         __block NSRange range = NSMakeRange(0, 0);

Modified: trunk/SKJoinCommand.m
===================================================================
--- trunk/SKJoinCommand.m       2021-12-18 22:37:09 UTC (rev 12637)
+++ trunk/SKJoinCommand.m       2021-12-19 09:52:54 UTC (rev 12638)
@@ -65,7 +65,7 @@
                 selection = [[firstPage document] selectionFromPage:firstPage 
atCharacterIndex:firstIndex toPage:lastPage atCharacterIndex:lastIndex];
         }
     }
-    return selection ? [selection objectSpecifier] : [NSArray array];
+    return selection ? [selection objectSpecifiers] : [NSArray array];
 }
 
 @end

Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m      2021-12-18 22:37:09 UTC (rev 12637)
+++ trunk/SKMainDocument.m      2021-12-19 09:52:54 UTC (rev 12638)
@@ -1759,7 +1759,7 @@
 
 - (id)selectionSpecifier {
     PDFSelection *sel = [[self pdfView] currentSelection];
-    return [sel hasCharacters] ? [sel objectSpecifier] : [NSArray array];
+    return [sel hasCharacters] ? [sel objectSpecifiers] : [NSArray array];
 }
 
 - (void)setSelectionSpecifier:(id)specifier {
@@ -2056,7 +2056,7 @@
             options |= NSCaseInsensitiveSearch;
         
         if ((selection = [[self pdfDocument] findString:text 
fromSelection:selection withOptions:options]))
-            specifier = [selection objectSpecifier];
+            specifier = [selection objectSpecifiers];
     }
     
     return specifier ?: [NSArray array];

Modified: trunk/SKPreferencesCommand.m
===================================================================
--- trunk/SKPreferencesCommand.m        2021-12-18 22:37:09 UTC (rev 12637)
+++ trunk/SKPreferencesCommand.m        2021-12-19 09:52:54 UTC (rev 12638)
@@ -43,7 +43,7 @@
 @implementation SKPreferencesCommand
 
 - (id)performDefaultImplementation {
-    id type = [[self evaluatedArguments] objectForKey:@"Type"];
+    id type = [[self evaluatedArguments] objectForKey:@"Type"] ?: [self 
directParameter];
     if ([type isKindOfClass:[NSString class]]) {
         return [[[SKNotePrefs alloc] initWithType:type] autorelease];
     } else if ([type isKindOfClass:[NSNumber class]]) {

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



_______________________________________________
Skim-app-commit mailing list
Skim-app-commit@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/skim-app-commit