Revision: 15234
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=15234&view=rev
Author: hofman
Date: 2009-04-29 14:36:46 +0000 (Wed, 29 Apr 2009)
Log Message:
-----------
rename methods to remove/delete pubs
Modified Paths:
--------------
trunk/bibdesk/BibDocument_Actions.h
trunk/bibdesk/BibDocument_Actions.m
trunk/bibdesk/BibDocument_DataSource.m
Modified: trunk/bibdesk/BibDocument_Actions.h
===================================================================
--- trunk/bibdesk/BibDocument_Actions.h 2009-04-29 14:32:09 UTC (rev 15233)
+++ trunk/bibdesk/BibDocument_Actions.h 2009-04-29 14:36:46 UTC (rev 15234)
@@ -57,11 +57,11 @@
*/
- (IBAction)newPub:(id)sender; // new pub button pressed.
-- (void)deletePubs:(NSArray *)pubs;
+- (void)deletePublications:(NSArray *)pubs;
- (IBAction)deleteSelectedPubs:(id)sender;
-- (void)removePubs:(NSArray *)pubs;
+- (void)removePublicationsFromSelectedGroups:(NSArray *)pubs;
- (IBAction)removeSelectedPubs:(id)sender;
Modified: trunk/bibdesk/BibDocument_Actions.m
===================================================================
--- trunk/bibdesk/BibDocument_Actions.m 2009-04-29 14:32:09 UTC (rev 15233)
+++ trunk/bibdesk/BibDocument_Actions.m 2009-04-29 14:36:46 UTC (rev 15234)
@@ -193,11 +193,11 @@
}
// this method is called for the main table; it's a wrapper for delete or
remove from group
-- (void)removePubs:(NSArray *)pubs{
+- (void)removePublicationsFromSelectedGroups:(NSArray *)pubs{
NSArray *selectedGroups = [self selectedGroups];
if ([self hasLibraryGroupSelected]) {
- [self deletePubs:pubs];
+ [self deletePublications:pubs];
} else {
BOOL canRemove = NO;
if ([self hasStaticGroupsSelected])
@@ -228,7 +228,7 @@
}
- (IBAction)removeSelectedPubs:(id)sender{
- [self removePubs:[self selectedGroups]];
+ [self removePublicationsFromSelectedGroups:[self selectedGroups]];
}
- (void)deletePubsAlertDidEnd:(NSAlert *)alert
returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
@@ -267,7 +267,7 @@
[[self undoManager] setActionName:[NSString
stringWithFormat:NSLocalizedString(@"Delete %@", @"Undo action name: Delete
Publication(s)"),pubSingularPlural]];
}
-- (void)deletePubs:(NSArray *)pubs {
+- (void)deletePublications:(NSArray *)pubs {
NSInteger numPubs = [pubs count];
if (numPubs == 0 || [self hasExternalGroupsSelected] == YES) {
return;
@@ -296,7 +296,7 @@
}
- (IBAction)deleteSelectedPubs:(id)sender{
- [self deletePubs:[self selectedPublications]];
+ [self deletePublications:[self selectedPublications]];
}
// -delete:, -alternateDelete:, -copy:, -cut:, -alternateCut:, -paste:, and
-duplicate are defined in BDSKTableView and BDSKMainTableView using dataSource
methods
Modified: trunk/bibdesk/BibDocument_DataSource.m
===================================================================
--- trunk/bibdesk/BibDocument_DataSource.m 2009-04-29 14:32:09 UTC (rev
15233)
+++ trunk/bibdesk/BibDocument_DataSource.m 2009-04-29 14:36:46 UTC (rev
15234)
@@ -1068,7 +1068,7 @@
- (void)tableView:(NSTableView *)tv deleteRowsWithIndexes:(NSIndexSet
*)rowIndexes {
if (tv == tableView) {
- [self removePubs:[shownPublications
objectsAtIndexes:rowIndexes]];
+ [self removePublicationsFromSelectedGroups:[shownPublications
objectsAtIndexes:rowIndexes]];
} else if (tv == [fileSearchController tableView]) {
NSMutableArray *pubs = [NSMutableArray array];
NSEnumerator *itemEnum = [[fileSearchController
identifierURLsAtIndexes:rowIndexes] objectEnumerator];
@@ -1078,7 +1078,7 @@
if (pub = [publications itemForIdentifierURL:idURL])
[pubs addObject:pub];
}
- [self removePubs:pubs];
+ [self removePublicationsFromSelectedGroups:pubs];
}
}
@@ -1091,7 +1091,7 @@
- (void)tableView:(NSTableView *)tv alternateDeleteRowsWithIndexes:(NSIndexSet
*)rowIndexes {
if (tv == tableView) {
- [self deletePubs:[shownPublications
objectsAtIndexes:rowIndexes]];
+ [self deletePublications:[shownPublications
objectsAtIndexes:rowIndexes]];
} else if (tv == [fileSearchController tableView]) {
NSMutableArray *pubs = [NSMutableArray array];
NSEnumerator *itemEnum = [[fileSearchController
identifierURLsAtIndexes:rowIndexes] objectEnumerator];
@@ -1101,7 +1101,7 @@
if (pub = [publications itemForIdentifierURL:idURL])
[pubs addObject:pub];
}
- [self deletePubs:pubs];
+ [self deletePublications:pubs];
}
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Register Now & Save for Velocity, the Web Performance & Operations
Conference from O'Reilly Media. Velocity features a full day of
expert-led, hands-on workshops and two days of sessions from industry
leaders in dedicated Performance & Operations tracks. Use code vel09scf
and Save an extra 15% before 5/3. http://p.sf.net/sfu/velocityconf
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
