Revision: 18352
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=18352&view=rev
Author: hofman
Date: 2012-01-02 18:56:54 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
no need for a separate class for the default error manager
Modified Paths:
--------------
trunk/bibdesk/BDSKErrorManager.h
trunk/bibdesk/BDSKErrorManager.m
trunk/bibdesk/BDSKErrorObjectController.m
Modified: trunk/bibdesk/BDSKErrorManager.h
===================================================================
--- trunk/bibdesk/BDSKErrorManager.h 2012-01-02 18:29:45 UTC (rev 18351)
+++ trunk/bibdesk/BDSKErrorManager.h 2012-01-02 18:56:54 UTC (rev 18352)
@@ -54,8 +54,6 @@
- (id)initWithDocument:(BibDocument *)aDocument;
-- (BOOL)isAllItems;
-
- (BDSKErrorObjectController *)errorController;
- (void)setErrorController:(BDSKErrorObjectController *)newController;
Modified: trunk/bibdesk/BDSKErrorManager.m
===================================================================
--- trunk/bibdesk/BDSKErrorManager.m 2012-01-02 18:29:45 UTC (rev 18351)
+++ trunk/bibdesk/BDSKErrorManager.m 2012-01-02 18:56:54 UTC (rev 18352)
@@ -46,17 +46,15 @@
static char BDSKErrorManagerObservationContext;
-@interface BDSKAllItemsErrorManager : BDSKErrorManager @end
-
-static BDSKAllItemsErrorManager *allItemsErrorManager = nil;
-
-
@implementation BDSKErrorManager
+ (id)allItemsErrorManager;
{
- if(allItemsErrorManager == nil)
- allItemsErrorManager = [[BDSKAllItemsErrorManager alloc] init];
+ static BDSKErrorManager *allItemsErrorManager = nil;
+ if(allItemsErrorManager == nil) {
+ allItemsErrorManager = [[BDSKErrorManager alloc] init];
+ [allItemsErrorManager setDocumentDisplayName:NSLocalizedString(@"All",
@"Popup menu item for error window")];
+ }
return allItemsErrorManager;
}
@@ -71,6 +69,11 @@
return self;
}
+- (id)init;
+{
+ return [self initWithDocument:nil];
+}
+
- (void)dealloc;
{
[document removeObserver:self forKeyPath:@"fileURL"];
@@ -81,8 +84,6 @@
[super dealloc];
}
-- (BOOL)isAllItems { return NO; }
-
- (BDSKErrorObjectController *)errorController;
{
return errorController;
@@ -226,20 +227,3 @@
}
@end
-
-
-@implementation BDSKAllItemsErrorManager
-
-- (id)init;
-{
- if(self = [super initWithDocument:nil]){
- documentDisplayName = [NSLocalizedString(@"All", @"Popup menu item for
error window") retain];
- }
- return self;
-}
-
-- (BOOL)isAllItems{ return YES; }
-
-- (BOOL)managesError:(BDSKErrorObject *)errObj{ return YES; }
-
-@end
Modified: trunk/bibdesk/BDSKErrorObjectController.m
===================================================================
--- trunk/bibdesk/BDSKErrorObjectController.m 2012-01-02 18:29:45 UTC (rev
18351)
+++ trunk/bibdesk/BDSKErrorObjectController.m 2012-01-02 18:56:54 UTC (rev
18352)
@@ -258,7 +258,7 @@
[manager setSourceDocument:nil];
if(shouldEdit)
[[manager mainEditor] showWindow:self];
- }else if([manager sourceDocument] == nil && [manager isAllItems] ==
NO){
+ }else if([manager sourceDocument] == nil && manager !=
[BDSKErrorManager allItemsErrorManager]){
[manager removeClosedEditors];
}
}
@@ -437,11 +437,12 @@
@implementation BDSKFilteringArrayController
- (NSArray *)arrangeObjects:(NSArray *)objects {
- if(hideWarnings || filterManager){
+ BDSKErrorManager *manager = filterManager == [BDSKErrorManager
allItemsErrorManager] ? nil : filterManager;
+ if(hideWarnings || manager){
NSMutableArray *matchedObjects = [NSMutableArray
arrayWithCapacity:[objects count]];
for (id item in objects) {
- if(filterManager && [filterManager managesError:item] == NO)
+ if(manager && manager != [[item editor] manager])
continue;
if(hideWarnings && [item isIgnorableWarning])
continue;
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Ridiculously easy VDI. With Citrix VDI-in-a-Box, you don't need a complex
infrastructure or vast IT resources to deliver seamless, secure access to
virtual desktops. With this all-in-one solution, easily deploy virtual
desktops for less than the cost of PCs and save 60% on VDI infrastructure
costs. Try it free! http://p.sf.net/sfu/Citrix-VDIinabox
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
