Revision: 16146
http://sourceforge.net/p/skim-app/code/16146
Author: hofman
Date: 2026-04-02 14:17:27 +0000 (Thu, 02 Apr 2026)
Log Message:
-----------
separate intiializers for bookmarks with and without snapshots
Modified Paths:
--------------
trunk/NSDocument_SKExtensions.m
trunk/SKBookmark.h
trunk/SKBookmark.m
trunk/SKBookmarkController.m
Modified: trunk/NSDocument_SKExtensions.m
===================================================================
--- trunk/NSDocument_SKExtensions.m 2026-04-02 09:13:32 UTC (rev 16145)
+++ trunk/NSDocument_SKExtensions.m 2026-04-02 14:17:27 UTC (rev 16146)
@@ -164,7 +164,7 @@
{
PDFPage *page = [self currentPage];
NSUInteger pageIndex = page ? [page pageIndex] :
NSNotFound;
- bookmark = [[SKBookmark alloc] initWithURL:[self
fileURL] pageIndex:pageIndex snapshots:nil label:label];
+ bookmark = [[SKBookmark alloc] initWithURL:[self
fileURL] pageIndex:pageIndex label:label];
break;
}
case SKAddBookmarkTypeSetup:
Modified: trunk/SKBookmark.h
===================================================================
--- trunk/SKBookmark.h 2026-04-02 09:13:32 UTC (rev 16145)
+++ trunk/SKBookmark.h 2026-04-02 14:17:27 UTC (rev 16146)
@@ -54,7 +54,8 @@
+ (NSArray<SKBookmark *> *)bookmarksForURLs:(NSArray<NSURL *> *)urls;
-- (nullable instancetype)initWithURL:(NSURL *)aURL
pageIndex:(NSUInteger)aPageIndex snapshots:(nullable
NSArray<NSDictionary<NSString *, id> *> *)aSnapshots label:(nullable NSString
*)aLabel;
+- (nullable instancetype)initWithURL:(NSURL *)aURL
pageIndex:(NSUInteger)aPageIndex label:(NSString *)aLabel;
+- (nullable instancetype)initWithURL:(NSURL *)aURL
pageIndex:(NSUInteger)aPageIndex snapshots:(nullable
NSArray<NSDictionary<NSString *, id> *> *)aSnapshots;
- (nullable instancetype)initWithSetup:(NSDictionary<NSString *, id>
*)aSetupDict label:(nullable NSString *)aLabel;
- (nullable instancetype)initFolderWithChildren:(nullable NSArray<SKBookmark
*> *)aChildren label:(nullable NSString *)aLabel;
- (nullable instancetype)initRootWithChildrenProperties:(nullable
NSArray<NSDictionary<NSString *, id> *> *)childrenProperties;
Modified: trunk/SKBookmark.m
===================================================================
--- trunk/SKBookmark.m 2026-04-02 09:13:32 UTC (rev 16145)
+++ trunk/SKBookmark.m 2026-04-02 14:17:27 UTC (rev 16146)
@@ -73,6 +73,7 @@
NSUInteger pageIndex;
NSDictionary *setup;
}
+- (nullable instancetype)initWithURL:(NSURL *)aURL
pageIndex:(NSUInteger)aPageIndex snapshots:(nullable
NSArray<NSDictionary<NSString *, id> *> *)aSnapshots label:(nullable NSString
*)aLabel;
@end
@interface SKFolderBookmark : SKBookmark {
@@ -134,7 +135,7 @@
[array addObject:bookmark];
}
} else if ((docClass = [dc documentClassForType:fileType])) {
- if ((bookmark = [[self alloc] initWithURL:url pageIndex:([docClass
isPDFDocument] ? 0 : NSNotFound) snapshots:nil label:label])) {
+ if ((bookmark = [[self alloc] initWithURL:url pageIndex:([docClass
isPDFDocument] ? 0 : NSNotFound) label:label])) {
[array addObject:bookmark];
}
}
@@ -143,11 +144,16 @@
return array;
}
-- (instancetype)initWithURL:(NSURL *)aURL pageIndex:(NSUInteger)aPageIndex
snapshots:(NSArray *)aSnapshots label:(NSString *)aLabel {
+- (instancetype)initWithURL:(NSURL *)aURL pageIndex:(NSUInteger)aPageIndex
label:(NSString *)aLabel {
[self doesNotRecognizeSelector:_cmd];
return nil;
}
+- (instancetype)initWithURL:(NSURL *)aURL pageIndex:(NSUInteger)aPageIndex
snapshots:(NSArray *)aSnapshots {
+ [self doesNotRecognizeSelector:_cmd];
+ return nil;
+}
+
- (instancetype)initWithSetup:(NSDictionary *)aSetupDict label:(NSString
*)aLabel {
[self doesNotRecognizeSelector:_cmd];
return nil;
@@ -320,6 +326,14 @@
return nil;
}
+- (instancetype)initWithURL:(NSURL *)aURL pageIndex:(NSUInteger)aPageIndex
label:(NSString *)aLabel {
+ return (id)[[SKFileBookmark alloc] initWithURL:aURL pageIndex:aPageIndex
snapshots:nil label:aLabel];
+}
+
+- (instancetype)initWithURL:(NSURL *)aURL pageIndex:(NSUInteger)aPageIndex
snapshots:(NSArray *)aSnapshots {
+ return (id)[[SKFileBookmark alloc] initWithURL:aURL pageIndex:aPageIndex
snapshots:aSnapshots label:nil];
+}
+
- (instancetype)initWithURL:(NSURL *)aURL pageIndex:(NSUInteger)aPageIndex
snapshots:(NSArray *)aSnapshots label:(NSString *)aLabel {
return (id)[[SKFileBookmark alloc] initWithURL:aURL pageIndex:aPageIndex
snapshots:aSnapshots label:aLabel];
}
@@ -736,7 +750,7 @@
aPageNumber = [docClass isPDFDocument] ? 0 :
NSNotFound;
if (aLabel == nil)
[aURL getResourceValue:&aLabel
forKey:NSURLLocalizedNameKey error:NULL];
- bookmark = [[SKBookmark alloc] initWithURL:aURL
pageIndex:aPageNumber snapshots:nil label:aLabel];
+ bookmark = [[SKBookmark alloc] initWithURL:aURL
pageIndex:aPageNumber label:aLabel];
}
} else {
[[NSScriptCommand currentCommand]
setScriptErrorNumber:NSArgumentsWrongScriptError];
Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m 2026-04-02 09:13:32 UTC (rev 16145)
+++ trunk/SKBookmarkController.m 2026-04-02 14:17:27 UTC (rev 16146)
@@ -265,7 +265,7 @@
return YES;
if (fileURL) {
- SKBookmark *info = [[SKBookmark alloc] initWithURL:fileURL
pageIndex:pageIndex snapshots:snapshots label:nil];
+ SKBookmark *info = [[SKBookmark alloc] initWithURL:fileURL
pageIndex:pageIndex snapshots:snapshots];
if (info) {
SKBookmark *oldInfo = [self recentDocumentAtURL:fileURL];
if (oldInfo)
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
