Revision: 16238
http://sourceforge.net/p/skim-app/code/16238
Author: hofman
Date: 2026-05-07 16:44:08 +0000 (Thu, 07 May 2026)
Log Message:
-----------
rename methods
Modified Paths:
--------------
trunk/PDFPage_SKExtensions.m
trunk/PDFSelection_SKExtensions.h
trunk/PDFSelection_SKExtensions.m
trunk/SKJoinCommand.m
trunk/SKMainDocument.m
trunk/SKObtainCommand.m
trunk/SKReadingBar.m
trunk/SKSelectCommand.m
Modified: trunk/PDFPage_SKExtensions.m
===================================================================
--- trunk/PDFPage_SKExtensions.m 2026-05-06 22:01:38 UTC (rev 16237)
+++ trunk/PDFPage_SKExtensions.m 2026-05-07 16:44:08 UTC (rev 16238)
@@ -709,7 +709,7 @@
[[NSScriptCommand currentCommand] setScriptErrorString:@"PDF does
not support notes."];
} else if ([type isEqualToString:SKNHighlightString] || [type
isEqualToString:SKNStrikeOutString] || [type isEqualToString:SKNUnderlineString
]) {
id selSpec = contentsValue ?: [[[[NSScriptCommand currentCommand]
arguments] objectForKey:@"KeyDictionary"]
objectForKey:SKPDFAnnotationSelectionSpecifierKey];
- PDFSelection *selection = [selSpec isKindOfClass:[PDFSelection
class]] ? selSpec : selSpec ? [PDFSelection selectionWithSpecifier:selSpec] :
nil;
+ PDFSelection *selection = [selSpec isKindOfClass:[PDFSelection
class]] ? selSpec : selSpec ? [PDFSelection selectionWithSpecifiers:selSpec] :
nil;
[props removeObjectForKey:SKPDFAnnotationSelectionSpecifierKey];
if (selSpec == nil) {
[[NSScriptCommand currentCommand]
setScriptErrorNumber:NSRequiredArgumentsMissingScriptError];
Modified: trunk/PDFSelection_SKExtensions.h
===================================================================
--- trunk/PDFSelection_SKExtensions.h 2026-05-06 22:01:38 UTC (rev 16237)
+++ trunk/PDFSelection_SKExtensions.h 2026-05-07 16:44:08 UTC (rev 16238)
@@ -64,8 +64,8 @@
- (NSArray<PDFSelection *> *)connectedSelectionsOnPage:(nullable PDFPage
*)page;
-+ (nullable instancetype)selectionWithSpecifier:(nullable id)specifier;
-+ (nullable instancetype)selectionWithSpecifier:(nullable id)specifier
onPage:(nullable PDFPage *)aPage;
++ (nullable instancetype)selectionWithSpecifiers:(nullable id)specifier;
++ (nullable instancetype)selectionWithSpecifiers:(nullable id)specifier
onPage:(nullable PDFPage *)aPage;
@property (nonatomic, nullable, readonly) id objectSpecifiers;
@end
Modified: trunk/PDFSelection_SKExtensions.m
===================================================================
--- trunk/PDFSelection_SKExtensions.m 2026-05-06 22:01:38 UTC (rev 16237)
+++ trunk/PDFSelection_SKExtensions.m 2026-05-07 16:44:08 UTC (rev 16238)
@@ -528,11 +528,11 @@
return rangeDicts;
}
-+ (instancetype)selectionWithSpecifier:(id)specifier {
- return [self selectionWithSpecifier:specifier onPage:nil];
++ (instancetype)selectionWithSpecifiers:(id)specifier {
+ return [self selectionWithSpecifiers:specifier onPage:nil];
}
-+ (instancetype)selectionWithSpecifier:(id)specifier onPage:(PDFPage *)aPage {
++ (instancetype)selectionWithSpecifiers:(id)specifier onPage:(PDFPage *)aPage {
if (specifier == nil || [specifier isEqual:[NSNull null]])
return nil;
if ([specifier isKindOfClass:[NSPropertySpecifier class]] &&
Modified: trunk/SKJoinCommand.m
===================================================================
--- trunk/SKJoinCommand.m 2026-05-06 22:01:38 UTC (rev 16237)
+++ trunk/SKJoinCommand.m 2026-05-07 16:44:08 UTC (rev 16238)
@@ -47,8 +47,8 @@
id dP = [self directParameter];
id other = [[self arguments] objectForKey:@"To"];
BOOL continuous = [[[self evaluatedArguments] objectForKey:@"Continuous"]
boolValue];
- PDFSelection *selection = [PDFSelection selectionWithSpecifier:dP];
- PDFSelection *otherSelection = other ? [PDFSelection
selectionWithSpecifier:other] : nil;
+ PDFSelection *selection = [PDFSelection selectionWithSpecifiers:dP];
+ PDFSelection *otherSelection = other ? [PDFSelection
selectionWithSpecifiers:other] : nil;
if (selection == nil)
selection = otherSelection;
Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m 2026-05-06 22:01:38 UTC (rev 16237)
+++ trunk/SKMainDocument.m 2026-05-07 16:44:08 UTC (rev 16238)
@@ -1816,7 +1816,7 @@
}
- (void)setSelectionSpecifier:(id)specifier {
- PDFSelection *selection = [PDFSelection selectionWithSpecifier:specifier];
+ PDFSelection *selection = [PDFSelection selectionWithSpecifiers:specifier];
[[self pdfView] setCurrentSelection:selection];
}
@@ -1913,7 +1913,7 @@
if ([key isEqualToString:@"notes"]) {
PDFAnnotation *annotation = nil;
id selSpec = contentsValue ?: [[[[NSScriptCommand currentCommand]
arguments] objectForKey:@"KeyDictionary"]
objectForKey:SKPDFAnnotationSelectionSpecifierKey];
- PDFSelection *sel = selSpec ? [PDFSelection
selectionWithSpecifier:selSpec] : nil;
+ PDFSelection *sel = selSpec ? [PDFSelection
selectionWithSpecifiers:selSpec] : nil;
PDFPage *page = [sel safeFirstPage];
if (page == nil || [page document] != [self pdfDocument]) {
[[NSScriptCommand currentCommand]
setScriptErrorNumber:NSReceiversCantHandleCommandScriptError];
@@ -2078,7 +2078,7 @@
source = nil;
[[self synchronizer] findPageAndLocationForLine:[location
integerValue] inFile:[source path] fromPageIndex:[[[self pdfView] currentPage]
pageIndex] options:options];
} else {
- PDFSelection *selection = [PDFSelection
selectionWithSpecifier:[[command arguments] objectForKey:@"To"]];
+ PDFSelection *selection = [PDFSelection
selectionWithSpecifiers:[[command arguments] objectForKey:@"To"]];
if ([selection hasCharacters]) {
PDFPage *page = [selection safeFirstPage];
NSRect bounds = [selection boundsForPage:page];
@@ -2104,7 +2104,7 @@
NSInteger options = 0;
if (from)
- selection = [PDFSelection selectionWithSpecifier:from];
+ selection = [PDFSelection selectionWithSpecifiers:from];
if ([backward isKindOfClass:[NSNumber class]] && [backward boolValue])
options |= NSBackwardsSearch;
Modified: trunk/SKObtainCommand.m
===================================================================
--- trunk/SKObtainCommand.m 2026-05-06 22:01:38 UTC (rev 16237)
+++ trunk/SKObtainCommand.m 2026-05-07 16:44:08 UTC (rev 16238)
@@ -74,7 +74,7 @@
if ([data isKindOfClass:[NSData class]] == NO) {
data = nil;
- selection = [PDFSelection selectionWithSpecifier:[[self arguments]
objectForKey:@"Object"] onPage:page];
+ selection = [PDFSelection selectionWithSpecifiers:[[self arguments]
objectForKey:@"Object"] onPage:page];
} else if (type == typeSInt32 || type == typeQDRectangle || type ==
typeNSRectangle || type == typePage) {
[self setScriptErrorNumber:NSOperationNotSupportedForKeyScriptError];
return nil;
Modified: trunk/SKReadingBar.m
===================================================================
--- trunk/SKReadingBar.m 2026-05-06 22:01:38 UTC (rev 16237)
+++ trunk/SKReadingBar.m 2026-05-07 16:44:08 UTC (rev 16238)
@@ -323,7 +323,7 @@
[[(SKMainDocument *)[page containingDocument] synchronizer]
findPageAndLocationForLine:[location integerValue] inFile:[source path]
fromPageIndex:[page pageIndex] options:options];
return;
} else {
- PDFSelection *selection = [[[PDFSelection
selectionWithSpecifier:[[command arguments] objectForKey:@"To"]]
selectionsByLine] firstObject];
+ PDFSelection *selection = [[[PDFSelection
selectionWithSpecifiers:[[command arguments] objectForKey:@"To"]]
selectionsByLine] firstObject];
if ([selection hasCharacters]) {
aPage = [selection safeFirstPage];
NSRect rect = [selection boundsForPage:aPage];
Modified: trunk/SKSelectCommand.m
===================================================================
--- trunk/SKSelectCommand.m 2026-05-06 22:01:38 UTC (rev 16237)
+++ trunk/SKSelectCommand.m 2026-05-07 16:44:08 UTC (rev 16238)
@@ -64,7 +64,7 @@
} else if ([dP isEqual:@[]]) {
doc = [self evaluatedSubjects];
} else {
- selection = [PDFSelection selectionWithSpecifier:dP];
+ selection = [PDFSelection selectionWithSpecifiers:dP];
doc = [[[selection pages] firstObject] containingDocument];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
