Revision: 29662
http://sourceforge.net/p/bibdesk/svn/29662
Author: hofman
Date: 2025-10-03 22:05:12 +0000 (Fri, 03 Oct 2025)
Log Message:
-----------
make all items error manager an ivar of the error objext controllre
Modified Paths:
--------------
trunk/bibdesk/BDSKErrorManager.h
trunk/bibdesk/BDSKErrorManager.m
trunk/bibdesk/BDSKErrorObjectController.h
trunk/bibdesk/BDSKErrorObjectController.m
Modified: trunk/bibdesk/BDSKErrorManager.h
===================================================================
--- trunk/bibdesk/BDSKErrorManager.h 2025-10-03 21:54:51 UTC (rev 29661)
+++ trunk/bibdesk/BDSKErrorManager.h 2025-10-03 22:05:12 UTC (rev 29662)
@@ -52,8 +52,6 @@
NSInteger uniqueNumber;
}
-@property (class, nonatomic, readonly) BDSKErrorManager *allItemsErrorManager;
-
- (instancetype)initWithDocument:(nullable BibDocument *)aDocument
NS_DESIGNATED_INITIALIZER;
@property (nonatomic, nullable, weak) BDSKErrorObjectController
*errorController;
Modified: trunk/bibdesk/BDSKErrorManager.m
===================================================================
--- trunk/bibdesk/BDSKErrorManager.m 2025-10-03 21:54:51 UTC (rev 29661)
+++ trunk/bibdesk/BDSKErrorManager.m 2025-10-03 22:05:12 UTC (rev 29662)
@@ -61,16 +61,6 @@
@synthesize errorController, sourceDocument=document, uniqueNumber,
documentDisplayName, mainEditor, editors;
@dynamic displayName, documentStringEncoding;
-+ (BDSKErrorManager *)allItemsErrorManager;
-{
- static BDSKErrorManager *allItemsErrorManager = nil;
- if(allItemsErrorManager == nil) {
- allItemsErrorManager = [[BDSKErrorManager alloc] init];
- [allItemsErrorManager setDocumentDisplayName:NSLocalizedString(@"All",
@"Popup menu item for error window")];
- }
- return allItemsErrorManager;
-}
-
- (instancetype)initWithDocument:(BibDocument *)aDocument;
{
if(self = [super init]){
@@ -87,7 +77,7 @@
return self;
}
-// should be used only for allItemsErrorManager
+// should be used only for allItemsManager
- (instancetype)init;
{
return [self initWithDocument:nil];
Modified: trunk/bibdesk/BDSKErrorObjectController.h
===================================================================
--- trunk/bibdesk/BDSKErrorObjectController.h 2025-10-03 21:54:51 UTC (rev
29661)
+++ trunk/bibdesk/BDSKErrorObjectController.h 2025-10-03 22:05:12 UTC (rev
29662)
@@ -49,6 +49,7 @@
NSUInteger lastIndex;
+ BDSKErrorManager *allItemsManager;
BDSKErrorManager *filterManager;
BOOL hideWarnings;
Modified: trunk/bibdesk/BDSKErrorObjectController.m
===================================================================
--- trunk/bibdesk/BDSKErrorObjectController.m 2025-10-03 21:54:51 UTC (rev
29661)
+++ trunk/bibdesk/BDSKErrorObjectController.m 2025-10-03 22:05:12 UTC (rev
29662)
@@ -85,10 +85,11 @@
self = [super initWithWindow:nil];
if (self) {
errors = [[NSMutableArray alloc] init];
- managers = [[NSMutableArray alloc] initWithObjects:[BDSKErrorManager
allItemsErrorManager], nil];
+ allItemsManager = [[BDSKErrorManager alloc] init];
+ managers = [[NSMutableArray alloc] initWithObjects:allItemsManager,
nil];
lastIndex = 0;
handledNonIgnorableError = NO;
- filterManager = [BDSKErrorManager allItemsErrorManager];
+ filterManager = allItemsManager;
hideWarnings = NO;
[[NSNotificationCenter defaultCenter] addObserver:self
@@ -127,7 +128,7 @@
NSPredicate *managerPredicate = nil;
if (hideWarnings)
warningsPredicate = [NSPredicate
predicateWithFormat:@"isIgnorableWarning == FALSE"];
- if (filterManager && filterManager != [BDSKErrorManager
allItemsErrorManager])
+ if (filterManager && filterManager != allItemsManager)
managerPredicate = [NSPredicate predicateWithFormat:@"editor.manager
== %@", filterManager];
if (warningsPredicate) {
if (managerPredicate)
@@ -193,7 +194,7 @@
- (void)removeManager:(BDSKErrorManager *)manager{
if ([self filterManager] == manager)
- [self setFilterManager:[BDSKErrorManager allItemsErrorManager]];
+ [self setFilterManager:allItemsManager];
[manager setErrorController:nil];
[self removeObjectFromManagersAtIndex:[managers indexOfObject:manager]];
}
@@ -291,7 +292,7 @@
[manager setSourceDocument:nil];
if(shouldEdit)
[[manager mainEditor] showWindow:self];
- }else if([manager sourceDocument] == nil && manager !=
[BDSKErrorManager allItemsErrorManager]){
+ }else if([manager sourceDocument] == nil && manager !=
allItemsManager){
[manager removeClosedEditors];
}
}
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
