Revision: 22612
http://sourceforge.net/p/bibdesk/svn/22612
Author: hofman
Date: 2018-09-15 13:49:14 +0000 (Sat, 15 Sep 2018)
Log Message:
-----------
Persons from different owners are different, so check owner of person
controller to consider equality
Modified Paths:
--------------
trunk/bibdesk/BDSKPersonController.h
trunk/bibdesk/BDSKPersonController.m
trunk/bibdesk/BibDocument_Actions.m
Modified: trunk/bibdesk/BDSKPersonController.h
===================================================================
--- trunk/bibdesk/BDSKPersonController.h 2018-09-15 13:41:57 UTC (rev
22611)
+++ trunk/bibdesk/BDSKPersonController.h 2018-09-15 13:49:14 UTC (rev
22612)
@@ -79,6 +79,7 @@
- (NSSet *)fields;
- (void)setFields:(NSSet *)newFields;
- (NSImage *)image;
+- (id<BDSKOwner>)owner;
#pragma mark actions
- (IBAction)edit:(id)sender;
Modified: trunk/bibdesk/BDSKPersonController.m
===================================================================
--- trunk/bibdesk/BDSKPersonController.m 2018-09-15 13:41:57 UTC (rev
22611)
+++ trunk/bibdesk/BDSKPersonController.m 2018-09-15 13:49:14 UTC (rev
22612)
@@ -298,6 +298,10 @@
return image ?: [[NSWorkspace sharedWorkspace] iconForFileType:@"vcf"];
}
+- (id<BDSKOwner>)owner{
+ return owner;
+}
+
#pragma mark actions
- (void)editSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode
contextInfo:(void *)contextInfo {
Modified: trunk/bibdesk/BibDocument_Actions.m
===================================================================
--- trunk/bibdesk/BibDocument_Actions.m 2018-09-15 13:41:57 UTC (rev 22611)
+++ trunk/bibdesk/BibDocument_Actions.m 2018-09-15 13:49:14 UTC (rev 22612)
@@ -454,7 +454,7 @@
BDSKPersonController *pc = nil;
for (NSWindowController *wc in [self windowControllers]) {
- if([wc isKindOfClass:[BDSKPersonController class]] &&
[[(BDSKPersonController *)wc person] fuzzyEqual:person]){
+ if([wc isKindOfClass:[BDSKPersonController class]] &&
[[(BDSKPersonController *)wc person] fuzzyEqual:person] &&
[(BDSKPersonController *)wc owner] == [[person publication] owner]){
pc = (BDSKPersonController *)wc;
break;
}
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
