Revision: 18350
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=18350&view=rev
Author: hofman
Date: 2012-01-02 18:09:43 +0000 (Mon, 02 Jan 2012)
Log Message:
-----------
Always create error editors if needed. Main editor is implied from its
properties.
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 2012-01-02 07:35:09 UTC (rev 18349)
+++ trunk/bibdesk/BDSKErrorManager.h 2012-01-02 18:09:43 UTC (rev 18350)
@@ -74,7 +74,7 @@
- (NSArray *)editors;
-- (void)addEditor:(BDSKErrorEditor *)editor isMain:(BOOL)isMain;
+- (void)addEditor:(BDSKErrorEditor *)editor;
- (void)removeEditor:(BDSKErrorEditor *)editor;
- (void)removeClosedEditors;
Modified: trunk/bibdesk/BDSKErrorManager.m
===================================================================
--- trunk/bibdesk/BDSKErrorManager.m 2012-01-02 07:35:09 UTC (rev 18349)
+++ trunk/bibdesk/BDSKErrorManager.m 2012-01-02 18:09:43 UTC (rev 18350)
@@ -189,11 +189,11 @@
return editors;
}
-- (void)addEditor:(BDSKErrorEditor *)editor isMain:(BOOL)isMain;
+- (void)addEditor:(BDSKErrorEditor *)editor;
{
[editor setManager:self];
[editors addObject:editor];
- if(isMain)
+ if([editor isPasteDrag] == NO)
mainEditor = editor;
}
Modified: trunk/bibdesk/BDSKErrorObjectController.h
===================================================================
--- trunk/bibdesk/BDSKErrorObjectController.h 2012-01-02 07:35:09 UTC (rev
18349)
+++ trunk/bibdesk/BDSKErrorObjectController.h 2012-01-02 18:09:43 UTC (rev
18350)
@@ -69,7 +69,7 @@
- (void)addManager:(BDSKErrorManager *)manager;
- (void)removeManager:(BDSKErrorManager *)manager;
-- (BDSKErrorEditor *)editorForDocument:(BibDocument *)document
create:(BOOL)create;
+- (BDSKErrorEditor *)editorForDocument:(BibDocument *)document;
- (BDSKErrorEditor *)editorForPasteDragData:(NSData *)data
document:(BibDocument *)document;
// called from the tableView doubleclick
Modified: trunk/bibdesk/BDSKErrorObjectController.m
===================================================================
--- trunk/bibdesk/BDSKErrorObjectController.m 2012-01-02 07:35:09 UTC (rev
18349)
+++ trunk/bibdesk/BDSKErrorObjectController.m 2012-01-02 18:09:43 UTC (rev
18350)
@@ -179,14 +179,14 @@
#pragma mark Getting managers and editors
-- (BDSKErrorManager *)managerForDocument:(BibDocument *)document
create:(BOOL)create{
+- (BDSKErrorManager *)managerForDocument:(BibDocument *)document{
BDSKErrorManager *manager = nil;
for (manager in managers) {
if(document == [manager sourceDocument])
- break;
+ break;
}
- if (manager == nil && create) {
+ if (manager == nil) {
manager = [(BDSKErrorManager *)[BDSKErrorManager alloc]
initWithDocument:document];
[self addManager:manager];
[manager release];
@@ -195,13 +195,13 @@
return manager;
}
-- (BDSKErrorEditor *)editorForDocument:(BibDocument *)document
create:(BOOL)create{
- BDSKErrorManager *manager = [self managerForDocument:document
create:create];
+- (BDSKErrorEditor *)editorForDocument:(BibDocument *)document{
+ BDSKErrorManager *manager = [self managerForDocument:document];
BDSKErrorEditor *editor = [manager mainEditor];
- if (editor == nil && create) {
+ if (editor == nil) {
editor = [(BDSKErrorEditor *)[BDSKErrorEditor alloc]
initWithFileName:[[document fileURL] path]];
- [manager addEditor:editor isMain:YES];
+ [manager addEditor:editor];
[editor release];
}
@@ -211,10 +211,10 @@
- (BDSKErrorEditor *)editorForPasteDragData:(NSData *)data
document:(BibDocument *)document{
BDSKASSERT(document != nil);
- BDSKErrorManager *manager = [self managerForDocument:document create:YES];
+ BDSKErrorManager *manager = [self managerForDocument:document];
BDSKErrorEditor *editor = [[BDSKErrorEditor alloc]
initWithPasteDragData:data];
- [manager addEditor:editor isMain:NO];
+ [manager addEditor:editor];
[editor release];
return editor;
@@ -367,7 +367,7 @@
- (void)endObservingErrorsForDocument:(BibDocument *)document
pasteDragData:(NSData *)data {
if([currentErrors count]){
if(document != nil){ // this should happen only for temporary author
objects, which we ignore as they don't belong to any document
- id editor = data ? [self editorForPasteDragData:data
document:document] : [self editorForDocument:document create:YES];
+ id editor = data ? [self editorForPasteDragData:data
document:document] : [self editorForDocument:document];
[currentErrors setValue:editor forKey:@"editor"];
[[self mutableArrayValueForKey:@"errors"]
addObjectsFromArray:currentErrors];
if([self isWindowVisible] == NO && (handledNonIgnorableError ||
[[NSUserDefaults standardUserDefaults] boolForKey:BDSKShowWarningsKey]))
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
