Revision: 28694
http://sourceforge.net/p/bibdesk/svn/28694
Author: hofman
Date: 2024-02-04 15:40:43 +0000 (Sun, 04 Feb 2024)
Log Message:
-----------
remove class factory methods for bookmarks
Modified Paths:
--------------
trunk/bibdesk/BDSKBookmark.h
trunk/bibdesk/BDSKBookmark.m
trunk/bibdesk/BDSKBookmarkController.m
trunk/bibdesk/BDSKSearchBookmark.h
trunk/bibdesk/BDSKSearchBookmark.m
trunk/bibdesk/BDSKSearchBookmarkController.m
trunk/bibdesk/BibDocument_Groups.m
Modified: trunk/bibdesk/BDSKBookmark.h
===================================================================
--- trunk/bibdesk/BDSKBookmark.h 2024-02-02 10:32:01 UTC (rev 28693)
+++ trunk/bibdesk/BDSKBookmark.h 2024-02-04 15:40:43 UTC (rev 28694)
@@ -48,10 +48,6 @@
__weak BDSKBookmark *parent;
}
-+ (id)bookmarkWithURL:(NSURL *)aURL name:(NSString *)aName;
-+ (id)bookmarkFolderWithName:(NSString *)aName;
-+ (id)bookmarkSeparator;
-
- (id)initWithURL:(NSURL *)aURL name:(NSString *)aName;
- (id)initFolderWithChildren:(NSArray *)aChildren name:(NSString *)aName;
- (id)initFolderWithName:(NSString *)aName;
Modified: trunk/bibdesk/BDSKBookmark.m
===================================================================
--- trunk/bibdesk/BDSKBookmark.m 2024-02-02 10:32:01 UTC (rev 28693)
+++ trunk/bibdesk/BDSKBookmark.m 2024-02-04 15:40:43 UTC (rev 28694)
@@ -100,18 +100,6 @@
}
}
-+ (id)bookmarkWithURL:(NSURL *)aURL name:(NSString *)aName {
- return [[self alloc] initWithURL:aURL name:aName];
-}
-
-+ (id)bookmarkFolderWithName:(NSString *)aName {
- return [[self alloc] initFolderWithName:aName];
-}
-
-+ (id)bookmarkSeparator {
- return [[self alloc] initSeparator];
-}
-
- (id)initWithURL:(NSURL *)aURL name:(NSString *)aName {
BDSKRequestConcreteImplementation(self, _cmd);
return nil;
Modified: trunk/bibdesk/BDSKBookmarkController.m
===================================================================
--- trunk/bibdesk/BDSKBookmarkController.m 2024-02-02 10:32:01 UTC (rev
28693)
+++ trunk/bibdesk/BDSKBookmarkController.m 2024-02-04 15:40:43 UTC (rev
28694)
@@ -174,7 +174,7 @@
[bookmarkSheetController beginSheetModalForWindow:window
completionHandler:^(NSInteger result){
if (result == NSModalResponseOK) {
- BDSKBookmark *bookmark = [BDSKBookmark bookmarkWithURL:aURL
name:[bookmarkSheetController stringValue]];
+ BDSKBookmark *bookmark = [[BDSKBookmark alloc] initWithURL:aURL
name:[bookmarkSheetController stringValue]];
if (bookmark) {
BDSKBookmark *folder = [bookmarkSheetController
selectedFolder] ?: bookmarkRoot;
[self insertBookmark:bookmark atIndex:[folder countOfChildren]
ofBookmark:folder animate:YES];
@@ -265,17 +265,17 @@
#pragma mark Actions
- (IBAction)insertBookmark:(id)sender {
- BDSKBookmark *bookmark = [BDSKBookmark bookmarkWithURL:[NSURL
URLWithString:@"https://";] name:nil];
+ BDSKBookmark *bookmark = [[BDSKBookmark alloc] initWithURL:[NSURL
URLWithString:@"https://";] name:nil];
[self addBookmark:bookmark];
}
- (IBAction)insertBookmarkFolder:(id)sender {
- BDSKBookmark *folder = [BDSKBookmark
bookmarkFolderWithName:NSLocalizedString(@"Folder", @"default folder name")];
+ BDSKBookmark *folder = [[BDSKBookmark alloc]
initFolderWithName:NSLocalizedString(@"Folder", @"default folder name")];
[self addBookmark:folder];
}
- (IBAction)insertBookmarkSeparator:(id)sender {
- BDSKBookmark *separator = [BDSKBookmark bookmarkSeparator];
+ BDSKBookmark *separator = [[BDSKBookmark alloc] initSeparator];
[self addBookmark:separator];
}
@@ -465,7 +465,7 @@
[draggingInfo
enumerateDraggingItemsWithOptions:NSDraggingItemEnumerationClearNonenumeratedImages
forView:ov classes:classes searchOptions:searchOptions
usingBlock:^(NSDraggingItem *draggingItem, NSInteger idx, BOOL *stop){
NSURL *url = [draggingItem item];
- BDSKBookmark *bookmark = [url isKindOfClass:[NSURL class]] ?
[BDSKBookmark bookmarkWithURL:url name:[url absoluteString]] : nil;
+ BDSKBookmark *bookmark = [url isKindOfClass:[NSURL class]] ?
[[BDSKBookmark alloc] initWithURL:url name:[url absoluteString]] : nil;
if (bookmark) {
[draggingItem setImageComponentsProvider:^{
[view setObjectValue:bookmark];
@@ -572,7 +572,7 @@
if ([url isFileReferenceURL])
url = [url filePathURL];
NSString *name = [nameEnum nextObject];
- BDSKBookmark *bookmark = [BDSKBookmark bookmarkWithURL:url
name:name];
+ BDSKBookmark *bookmark = [[BDSKBookmark alloc]
initWithURL:url name:name];
if (bookmark)
[newBookmarks addObject:bookmark];
}
Modified: trunk/bibdesk/BDSKSearchBookmark.h
===================================================================
--- trunk/bibdesk/BDSKSearchBookmark.h 2024-02-02 10:32:01 UTC (rev 28693)
+++ trunk/bibdesk/BDSKSearchBookmark.h 2024-02-04 15:40:43 UTC (rev 28694)
@@ -48,10 +48,6 @@
__weak BDSKSearchBookmark *parent;
}
-+ (id)searchBookmarkFolderWithLabel:(NSString *)aLabel;
-+ (id)searchBookmarkSeparator;
-+ (id)searchBookmarkWithInfo:(NSDictionary *)aDictionary label:(NSString
*)aLabel;
-
- (id)initFolderWithChildren:(NSArray *)aChildren label:(NSString *)aLabel;
- (id)initFolderWithLabel:(NSString *)aLabel;
- (id)initRootWithChildrenDictionaries:(NSArray *)dictionaries;
Modified: trunk/bibdesk/BDSKSearchBookmark.m
===================================================================
--- trunk/bibdesk/BDSKSearchBookmark.m 2024-02-02 10:32:01 UTC (rev 28693)
+++ trunk/bibdesk/BDSKSearchBookmark.m 2024-02-04 15:40:43 UTC (rev 28694)
@@ -97,18 +97,6 @@
}
}
-+ (id)searchBookmarkFolderWithLabel:(NSString *)aLabel {
- return [[self alloc] initFolderWithLabel:aLabel];
-}
-
-+ (id)searchBookmarkSeparator {
- return [[self alloc] initSeparator];
-}
-
-+ (id)searchBookmarkWithInfo:(NSDictionary *)aDictionary label:(NSString
*)aLabel {
- return [[self alloc] initWithInfo:aDictionary label:aLabel];
-}
-
- (id)initFolderWithChildren:(NSArray *)aChildren label:(NSString *)aLabel {
BDSKRequestConcreteImplementation(self, _cmd);
return nil;
Modified: trunk/bibdesk/BDSKSearchBookmarkController.m
===================================================================
--- trunk/bibdesk/BDSKSearchBookmarkController.m 2024-02-02 10:32:01 UTC
(rev 28693)
+++ trunk/bibdesk/BDSKSearchBookmarkController.m 2024-02-04 15:40:43 UTC
(rev 28694)
@@ -223,7 +223,7 @@
#pragma mark Actions
- (IBAction)insertBookmarkFolder:(id)sender {
- BDSKSearchBookmark *folder = [BDSKSearchBookmark
searchBookmarkFolderWithLabel:NSLocalizedString(@"Folder", @"default folder
name")];
+ BDSKSearchBookmark *folder = [[BDSKSearchBookmark alloc]
initFolderWithLabel:NSLocalizedString(@"Folder", @"default folder name")];
[self addBookmark:folder];
CGFloat delay = [NSAnimationContext defaultAnimationTimeInterval] > 0.0 ?
0.25 : 0.0;
@@ -234,7 +234,7 @@
}
- (IBAction)insertBookmarkSeparator:(id)sender {
- BDSKSearchBookmark *separator = [BDSKSearchBookmark
searchBookmarkSeparator];
+ BDSKSearchBookmark *separator = [[BDSKSearchBookmark alloc] initSeparator];
[self addBookmark:separator];
}
@@ -440,7 +440,7 @@
[draggingInfo
enumerateDraggingItemsWithOptions:NSDraggingItemEnumerationClearNonenumeratedImages
forView:ov classes:classes searchOptions:searchOptions
usingBlock:^(NSDraggingItem *draggingItem, NSInteger idx, BOOL *stop){
NSURL *fileURL = [draggingItem item];
NSString *label = [[fileURL lastPathComponent]
stringByDeletingPathExtension];
- BDSKSearchBookmark *bookmark = [BDSKSearchBookmark
searchBookmarkWithInfo:@{} label:label];
+ BDSKSearchBookmark *bookmark = [[BDSKSearchBookmark alloc]
initWithInfo:@{} label:label];
if (bookmark) {
[draggingItem setImageComponentsProvider:^{
[view setObjectValue:bookmark];
@@ -545,7 +545,7 @@
NSDictionary *dict = [NSDictionary
dictionaryWithContentsOfURL:fileURL];
if (dict) {
NSString *label = [[fileURL lastPathComponent]
stringByDeletingPathExtension];
- BDSKSearchBookmark *bookmark = [BDSKSearchBookmark
searchBookmarkWithInfo:dict label:label];
+ BDSKSearchBookmark *bookmark = [[BDSKSearchBookmark
alloc] initWithInfo:dict label:label];
if (bookmark)
[newBookmarks addObject:bookmark];
}
Modified: trunk/bibdesk/BibDocument_Groups.m
===================================================================
--- trunk/bibdesk/BibDocument_Groups.m 2024-02-02 10:32:01 UTC (rev 28693)
+++ trunk/bibdesk/BibDocument_Groups.m 2024-02-04 15:40:43 UTC (rev 28694)
@@ -981,7 +981,7 @@
[bookmarkSheetController beginSheetModalForWindow:[self windowForSheet]
completionHandler:^(NSInteger result){
if (result == NSModalResponseOK) {
- BDSKSearchBookmark *newBookmark = [BDSKSearchBookmark
searchBookmarkWithInfo:[group dictionaryValue] label:[bookmarkSheetController
stringValue]];
+ BDSKSearchBookmark *newBookmark = [[BDSKSearchBookmark alloc]
initWithInfo:[group dictionaryValue] label:[bookmarkSheetController
stringValue]];
if (newBookmark) {
BDSKSearchBookmark *folder = [bookmarkSheetController
selectedFolder] ?: [[BDSKSearchBookmarkController sharedBookmarkController]
bookmarkRoot];
[[BDSKSearchBookmarkController sharedBookmarkController]
insertBookmark:bookmark atIndex:[folder countOfChildren] ofBookmark:folder
animate:YES];
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
